mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 08:04:25 +02:00
Code Issues Releases Wiki Activity

Remove stub page from ViewManager implementation

Browse Source
This commit is contained in:
Dominik Schmidt
2013-06-16 18:29:49 +02:00
committed by Michael Zanetti
parent 187602c424
commit eaf1b58df6
2 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/libtomahawk/ViewManager.cpp
View File

@@ -926,30 +926,29 @@ ViewPage *ViewManager::networkActivityWidget() const
}
class StubWidget : public ViewPage
{
public:
StubWidget(QObject* parent)
// : ViewPage(parent)
{
m_widget = (QWidget*) (new QLabel("Foobar"));
}
virtual QWidget* widget() { return m_widget; }
virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return Tomahawk::playlistinterface_ptr(); }
virtual QString title() const { return QString("Great title"); }
virtual QString description() const { return QString("Great description"); }
virtual bool jumpToCurrentTrack() { return false; }
private:
QWidget* m_widget;
};
ViewPage*
ViewManager::dynamicPageWidget( const QString& pageName ) const
{
return m_dynamicPages.value( pageName );
if( m_dynamicPages.contains( pageName ) )
return m_dynamicPages.value( pageName );
return 0;
}
void
ViewManager::addDynamicPage(const QString& pageName, ViewPage* page )
{
tLog() << Q_FUNC_INFO << "Trying to add " << pageName;
if( dynamicPageWidget( pageName ) )
{
tLog() << "Not adding a second ViewPage with name " << pageName;
Q_ASSERT( false );
}
m_dynamicPages.insert( pageName, page );
emit viewPageAdded( pageName );
}
@@ -958,12 +957,6 @@ ViewManager::showDynamicPage( const QString& pageName )
{
tLog() << Q_FUNC_INFO << "pageName: " << pageName;
//HACK: this should be initialized somewhere else
if ( !dynamicPageWidget( pageName ) )
{
m_dynamicPages.insert( pageName, new StubWidget( m_widget ) );
}
return show( dynamicPageWidget( pageName ) );
}

3
src/libtomahawk/ViewManager.h
View File

@@ -138,6 +138,8 @@ signals:
void historyBackAvailable( bool avail );
void historyForwardAvailable( bool avail );
void viewPageAdded( const QString& pageName );
public slots:
Tomahawk::ViewPage* showRadioPage();
Tomahawk::ViewPage* showSuperCollection();
@@ -148,6 +150,7 @@ public slots:
Tomahawk::ViewPage* showInboxPage();
Tomahawk::ViewPage* showNetworkActivityPage();
void addDynamicPage( const QString& pageName, Tomahawk::ViewPage* page );
Tomahawk::ViewPage* showDynamicPage( const QString& pageName );
void showCurrentTrack();