From 4eaff359f0c7d13d6fc1944f4603cc0cb0dcb5e7 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 2 Apr 2011 00:01:42 -0400 Subject: [PATCH] make collectionitems icons used not hardcoded, and add supercollection icon --- data/images/supercollection.png | Bin 0 -> 8921 bytes resources.qrc | 3 +++ src/sourcetree/sourcesmodel.cpp | 2 +- src/sourcetree/sourcetreeitem.cpp | 11 ++++++++++- src/sourcetree/sourcetreeitem.h | 1 + src/sourcetree/sourcetreeview.cpp | 2 +- 6 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 data/images/supercollection.png diff --git a/data/images/supercollection.png b/data/images/supercollection.png new file mode 100644 index 0000000000000000000000000000000000000000..e068927b079d6c1dce67302cefc2a18baf909ef9 GIT binary patch literal 8921 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./data/images/music-icon.png ./data/images/configure.png ./data/images/create-playlist.png +./data/images/add.png +./data/images/recently-played.png +./data/images/supercollection.png ./data/topbar-radiobuttons.css ./data/icons/tomahawk-icon-16x16.png ./data/icons/tomahawk-icon-32x32.png diff --git a/src/sourcetree/sourcesmodel.cpp b/src/sourcetree/sourcesmodel.cpp index adc6100ad..737c98a80 100644 --- a/src/sourcetree/sourcesmodel.cpp +++ b/src/sourcetree/sourcesmodel.cpp @@ -39,7 +39,7 @@ SourcesModel::SourcesModel( QObject* parent ) appendItem( source_ptr() ); // add misc children of root node - GenericPageItem* recent = new GenericPageItem( this, m_rootItem->children().at( 0 ), tr( "Recently Played" ), QIcon( RESPATH "images/home.png" ) ); + GenericPageItem* recent = new GenericPageItem( this, m_rootItem->children().at( 0 ), tr( "Recently Played" ), QIcon( RESPATH "images/recently-played.png" ) ); connect( recent, SIGNAL( activated() ), PlaylistManager::instance(), SLOT( showWelcomePage() ) ); onSourcesAdded( SourceList::instance()->sources() ); diff --git a/src/sourcetree/sourcetreeitem.cpp b/src/sourcetree/sourcetreeitem.cpp index 1a09760f2..30e3e3b40 100644 --- a/src/sourcetree/sourcetreeitem.cpp +++ b/src/sourcetree/sourcetreeitem.cpp @@ -276,7 +276,7 @@ CategoryAddItem::flags() const QIcon CategoryAddItem::icon() const { - return QIcon( RESPATH "images/create-playlist.png" ); + return QIcon( RESPATH "images/add.png" ); } // CategoryItem @@ -374,6 +374,15 @@ CollectionItem::activate() } } +QIcon +CollectionItem::icon() const +{ + if( m_source.isNull() ) + return QIcon( RESPATH "images/supercollection.png" ); + else + return QIcon( RESPATH "images/user-avatar.png" ); +} + void CollectionItem::onPlaylistsAdded( const QList< playlist_ptr >& playlists ) diff --git a/src/sourcetree/sourcetreeitem.h b/src/sourcetree/sourcetreeitem.h index b0f5654fd..f3699669d 100644 --- a/src/sourcetree/sourcetreeitem.h +++ b/src/sourcetree/sourcetreeitem.h @@ -128,6 +128,7 @@ public: virtual QString text() const; virtual void activate(); + virtual QIcon icon() const; Tomahawk::source_ptr source() const; diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index 6d34ff352..d022ad2a1 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -466,7 +466,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co } QRect iconRect = option.rect.adjusted( 4, 6, -option.rect.width() + option.rect.height() - 12 + 4, -6 ); - painter->drawPixmap( iconRect, QPixmap( RESPATH "images/user-avatar.png" ).scaledToHeight( iconRect.height(), Qt::SmoothTransformation ) ); + painter->drawPixmap( iconRect, item->icon().pixmap( iconRect.size() ) ); if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected ) {