From e66270fd305bf8632ff9e7e781c7e92aeb773568 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Tue, 30 Jul 2013 15:46:05 +0200
Subject: [PATCH] Use DpiScaler for ViewPage header icons.

---
 src/libtomahawk-widgets/Dashboard.cpp                    | 4 +++-
 src/libtomahawk-widgets/NetworkActivityWidget.cpp        | 5 ++++-
 src/libtomahawk/playlist/PlaylistView.cpp                | 5 ++++-
 .../playlist/dynamic/widgets/DynamicWidget.cpp           | 9 +++++++--
 src/tomahawk/sourcetree/items/SourceItem.cpp             | 5 ++++-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/libtomahawk-widgets/Dashboard.cpp b/src/libtomahawk-widgets/Dashboard.cpp
index 31b5dce6b..e276394f1 100644
--- a/src/libtomahawk-widgets/Dashboard.cpp
+++ b/src/libtomahawk-widgets/Dashboard.cpp
@@ -39,6 +39,7 @@
 #include "utils/TomahawkStyle.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
+#include "utils/DpiScaler.h"
 
 #include <QPainter>
 #include <QScrollArea>
@@ -285,5 +286,6 @@ Dashboard::changeEvent( QEvent* e )
 QPixmap
 Dashboard::pixmap() const
 {
-    return ImageRegistry::instance()->pixmap( RESPATH "images/dashboard.svg", QSize( 256, 256 ) );
+    return ImageRegistry::instance()->pixmap( RESPATH "images/dashboard.svg",
+                                              TomahawkUtils::DpiScaler::scaled( this, 80, 80 ) );
 }
diff --git a/src/libtomahawk-widgets/NetworkActivityWidget.cpp b/src/libtomahawk-widgets/NetworkActivityWidget.cpp
index 777386252..1c75016c6 100644
--- a/src/libtomahawk-widgets/NetworkActivityWidget.cpp
+++ b/src/libtomahawk-widgets/NetworkActivityWidget.cpp
@@ -30,6 +30,7 @@
 #include "utils/Logger.h"
 #include "utils/TomahawkStyle.h"
 #include "utils/TomahawkUtilsGui.h"
+#include "utils/DpiScaler.h"
 #include "widgets/OverlayWidget.h"
 #include "widgets/PlaylistsModel.h"
 #include "widgets/RecentlyPlayedPlaylistsModel.h"
@@ -266,7 +267,9 @@ NetworkActivityWidget::playlistInterface() const
 QPixmap
 NetworkActivityWidget::pixmap() const
 {
-    return TomahawkUtils::defaultPixmap( TomahawkUtils::NetworkActivity, TomahawkUtils::Original, QSize( 256, 256 ) );
+    return TomahawkUtils::defaultPixmap( TomahawkUtils::NetworkActivity,
+                                         TomahawkUtils::Original,
+                                         TomahawkUtils::DpiScaler::scaled( this, 80, 80 ) );
 }
 
 
diff --git a/src/libtomahawk/playlist/PlaylistView.cpp b/src/libtomahawk/playlist/PlaylistView.cpp
index 48b9c57c3..ed4f46082 100644
--- a/src/libtomahawk/playlist/PlaylistView.cpp
+++ b/src/libtomahawk/playlist/PlaylistView.cpp
@@ -26,6 +26,7 @@
 #include "Source.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
+#include "utils/DpiScaler.h"
 
 using namespace Tomahawk;
 
@@ -166,5 +167,7 @@ PlaylistView::onMenuTriggered( int action )
 QPixmap
 PlaylistView::pixmap() const
 {
-    return TomahawkUtils::defaultPixmap( TomahawkUtils::Playlist, TomahawkUtils::Original, QSize( 256, 256 ) );
+    return TomahawkUtils::defaultPixmap( TomahawkUtils::Playlist,
+                                         TomahawkUtils::Original,
+                                         TomahawkUtils::DpiScaler::scaled( this, 80, 80 ) );
 }
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
index 890321d34..ecf1efc01 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
@@ -37,6 +37,7 @@
 #include "utils/AnimatedSpinner.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
+#include "utils/DpiScaler.h"
 
 #include <QVBoxLayout>
 #include <QLabel>
@@ -518,9 +519,13 @@ QPixmap
 DynamicWidget::pixmap() const
 {
     if ( m_playlist->mode() == OnDemand )
-        return TomahawkUtils::defaultPixmap( TomahawkUtils::Station, TomahawkUtils::Original, QSize( 256, 256 ) );
+        return TomahawkUtils::defaultPixmap( TomahawkUtils::Station,
+                                             TomahawkUtils::Original,
+                                             TomahawkUtils::DpiScaler::scaled( this, 80, 80 ) );
     else if ( m_playlist->mode() == Static )
-        return TomahawkUtils::defaultPixmap( TomahawkUtils::AutomaticPlaylist, TomahawkUtils::Original, QSize( 256, 256 ) );
+        return TomahawkUtils::defaultPixmap( TomahawkUtils::AutomaticPlaylist,
+                                             TomahawkUtils::Original,
+                                             TomahawkUtils::DpiScaler::scaled( this, 80, 80 ) );
     else
         return QPixmap();
 }
diff --git a/src/tomahawk/sourcetree/items/SourceItem.cpp b/src/tomahawk/sourcetree/items/SourceItem.cpp
index 3beffcfc6..0984f3d5c 100644
--- a/src/tomahawk/sourcetree/items/SourceItem.cpp
+++ b/src/tomahawk/sourcetree/items/SourceItem.cpp
@@ -44,6 +44,7 @@
 #include "utils/ImageRegistry.h"
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
+#include "utils/DpiScaler.h"
 #include "TomahawkApp.h"
 
 /// SourceItem
@@ -601,7 +602,9 @@ SourceItem::latestAdditionsClicked()
     if ( !m_latestAdditionsPage )
     {
         FlexibleView* pv = new FlexibleView( ViewManager::instance()->widget() );
-        pv->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::NewAdditions, TomahawkUtils::Original, QSize( 256, 256 ) ) );
+        pv->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::NewAdditions,
+                                                     TomahawkUtils::Original,
+                                                     TomahawkUtils::DpiScaler::scaled( pv, 80, 80 ) ) );
 
         RecentlyAddedModel* raModel = new RecentlyAddedModel( pv );
         raModel->setTitle( tr( "Latest Additions" ) );