From 5525853a84676fcf2773480215aa0dc2aaf9766e Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 12 Oct 2014 09:00:43 +0200 Subject: [PATCH] Adapt to new FlexibleView API. --- src/libtomahawk/ContextMenu.cpp | 6 ++--- src/libtomahawk/GlobalActionManager.cpp | 8 +++--- src/libtomahawk/playlist/InboxView.cpp | 17 +++++++------ src/libtomahawk/playlist/QueueView.cpp | 25 ++++++++++--------- src/libtomahawk/widgets/HistoryWidget.cpp | 10 ++++---- src/tomahawk/AudioControls.cpp | 2 +- src/tomahawk/TomahawkWindow.cpp | 2 +- .../sourcetree/items/LovedTracksItem.cpp | 12 ++++----- .../sourcetree/items/PlaylistItems.cpp | 2 +- src/tomahawk/sourcetree/items/QueueItem.cpp | 9 ++++--- src/tomahawk/sourcetree/items/SourceItem.cpp | 9 +++---- 11 files changed, 52 insertions(+), 50 deletions(-) diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index a3fe3313f..a1904345f 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/src/libtomahawk/ContextMenu.cpp @@ -403,15 +403,15 @@ ContextMenu::addToQueue() { foreach ( const query_ptr& query, m_queries ) { - ViewManager::instance()->queue()->trackView()->model()->appendQuery( query ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendQuery( query ); } foreach ( const artist_ptr& artist, m_artists ) { - ViewManager::instance()->queue()->trackView()->model()->appendArtist( artist ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendArtist( artist ); } foreach ( const album_ptr& album, m_albums ) { - ViewManager::instance()->queue()->trackView()->model()->appendAlbum( album ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendAlbum( album ); } } diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index a3fd14d87..8a742a318 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/src/libtomahawk/GlobalActionManager.cpp @@ -638,7 +638,7 @@ GlobalActionManager::handleLoveCommand( const QUrl& url ) void GlobalActionManager::handleOpenTrack( const query_ptr& q ) { - ViewManager::instance()->queue()->trackView()->model()->appendQuery( q ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendQuery( q ); ViewManager::instance()->showQueuePage(); if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() ) @@ -655,7 +655,7 @@ GlobalActionManager::handleOpenTracks( const QList< query_ptr >& queries ) if ( queries.isEmpty() ) return; - ViewManager::instance()->queue()->trackView()->model()->appendQueries( queries ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendQueries( queries ); ViewManager::instance()->showQueuePage(); if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() ) @@ -855,7 +855,7 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q Pipeline::instance()->resolve( q ); - ViewManager::instance()->queue()->trackView()->model()->appendQuery( q ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendQuery( q ); ViewManager::instance()->showQueuePage(); } return true; @@ -1330,7 +1330,7 @@ GlobalActionManager::waitingForResolved( bool /* success */ ) AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() ); else { - ViewManager::instance()->queue()->trackView()->model()->appendQuery( m_waitingToPlay ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendQuery( m_waitingToPlay ); AudioEngine::instance()->play(); } } diff --git a/src/libtomahawk/playlist/InboxView.cpp b/src/libtomahawk/playlist/InboxView.cpp index bf1d21b3a..2bc03608e 100644 --- a/src/libtomahawk/playlist/InboxView.cpp +++ b/src/libtomahawk/playlist/InboxView.cpp @@ -20,10 +20,12 @@ #include "InboxView.h" #include "InboxModel.h" +#include "ContextView.h" #include "PlayableProxyModel.h" #include "ContextMenu.h" #include "playlist/TrackItemDelegate.h" #include "ViewManager.h" +#include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" InboxView::InboxView( QWidget* parent ) : @@ -77,14 +79,13 @@ InboxView::onMenuTriggered( int action ) InboxPage::InboxPage( QWidget* parent ) : FlexibleView( parent ) { - InboxView* inboxView = new InboxView( this ); - setTrackView( inboxView ); - setCurrentMode( Flat ); -// setCaption( tr( "Inbox Details" ) ); + view()->setCaption( tr( "Inbox Details" ) ); - setPlayableModel( ViewManager::instance()->inboxModel() ); - setEmptyTip( tr( "Your friends have not shared any recommendations with you yet. Connect with them and share your musical gems!" ) ); + setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::Inbox ) ); - TrackItemDelegate* delegate = new TrackItemDelegate( TrackItemDelegate::Inbox, inboxView, inboxView->proxyModel() ); - inboxView->setPlaylistItemDelegate( delegate ); + view()->trackView()->setPlayableModel( ViewManager::instance()->inboxModel() ); + view()->trackView()->setEmptyTip( tr( "Your friends have not shared any recommendations with you yet. Connect with them and share your musical gems!" ) ); + + TrackItemDelegate* delegate = new TrackItemDelegate( TrackItemDelegate::Inbox, view()->trackView(), view()->trackView()->proxyModel() ); + view()->trackView()->setPlaylistItemDelegate( delegate ); } diff --git a/src/libtomahawk/playlist/QueueView.cpp b/src/libtomahawk/playlist/QueueView.cpp index e3486820d..13bb25470 100644 --- a/src/libtomahawk/playlist/QueueView.cpp +++ b/src/libtomahawk/playlist/QueueView.cpp @@ -36,23 +36,24 @@ using namespace Tomahawk; QueueView::QueueView( QWidget* parent ) : FlexibleView( parent ) { -// setCaption( tr( "Queue Details" ) ); + view()->setCaption( tr( "Queue Details" ) ); - trackView()->setProxyModel( new QueueProxyModel( trackView() ) ); - trackView()->proxyModel()->setStyle( PlayableProxyModel::Fancy ); - trackView()->setHeaderHidden( true ); - trackView()->setUniformRowHeights( false ); + view()->trackView()->setProxyModel( new QueueProxyModel( view()->trackView() ) ); + view()->trackView()->proxyModel()->setStyle( PlayableProxyModel::Fancy ); + view()->trackView()->setHeaderHidden( true ); + view()->trackView()->setUniformRowHeights( false ); - PlaylistModel* queueModel = new PlaylistModel( trackView() ); + PlaylistModel* queueModel = new PlaylistModel( view()->trackView() ); queueModel->setAcceptPlayableQueriesOnly( true ); queueModel->setReadOnly( false ); queueModel->setTitle( tr( "Queue" ) ); + setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::Queue ) ); - setPlayableModel( queueModel ); - setEmptyTip( tr( "The queue is currently empty. Drop something to enqueue it!" ) ); + view()->trackView()->setPlayableModel( queueModel ); + view()->setEmptyTip( tr( "The queue is currently empty. Drop something to enqueue it!" ) ); - TrackItemDelegate* delegate = new TrackItemDelegate( TrackItemDelegate::LovedTracks, trackView(), trackView()->proxyModel() ); - trackView()->setPlaylistItemDelegate( delegate ); + TrackItemDelegate* delegate = new TrackItemDelegate( TrackItemDelegate::LovedTracks, view()->trackView(), view()->trackView()->proxyModel() ); + view()->trackView()->setPlaylistItemDelegate( delegate ); if ( Pipeline::instance()->isRunning() && SourceList::instance()->isReady() ) { @@ -91,7 +92,7 @@ QueueView::restoreState() if ( !ql.isEmpty() ) { - trackView()->model()->appendQueries( ql ); + view()->trackView()->model()->appendQueries( ql ); } } @@ -100,7 +101,7 @@ void QueueView::saveState() { QVariantList vl; - foreach ( const query_ptr& query, trackView()->model()->queries() ) + foreach ( const query_ptr& query, view()->trackView()->model()->queries() ) { vl << query->toVariant(); } diff --git a/src/libtomahawk/widgets/HistoryWidget.cpp b/src/libtomahawk/widgets/HistoryWidget.cpp index 8ea275e0d..6978b0772 100644 --- a/src/libtomahawk/widgets/HistoryWidget.cpp +++ b/src/libtomahawk/widgets/HistoryWidget.cpp @@ -50,14 +50,14 @@ HistoryWidget::HistoryWidget( const source_ptr& source, QWidget* parent ) else m_model->setDescription( tr( "%1's recently played tracks" ).arg( source->friendlyName() ) ); - trackView()->setIndentation( 0 ); - trackView()->setUniformRowHeights( false ); + view()->trackView()->setIndentation( 0 ); + view()->trackView()->setUniformRowHeights( false ); - setPlayableModel( m_model ); - setEmptyTip( tr( "Sorry, we could not find any recent plays!" ) ); + view()->trackView()->setPlayableModel( m_model ); + view()->setEmptyTip( tr( "Sorry, we could not find any recent plays!" ) ); m_model->setSource( source ); - setGuid( QString( "recentplays/%1" ).arg( source->nodeId() ) ); + view()->setGuid( QString( "recentplays/%1" ).arg( source->nodeId() ) ); } diff --git a/src/tomahawk/AudioControls.cpp b/src/tomahawk/AudioControls.cpp index 5d2771734..d72c58743 100644 --- a/src/tomahawk/AudioControls.cpp +++ b/src/tomahawk/AudioControls.cpp @@ -747,7 +747,7 @@ AudioControls::droppedTracks( QList< query_ptr > tracks ) { // queue and play the first no matter what GlobalActionManager::instance()->handlePlayTrack( tracks.first() ); - ViewManager::instance()->queue()->trackView()->model()->appendQueries( tracks ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendQueries( tracks ); } } diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index a2b65f6db..621feb5a4 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -119,7 +119,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) new ViewManager( this ); QueueView* queueView = new QueueView(); ViewManager::instance()->setQueue( queueView ); - AudioEngine::instance()->setQueue( queueView->trackView()->proxyModel()->playlistInterface() ); + AudioEngine::instance()->setQueue( queueView->view()->trackView()->proxyModel()->playlistInterface() ); m_audioControls = new AudioControls( this ); diff --git a/src/tomahawk/sourcetree/items/LovedTracksItem.cpp b/src/tomahawk/sourcetree/items/LovedTracksItem.cpp index 3b9a971e0..b8a51216f 100644 --- a/src/tomahawk/sourcetree/items/LovedTracksItem.cpp +++ b/src/tomahawk/sourcetree/items/LovedTracksItem.cpp @@ -80,14 +80,14 @@ LovedTracksItem::activate() TopLovedTracksModel* raModel = new TopLovedTracksModel( pv ); raModel->setTitle( text() ); - TrackItemDelegate* del = new TrackItemDelegate( TrackItemDelegate::LovedTracks, pv->trackView(), pv->trackView()->proxyModel() ); - pv->trackView()->setPlaylistItemDelegate( del ); + TrackItemDelegate* del = new TrackItemDelegate( TrackItemDelegate::LovedTracks, pv->view()->trackView(), pv->view()->trackView()->proxyModel() ); + pv->view()->trackView()->setPlaylistItemDelegate( del ); - pv->setEmptyTip( tr( "Sorry, we could not find any of your Favorites!" ) ); + pv->view()->trackView()->setEmptyTip( tr( "Sorry, we could not find any of your Favorites!" ) ); if ( !par ) { raModel->setDescription( tr( "The most loved tracks from all your friends" ) ); - pv->setGuid( QString( "lovedtracks" ) ); + pv->view()->setGuid( QString( "lovedtracks" ) ); } else { @@ -96,10 +96,10 @@ LovedTracksItem::activate() else raModel->setDescription( tr( "All of %1's loved tracks" ).arg( par->source()->friendlyName() ) ); - pv->setGuid( QString( "lovedtracks/%1" ).arg( par->source()->nodeId() ) ); + pv->view()->setGuid( QString( "lovedtracks/%1" ).arg( par->source()->nodeId() ) ); } - pv->setPlaylistModel( raModel ); + pv->view()->trackView()->setPlayableModel( raModel ); raModel->setSource( !par ? source_ptr() : par->source() ); m_lovedTracksPage = pv; diff --git a/src/tomahawk/sourcetree/items/PlaylistItems.cpp b/src/tomahawk/sourcetree/items/PlaylistItems.cpp index f3bf2e18c..8ae69d761 100644 --- a/src/tomahawk/sourcetree/items/PlaylistItems.cpp +++ b/src/tomahawk/sourcetree/items/PlaylistItems.cpp @@ -152,7 +152,7 @@ PlaylistItem::doubleClicked() ViewPage* p = ViewManager::instance()->currentPage(); if ( FlexibleView* view = dynamic_cast< FlexibleView* >( p ) ) { - view->trackView()->startPlayingFromStart(); + view->view()->trackView()->startPlayingFromStart(); } } diff --git a/src/tomahawk/sourcetree/items/QueueItem.cpp b/src/tomahawk/sourcetree/items/QueueItem.cpp index 0be9e4f00..90d3848ac 100644 --- a/src/tomahawk/sourcetree/items/QueueItem.cpp +++ b/src/tomahawk/sourcetree/items/QueueItem.cpp @@ -39,12 +39,13 @@ QueueItem::QueueItem( SourcesModel* model, SourceTreeItem* parent ) m_text = tr( "Queue" ); m_icon = ImageRegistry::instance()->icon( RESPATH "images/queue.svg" ); - connect( ViewManager::instance()->queue()->trackView()->proxyModel(), SIGNAL( itemCountChanged( uint ) ), SIGNAL( updated() ) ); + connect( ViewManager::instance()->queue()->view()->trackView()->proxyModel(), SIGNAL( itemCountChanged( uint ) ), SIGNAL( updated() ) ); } QueueItem::~QueueItem() -{} +{ +} QString @@ -78,7 +79,7 @@ QueueItem::setSortValue( int value ) int QueueItem::unlistenedCount() const { - return ViewManager::instance()->queue()->trackView()->proxyModel()->rowCount(); + return ViewManager::instance()->queue()->view()->trackView()->proxyModel()->rowCount(); } @@ -170,7 +171,7 @@ QueueItem::parsedDroppedTracks( const QList< Tomahawk::query_ptr >& tracks ) { if ( tracks.count() ) { - ViewManager::instance()->queue()->trackView()->model()->appendQueries( tracks ); + ViewManager::instance()->queue()->view()->trackView()->model()->appendQueries( tracks ); } else tDebug() << "ERROR: Could not add empty track list to queue!"; diff --git a/src/tomahawk/sourcetree/items/SourceItem.cpp b/src/tomahawk/sourcetree/items/SourceItem.cpp index 64d8eaef8..702120842 100644 --- a/src/tomahawk/sourcetree/items/SourceItem.cpp +++ b/src/tomahawk/sourcetree/items/SourceItem.cpp @@ -619,13 +619,12 @@ SourceItem::latestAdditionsClicked() else raModel->setDescription( tr( "Latest additions to %1's collection" ).arg( m_source->friendlyName() ) ); - pv->setPlayableModel( raModel ); - pv->trackView()->sortByColumn( PlayableModel::Age, Qt::DescendingOrder ); - pv->detailedView()->sortByColumn( PlayableModel::Age, Qt::DescendingOrder ); - pv->setEmptyTip( tr( "Sorry, we could not find any recent additions!" ) ); + pv->view()->trackView()->setPlayableModel( raModel ); + pv->view()->trackView()->sortByColumn( PlayableModel::Age, Qt::DescendingOrder ); + pv->view()->trackView()->setEmptyTip( tr( "Sorry, we could not find any recent additions!" ) ); raModel->setSource( m_source ); - pv->setGuid( QString( "latestadditions/%1" ).arg( m_source->nodeId() ) ); + pv->view()->setGuid( QString( "latestadditions/%1" ).arg( m_source->nodeId() ) ); m_latestAdditionsPage = pv; }