mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-21 00:09:47 +01:00
Code Issues Releases Wiki Activity

* WelcomeWidget => Dashboard.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2013-06-08 06:07:07 +02:00
parent ae1d641903
commit b89ca65c51
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/ViewManager.cpp
View File

@ -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;
}

8
src/libtomahawk/ViewManager.h
View File

@ -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;

2
src/libtomahawk/widgets/SocialPlaylistWidget.ui
View File

@ -99,7 +99,7 @@
<customwidget>
<class>PlaylistWidget</class>
<extends>QListWidget</extends>
<header>widgets/WelcomeWidget.h</header>
<header>widgets/Dashboard.h</header>
</customwidget>
</customwidgets>
<resources/>

2
src/tomahawk/TomahawkWindow.cpp
View File

@ -149,7 +149,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
audioStopped();
vm->setQueue( m_queueView );
vm->showWelcomePage();
vm->showDashboard();
if ( TomahawkSettings::instance()->fullscreenEnabled() )
{

4
src/tomahawk/sourcetree/SourcesModel.cpp
View File

@ -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