From b89ca65c513b511286816262578e56605f22f664 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 8 Jun 2013 06:07:07 +0200
Subject: [PATCH] * WelcomeWidget => Dashboard.

---
 src/libtomahawk/ViewManager.cpp                 | 16 ++++++++--------
 src/libtomahawk/ViewManager.h                   |  8 ++++----
 src/libtomahawk/widgets/SocialPlaylistWidget.ui |  2 +-
 src/tomahawk/TomahawkWindow.cpp                 |  2 +-
 src/tomahawk/sourcetree/SourcesModel.cpp        |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 120f6f624..b0a7691fe 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -45,7 +45,7 @@
 #include "playlist/dynamic/widgets/DynamicWidget.h"
 
 #include "widgets/NewReleasesWidget.h"
-#include "widgets/WelcomeWidget.h"
+#include "widgets/Dashboard.h"
 #include "widgets/WhatsHotWidget.h"
 #include "widgets/NetworkActivityWidget.h"
 #include "widgets/infowidgets/SourceInfoWidget.h"
@@ -78,7 +78,7 @@ ViewManager::instance()
 ViewManager::ViewManager( QObject* parent )
     : QObject( parent )
     , m_widget( new QWidget() )
-    , m_welcomeWidget( new WelcomeWidget() )
+    , m_dashboard( new Dashboard() )
     , m_whatsHotWidget( 0 )
     , m_newReleasesWidget( 0 )
     , m_recentPlaysWidget( 0 )
@@ -121,7 +121,7 @@ ViewManager::ViewManager( QObject* parent )
     connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) );
     connect( m_infobar, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) );
 
-    connect( this, SIGNAL( tomahawkLoaded() ), m_welcomeWidget, SLOT( loadData() ) );
+    connect( this, SIGNAL( tomahawkLoaded() ), m_dashboard, SLOT( loadData() ) );
 
 /*    connect( m_infobar, SIGNAL( flatMode() ), SLOT( setTableMode() ) );
     connect( m_infobar, SIGNAL( artistMode() ), SLOT( setTreeMode() ) );
@@ -134,7 +134,7 @@ ViewManager::~ViewManager()
     delete m_networkActivityWidget;
     delete m_whatsHotWidget;
     delete m_newReleasesWidget;
-    delete m_welcomeWidget;
+    delete m_dashboard;
     delete m_recentPlaysWidget;
     delete m_inboxWidget;
     delete m_contextWidget;
@@ -403,9 +403,9 @@ ViewManager::playlistInterfaceChanged( Tomahawk::playlistinterface_ptr interface
 
 
 Tomahawk::ViewPage*
-ViewManager::showWelcomePage()
+ViewManager::showDashboard()
 {
-    return show( m_welcomeWidget );
+    return show( m_dashboard );
 }
 
 
@@ -864,9 +864,9 @@ ViewManager::showCurrentTrack()
 
 
 Tomahawk::ViewPage*
-ViewManager::welcomeWidget() const
+ViewManager::dashboard() const
 {
-    return m_welcomeWidget;
+    return m_dashboard;
 }
 
 
diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h
index 202ad05f7..cde707f04 100644
--- a/src/libtomahawk/ViewManager.h
+++ b/src/libtomahawk/ViewManager.h
@@ -52,7 +52,7 @@ class SourceInfoWidget;
 class InfoBar;
 class TrackInfoWidget;
 class NewReleasesWidget;
-class WelcomeWidget;
+class Dashboard;
 class WhatsHotWidget;
 class QPushButton;
 class InboxModel;
@@ -89,7 +89,7 @@ public:
 
     Tomahawk::ViewPage* show( Tomahawk::ViewPage* page );
 
-    Tomahawk::ViewPage* welcomeWidget() const;
+    Tomahawk::ViewPage* dashboard() const;
     Tomahawk::ViewPage* whatsHotWidget() const;
     Tomahawk::ViewPage* newReleasesWidget() const;
     Tomahawk::ViewPage* recentPlaysWidget() const;
@@ -136,7 +136,7 @@ signals:
 
 public slots:
     Tomahawk::ViewPage* showSuperCollection();
-    Tomahawk::ViewPage* showWelcomePage();
+    Tomahawk::ViewPage* showDashboard();
     Tomahawk::ViewPage* showWhatsHotPage();
     Tomahawk::ViewPage* showNewReleasesPage();
     Tomahawk::ViewPage* showRecentPlaysPage();
@@ -189,7 +189,7 @@ private:
     TreeModel* m_superCollectionModel;
     TreeWidget* m_superCollectionView;
     QueueView* m_queue;
-    WelcomeWidget* m_welcomeWidget;
+    Dashboard* m_dashboard;
     WhatsHotWidget* m_whatsHotWidget;
     NewReleasesWidget* m_newReleasesWidget;
     Tomahawk::ViewPage* m_recentPlaysWidget;
diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.ui b/src/libtomahawk/widgets/SocialPlaylistWidget.ui
index 1dfc5327b..6c0e91f24 100644
--- a/src/libtomahawk/widgets/SocialPlaylistWidget.ui
+++ b/src/libtomahawk/widgets/SocialPlaylistWidget.ui
@@ -99,7 +99,7 @@
   <customwidget>
    <class>PlaylistWidget</class>
    <extends>QListWidget</extends>
-   <header>widgets/WelcomeWidget.h</header>
+   <header>widgets/Dashboard.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp
index 631715f6f..ee7b473a0 100644
--- a/src/tomahawk/TomahawkWindow.cpp
+++ b/src/tomahawk/TomahawkWindow.cpp
@@ -149,7 +149,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
     audioStopped();
 
     vm->setQueue( m_queueView );
-    vm->showWelcomePage();
+    vm->showDashboard();
 
     if ( TomahawkSettings::instance()->fullscreenEnabled() )
     {
diff --git a/src/tomahawk/sourcetree/SourcesModel.cpp b/src/tomahawk/sourcetree/SourcesModel.cpp
index 73240c930..0c7aa3aa0 100644
--- a/src/tomahawk/sourcetree/SourcesModel.cpp
+++ b/src/tomahawk/sourcetree/SourcesModel.cpp
@@ -298,8 +298,8 @@ SourcesModel::appendGroups()
     m_myMusicGroup = new GroupItem( this, m_rootItem, tr( "My Music" ), 3 );
 
     GenericPageItem* dashboard = new GenericPageItem( this, browse, tr( "Dashboard" ), ImageRegistry::instance()->icon( RESPATH "images/dashboard.svg" ),
-                                                      boost::bind( &ViewManager::showWelcomePage, ViewManager::instance() ),
-                                                      boost::bind( &ViewManager::welcomeWidget, ViewManager::instance() ) );
+                                                      boost::bind( &ViewManager::showDashboard, ViewManager::instance() ),
+                                                      boost::bind( &ViewManager::dashboard, ViewManager::instance() ) );
     dashboard->setSortValue( 0 );
 
     // super collection