From 8fc3f7a4e34502b31ef5faedecd162868ef7c5a9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 9 Nov 2012 06:41:55 +0100 Subject: [PATCH] * Set guids for LovedTracks, RecentPlays and RecentAdditions. --- src/libtomahawk/ViewManager.cpp | 8 +++++++- src/sourcetree/items/LovedTracksItem.cpp | 5 +++++ src/sourcetree/items/SourceItem.cpp | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index e703579ac..626aa3ab2 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -142,6 +142,8 @@ ViewManager::createPageForPlaylist( const playlist_ptr& playlist ) model->loadPlaylist( playlist ); view->setPlayableModel( model ); + pv->setPlaylistModel( model ); + playlist->resolve(); return view; @@ -403,6 +405,8 @@ ViewManager::showRecentPlaysPage() pv->setEmptyTip( tr( "Sorry, we could not find any recent plays!" ) ); raModel->setSource( source_ptr() ); + pv->setGuid( "recentlyplayed" ); + m_recentPlaysWidget = pv; } @@ -599,7 +603,7 @@ ViewManager::saveCurrentPlaylistSettings() if ( !pl.isNull() ) { - s->setShuffleState( pl->guid(), currentPlaylistInterface()->shuffled() ); + s->setShuffleState( pl->guid(), currentPlaylistInterface()->shuffled() ); s->setRepeatMode( pl->guid(), currentPlaylistInterface()->repeatMode() ); } else @@ -734,7 +738,9 @@ void ViewManager::setShuffled( bool enabled ) { if ( currentPlaylistInterface() ) + { currentPlaylistInterface()->setShuffled( enabled ); + } } diff --git a/src/sourcetree/items/LovedTracksItem.cpp b/src/sourcetree/items/LovedTracksItem.cpp index 259c5b344..00fba60be 100644 --- a/src/sourcetree/items/LovedTracksItem.cpp +++ b/src/sourcetree/items/LovedTracksItem.cpp @@ -82,13 +82,18 @@ LovedTracksItem::activate() pv->setEmptyTip( tr( "Sorry, we could not find any loved tracks!" ) ); if ( !par ) + { raModel->setDescription( tr( "The most loved tracks from all your friends" ) ); + pv->setGuid( QString( "lovedtracks" ) ); + } else { if ( par->source()->isLocal() ) raModel->setDescription( tr( "All of your loved tracks" ) ); else raModel->setDescription( tr( "All of %1's loved tracks" ).arg( par->source()->friendlyName() ) ); + + pv->setGuid( QString( "lovedtracks/%1" ).arg( par->source()->userName() ) ); } pv->setPlayableModel( raModel ); diff --git a/src/sourcetree/items/SourceItem.cpp b/src/sourcetree/items/SourceItem.cpp index 770ad9382..a38830b81 100644 --- a/src/sourcetree/items/SourceItem.cpp +++ b/src/sourcetree/items/SourceItem.cpp @@ -529,6 +529,8 @@ SourceItem::latestAdditionsClicked() pv->setEmptyTip( tr( "Sorry, we could not find any recent additions!" ) ); raModel->setSource( m_source ); + pv->setGuid( QString( "latestadditions/%1" ).arg( m_source->userName() ) ); + m_latestAdditionsPage = pv; } @@ -568,6 +570,8 @@ SourceItem::recentPlaysClicked() pv->setEmptyTip( tr( "Sorry, we could not find any recent plays!" ) ); raModel->setSource( m_source ); + pv->setGuid( QString( "recentplays/%1" ).arg( m_source->userName() ) ); + m_recentPlaysPage = pv; }