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

* Properly store / restore DynamicQmlWidgets.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-07-14 12:43:13 +02:00
parent 73f05971e4
commit b9a909eb56
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/ViewManager.cpp
View File

@@ -190,14 +190,9 @@ ViewManager::show( const Tomahawk::playlist_ptr& playlist )
Tomahawk::ViewPage* Tomahawk::ViewPage*
ViewManager::show( const Tomahawk::dynplaylist_ptr& playlist ) ViewManager::show( const Tomahawk::dynplaylist_ptr& playlist )
{ {
DynamicQmlWidget* w = new Tomahawk::DynamicQmlWidget( playlist, m_stack );
setPage( w );
return w;
//// OLD FOO
if ( !m_dynamicWidgets.contains( playlist ) || m_dynamicWidgets.value( playlist ).isNull() ) if ( !m_dynamicWidgets.contains( playlist ) || m_dynamicWidgets.value( playlist ).isNull() )
{ {
m_dynamicWidgets[ playlist ] = new Tomahawk::DynamicWidget( playlist, m_stack ); m_dynamicWidgets[ playlist ] = new Tomahawk::DynamicQmlWidget( playlist, m_stack );
playlist->resolve(); playlist->resolve();
} }
@@ -855,7 +850,7 @@ ViewManager::playlistForInterface( Tomahawk::playlistinterface_ptr interface ) c
Tomahawk::dynplaylist_ptr Tomahawk::dynplaylist_ptr
ViewManager::dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr interface ) const ViewManager::dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr interface ) const
{ {
foreach ( QWeakPointer<DynamicWidget> view, m_dynamicWidgets.values() ) foreach ( QWeakPointer<DynamicQmlWidget> view, m_dynamicWidgets.values() )
{ {
if ( !view.isNull() && view.data()->playlistInterface() == interface ) if ( !view.isNull() && view.data()->playlistInterface() == interface )
{ {

3
src/libtomahawk/ViewManager.h
View File

@@ -59,6 +59,7 @@ class QPushButton;
namespace Tomahawk namespace Tomahawk
{ {
class DynamicWidget; class DynamicWidget;
class DynamicQmlWidget;
} }
class DLLEXPORT ViewManager : public QObject class DLLEXPORT ViewManager : public QObject
@@ -199,7 +200,7 @@ private:
QList< Tomahawk::collection_ptr > m_superCollections; QList< Tomahawk::collection_ptr > m_superCollections;
QHash< Tomahawk::dynplaylist_ptr, QWeakPointer<Tomahawk::DynamicWidget> > m_dynamicWidgets; QHash< Tomahawk::dynplaylist_ptr, QWeakPointer<Tomahawk::DynamicQmlWidget> > m_dynamicWidgets;
QHash< Tomahawk::collection_ptr, QWeakPointer<TreeView> > m_treeViews; QHash< Tomahawk::collection_ptr, QWeakPointer<TreeView> > m_treeViews;
QHash< Tomahawk::artist_ptr, QWeakPointer<ArtistInfoWidget> > m_artistViews; QHash< Tomahawk::artist_ptr, QWeakPointer<ArtistInfoWidget> > m_artistViews;
QHash< Tomahawk::album_ptr, QWeakPointer<AlbumInfoWidget> > m_albumViews; QHash< Tomahawk::album_ptr, QWeakPointer<AlbumInfoWidget> > m_albumViews;