From 8c6ef2f533a7a3315bd191954249f6cb6b9f9f3b Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 6 Sep 2011 05:49:33 +0200 Subject: [PATCH] * Fixed TWK-378: Show source avatar when viewing a collection. --- src/libtomahawk/playlist/artistview.h | 2 +- src/libtomahawk/playlist/treemodel.cpp | 1 + src/libtomahawk/playlist/treemodel.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/playlist/artistview.h b/src/libtomahawk/playlist/artistview.h index 4ab9201fc..8432f0c42 100644 --- a/src/libtomahawk/playlist/artistview.h +++ b/src/libtomahawk/playlist/artistview.h @@ -59,7 +59,7 @@ public: virtual QString title() const { return m_model->title(); } virtual QString description() const { return m_model->description(); } - virtual QPixmap pixmap() const { return QPixmap( RESPATH "images/music-icon.png" ); } + virtual QPixmap pixmap() const { return m_model->icon(); } virtual bool showStatsBar() const { return false; } virtual bool showFilter() const { return true; } diff --git a/src/libtomahawk/playlist/treemodel.cpp b/src/libtomahawk/playlist/treemodel.cpp index 47520ae6c..f46752b4a 100644 --- a/src/libtomahawk/playlist/treemodel.cpp +++ b/src/libtomahawk/playlist/treemodel.cpp @@ -614,6 +614,7 @@ TreeModel::addCollection( const collection_ptr& collection ) Database::instance()->enqueue( QSharedPointer( cmd ) ); + setIcon( collection->source()->avatar() ); if ( collection->source()->isLocal() ) setTitle( tr( "Your Collection" ) ); else diff --git a/src/libtomahawk/playlist/treemodel.h b/src/libtomahawk/playlist/treemodel.h index 1bc075fe3..6f04d1645 100644 --- a/src/libtomahawk/playlist/treemodel.h +++ b/src/libtomahawk/playlist/treemodel.h @@ -100,8 +100,10 @@ public: virtual QString title() const { return m_title; } virtual QString description() const { return m_description; } + virtual QPixmap icon() const { return m_icon; } virtual void setTitle( const QString& title ) { m_title = title; } virtual void setDescription( const QString& description ) { m_description = description; } + virtual void setIcon( const QPixmap& pixmap ) { m_icon = pixmap; } QModelIndex indexFromArtist( const Tomahawk::artist_ptr& artist ) const; QModelIndex indexFromAlbum( const Tomahawk::album_ptr& album ) const; @@ -156,6 +158,7 @@ private: QString m_title; QString m_description; + QPixmap m_icon; ColumnStyle m_columnStyle; QList m_artistsFilter;