mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

Move more logic from Dashboard to ViewPageLazyLoader

Browse Source
This commit is contained in:
Dominik Schmidt
2013-08-07 20:37:43 +02:00
parent 95a94ca60c
commit 453f746659
3 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libtomahawk/ViewPageLazyLoader.h
View File

@@ -35,11 +35,13 @@ public:
{ {
} }
virtual ~ViewPageLazyLoader() virtual ~ViewPageLazyLoader()
{ {
delete m_widget; delete m_widget;
} }
virtual T* widget() virtual T* widget()
{ {
if( !m_widget ) if( !m_widget )
@@ -49,6 +51,32 @@ public:
} }
virtual playlistinterface_ptr playlistInterface() const
{
if( m_widget )
return m_widget->playlistInterface();
return playlistinterface_ptr();
}
virtual bool isBeingPlayed() const
{
if( m_widget && m_widget->isBeingPlayed() )
return true;
return false;
}
virtual bool jumpToCurrentTrack()
{
if( m_widget && m_widget->jumpToCurrentTrack() )
return true;
return false;
}
protected: protected:
T* m_widget; T* m_widget;
}; };

18
src/viewpages/dashboard/Dashboard.cpp
View File

@@ -200,20 +200,20 @@ DashboardWidget::~DashboardWidget()
} }
Tomahawk::playlistinterface_ptr playlistinterface_ptr
Dashboard::playlistInterface() const DashboardWidget::playlistInterface() const
{ {
return m_widget->m_playlistInterface; return m_playlistInterface;
} }
bool bool
Dashboard::jumpToCurrentTrack() DashboardWidget::jumpToCurrentTrack()
{ {
if ( m_widget->ui->tracksView->jumpToCurrentTrack() ) if ( ui->tracksView->jumpToCurrentTrack() )
return true; return true;
if ( m_widget->ui->additionsView->jumpToCurrentTrack() ) if ( ui->additionsView->jumpToCurrentTrack() )
return true; return true;
return false; return false;
@@ -221,12 +221,12 @@ Dashboard::jumpToCurrentTrack()
bool bool
Dashboard::isBeingPlayed() const DashboardWidget::isBeingPlayed() const
{ {
if ( m_widget->ui->additionsView->isBeingPlayed() ) if ( ui->additionsView->isBeingPlayed() )
return true; return true;
return AudioEngine::instance()->currentTrackPlaylist() == m_widget->ui->tracksView->playlistInterface(); return AudioEngine::instance()->currentTrackPlaylist() == ui->tracksView->playlistInterface();
} }

9
src/viewpages/dashboard/Dashboard.h
View File

@@ -61,6 +61,10 @@ public:
DashboardWidget( QWidget* parent = 0 ); DashboardWidget( QWidget* parent = 0 );
virtual ~DashboardWidget(); virtual ~DashboardWidget();
virtual bool isBeingPlayed() const;
virtual playlistinterface_ptr playlistInterface() const;
virtual bool jumpToCurrentTrack();
public slots: public slots:
void updatePlaylists(); void updatePlaylists();
void updateRecentAdditions(); void updateRecentAdditions();
@@ -92,8 +96,6 @@ public:
Dashboard( QWidget* parent = 0 ); Dashboard( QWidget* parent = 0 );
virtual ~Dashboard(); virtual ~Dashboard();
virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
virtual const QString defaultName() { return DASHBOARD_VIEWPAGE_NAME; } virtual const QString defaultName() { return DASHBOARD_VIEWPAGE_NAME; }
virtual QString title() const { return tr( "Dashboard" ); } virtual QString title() const { return tr( "Dashboard" ); }
virtual QString description() const { return tr( "An overview of your recent activity" ); } virtual QString description() const { return tr( "An overview of your recent activity" ); }
@@ -102,9 +104,6 @@ public:
virtual int sortValue() { return 1; } virtual int sortValue() { return 1; }
virtual bool showInfoBar() const { return true; } virtual bool showInfoBar() const { return true; }
virtual bool isBeingPlayed() const;
virtual bool jumpToCurrentTrack();
}; };