From 31d47c0454411d4596e77039a3777219dedce8cf Mon Sep 17 00:00:00 2001 From: Kilian Lackhove Date: Wed, 2 Jan 2013 14:00:10 +0100 Subject: [PATCH] show icon in accountswidget for external resolvers, too --- src/libtomahawk/accounts/AccountDelegate.cpp | 2 +- src/libtomahawk/accounts/ResolverAccount.cpp | 5 +++++ src/libtomahawk/accounts/ResolverAccount.h | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/accounts/AccountDelegate.cpp b/src/libtomahawk/accounts/AccountDelegate.cpp index b8816c989..ac64bd964 100644 --- a/src/libtomahawk/accounts/AccountDelegate.cpp +++ b/src/libtomahawk/accounts/AccountDelegate.cpp @@ -171,7 +171,7 @@ AccountDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option, QPixmap p = index.data( Qt::DecorationRole ).value< QPixmap >(); QRect pixmapRect( leftEdge + PADDING, center - ICONSIZE/2, ICONSIZE, ICONSIZE ); if ( p.isNull() ) // default image... TODO - p = TomahawkUtils::defaultPixmap( TomahawkUtils::SipPluginOnline, TomahawkUtils::Original, pixmapRect.size() ); + p = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultResolver, TomahawkUtils::Original, pixmapRect.size() ); else p = p.scaled( pixmapRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation ); diff --git a/src/libtomahawk/accounts/ResolverAccount.cpp b/src/libtomahawk/accounts/ResolverAccount.cpp index d759335ca..26b38eea3 100644 --- a/src/libtomahawk/accounts/ResolverAccount.cpp +++ b/src/libtomahawk/accounts/ResolverAccount.cpp @@ -232,6 +232,11 @@ ResolverAccount::resolverChanged() emit connectionStateChanged( connectionState() ); } +QPixmap +ResolverAccount::icon() const +{ + return m_resolver.data()->icon(); +} /// AtticaResolverAccount diff --git a/src/libtomahawk/accounts/ResolverAccount.h b/src/libtomahawk/accounts/ResolverAccount.h index e5b182497..e977931f5 100644 --- a/src/libtomahawk/accounts/ResolverAccount.h +++ b/src/libtomahawk/accounts/ResolverAccount.h @@ -77,8 +77,9 @@ public: QString path() const; + virtual QPixmap icon() const; + // Not relevant - virtual QPixmap icon() const { return QPixmap(); } virtual SipPlugin* sipPlugin() { return 0; } virtual Tomahawk::InfoSystem::InfoPluginPtr infoPlugin() { return Tomahawk::InfoSystem::InfoPluginPtr(); } virtual QWidget* aclWidget() { return 0; }