From 587d77cc77c926731ba8558af50e1c1e3eb30e8b Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 11 Mar 2015 05:22:14 +0100 Subject: [PATCH] Added column and role for download status in Playable(Proxy)Model. --- src/libtomahawk/playlist/PlayableModel.cpp | 3 ++- src/libtomahawk/playlist/PlayableModel.h | 20 ++++++++++--------- .../playlist/PlayableProxyModel.cpp | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp index 3d6644246..98ae366a4 100644 --- a/src/libtomahawk/playlist/PlayableModel.cpp +++ b/src/libtomahawk/playlist/PlayableModel.cpp @@ -47,7 +47,7 @@ PlayableModel::init() connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlaybackStarted( Tomahawk::result_ptr ) ), Qt::DirectConnection ); connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ), Qt::DirectConnection ); - d->header << tr( "Artist" ) << tr( "Title" ) << tr( "Composer" ) << tr( "Album" ) << tr( "Track" ) << tr( "Duration" ) + d->header << tr( "Artist" ) << tr( "Title" ) << tr( "Composer" ) << tr( "Album" ) << tr( "Download" ) << tr( "Track" ) << tr( "Duration" ) << tr( "Bitrate" ) << tr( "Age" ) << tr( "Year" ) << tr( "Size" ) << tr( "Origin" ) << tr( "Accuracy" ) << tr( "Name" ); } @@ -874,6 +874,7 @@ PlayableModel::columnAlignment( int column ) const case Filesize: case Score: case Year: + case Download: return Qt::AlignHCenter; break; diff --git a/src/libtomahawk/playlist/PlayableModel.h b/src/libtomahawk/playlist/PlayableModel.h index 446e9a124..83c838677 100644 --- a/src/libtomahawk/playlist/PlayableModel.h +++ b/src/libtomahawk/playlist/PlayableModel.h @@ -45,15 +45,16 @@ public: Track = 1, Composer = 2, Album = 3, - AlbumPos = 4, - Duration = 5, - Bitrate = 6, - Age = 7, - Year = 8, - Filesize = 9, - Origin = 10, - Score = 11, - Name = 12 + Download = 4, + AlbumPos = 5, + Duration = 6, + Bitrate = 7, + Age = 8, + Year = 9, + Filesize = 10, + Origin = 11, + Score = 12, + Name = 13, }; enum PlayableRoles @@ -62,6 +63,7 @@ public: TrackRole, ComposerRole, AlbumRole, + DownloadRole, AlbumPosRole, DurationRole, BitrateRole, diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp index 4a6f75d13..eb238a560 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp @@ -49,7 +49,7 @@ PlayableProxyModel::PlayableProxyModel( QObject* parent ) PlayableProxyModel::setSourcePlayableModel( NULL ); m_headerStyle[ Fancy ] << PlayableModel::Name; - m_headerStyle[ Detailed ] << PlayableModel::Artist << PlayableModel::Track << PlayableModel::Composer << PlayableModel::Album << PlayableModel::AlbumPos << PlayableModel::Duration << PlayableModel::Bitrate << PlayableModel::Age << PlayableModel::Year << PlayableModel::Filesize << PlayableModel::Origin << PlayableModel::Score; + m_headerStyle[ Detailed ] << PlayableModel::Artist << PlayableModel::Track << PlayableModel::Composer << PlayableModel::Album << PlayableModel::Download << PlayableModel::AlbumPos << PlayableModel::Duration << PlayableModel::Bitrate << PlayableModel::Age << PlayableModel::Year << PlayableModel::Filesize << PlayableModel::Origin << PlayableModel::Score; m_headerStyle[ Collection ] << PlayableModel::Name << PlayableModel::Composer << PlayableModel::Duration << PlayableModel::Bitrate << PlayableModel::Age << PlayableModel::Year << PlayableModel::Filesize << PlayableModel::Origin; } @@ -612,7 +612,7 @@ PlayableProxyModel::columnCount( const QModelIndex& parent ) const case Detailed: default: - return 12; + return 13; break; } } @@ -674,7 +674,7 @@ PlayableProxyModel::columnWeights() const case Detailed: default: - w << 0.15 << 0.15 << 0.12 << 0.12 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.09; // << 0.03; + w << 0.12 << 0.12 << 0.12 << 0.12 << 0.06 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.09; // << 0.03; break; }