mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-07 06:36:55 +02:00
* Use new PlayableModel API throughout app.
This commit is contained in:
@@ -85,7 +85,7 @@ AudioControls::AudioControls( QWidget* parent )
|
|||||||
ui->socialButton->setPixmap( RESPATH "images/share.png" );
|
ui->socialButton->setPixmap( RESPATH "images/share.png" );
|
||||||
ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
|
ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
|
||||||
ui->loveButton->setCheckable( true );
|
ui->loveButton->setCheckable( true );
|
||||||
|
|
||||||
ui->socialButton->setFixedSize( QSize( 20, 20 ) );
|
ui->socialButton->setFixedSize( QSize( 20, 20 ) );
|
||||||
ui->loveButton->setFixedSize( QSize( 20, 20 ) );
|
ui->loveButton->setFixedSize( QSize( 20, 20 ) );
|
||||||
|
|
||||||
@@ -588,7 +588,7 @@ AudioControls::droppedTracks( QList< query_ptr > tracks )
|
|||||||
{
|
{
|
||||||
// queue and play the first no matter what
|
// queue and play the first no matter what
|
||||||
GlobalActionManager::instance()->handlePlayTrack( tracks.first() );
|
GlobalActionManager::instance()->handlePlayTrack( tracks.first() );
|
||||||
ViewManager::instance()->queue()->model()->append( tracks );
|
ViewManager::instance()->queue()->model()->appendQueries( tracks );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -224,7 +224,7 @@ ContextMenu::onTriggered( int action )
|
|||||||
case ActionCopyLink:
|
case ActionCopyLink:
|
||||||
copyLink();
|
copyLink();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ActionPage:
|
case ActionPage:
|
||||||
openPage();
|
openPage();
|
||||||
break;
|
break;
|
||||||
@@ -252,15 +252,15 @@ ContextMenu::addToQueue()
|
|||||||
{
|
{
|
||||||
foreach ( const query_ptr& query, m_queries )
|
foreach ( const query_ptr& query, m_queries )
|
||||||
{
|
{
|
||||||
ViewManager::instance()->queue()->model()->append( query );
|
ViewManager::instance()->queue()->model()->appendQuery( query );
|
||||||
}
|
}
|
||||||
foreach ( const artist_ptr& artist, m_artists )
|
foreach ( const artist_ptr& artist, m_artists )
|
||||||
{
|
{
|
||||||
ViewManager::instance()->queue()->model()->append( artist );
|
ViewManager::instance()->queue()->model()->appendArtist( artist );
|
||||||
}
|
}
|
||||||
foreach ( const album_ptr& album, m_albums )
|
foreach ( const album_ptr& album, m_albums )
|
||||||
{
|
{
|
||||||
ViewManager::instance()->queue()->model()->append( album );
|
ViewManager::instance()->queue()->model()->appendAlbum( album );
|
||||||
}
|
}
|
||||||
|
|
||||||
ViewManager::instance()->showQueue();
|
ViewManager::instance()->showQueue();
|
||||||
|
@@ -553,7 +553,7 @@ GlobalActionManager::handleOpenCommand( const QUrl& url )
|
|||||||
void
|
void
|
||||||
GlobalActionManager::handleOpenTrack( const query_ptr& q )
|
GlobalActionManager::handleOpenTrack( const query_ptr& q )
|
||||||
{
|
{
|
||||||
ViewManager::instance()->queue()->model()->append( q );
|
ViewManager::instance()->queue()->model()->appendQuery( q );
|
||||||
ViewManager::instance()->showQueue();
|
ViewManager::instance()->showQueue();
|
||||||
|
|
||||||
if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() )
|
if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() )
|
||||||
@@ -570,7 +570,7 @@ GlobalActionManager::handleOpenTracks( const QList< query_ptr >& queries )
|
|||||||
if ( queries.isEmpty() )
|
if ( queries.isEmpty() )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ViewManager::instance()->queue()->model()->append( queries );
|
ViewManager::instance()->queue()->model()->appendQueries( queries );
|
||||||
ViewManager::instance()->showQueue();
|
ViewManager::instance()->showQueue();
|
||||||
|
|
||||||
if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() )
|
if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() )
|
||||||
@@ -670,7 +670,7 @@ GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< Q
|
|||||||
|
|
||||||
Pipeline::instance()->resolve( q, true );
|
Pipeline::instance()->resolve( q, true );
|
||||||
|
|
||||||
ViewManager::instance()->queue()->model()->append( q );
|
ViewManager::instance()->queue()->model()->appendQuery( q );
|
||||||
ViewManager::instance()->showQueue();
|
ViewManager::instance()->showQueue();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@@ -1343,7 +1343,7 @@ GlobalActionManager::waitingForResolved( bool /* success */ )
|
|||||||
AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() );
|
AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() );
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ViewManager::instance()->queue()->model()->append( m_waitingToPlay );
|
ViewManager::instance()->queue()->model()->appendQuery( m_waitingToPlay );
|
||||||
AudioEngine::instance()->play();
|
AudioEngine::instance()->play();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -100,7 +100,7 @@ TopTracksContext::onTracksFound( const QList<Tomahawk::query_ptr>& queries, Mode
|
|||||||
{
|
{
|
||||||
Q_UNUSED( mode );
|
Q_UNUSED( mode );
|
||||||
|
|
||||||
m_topHitsModel->append( queries );
|
m_topHitsModel->appendQueries( queries );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -112,7 +112,7 @@ CustomPlaylistView::tracksGenerated( QList< query_ptr > tracks )
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
m_model->clear();
|
m_model->clear();
|
||||||
m_model->append( newTracks );
|
m_model->appendQueries( newTracks );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -125,10 +125,7 @@ NewPlaylistWidget::suggestionsFound()
|
|||||||
m_suggestionsModel = new PlaylistModel( ui->suggestionsView );
|
m_suggestionsModel = new PlaylistModel( ui->suggestionsView );
|
||||||
ui->suggestionsView->setPlaylistModel( m_suggestionsModel );
|
ui->suggestionsView->setPlaylistModel( m_suggestionsModel );
|
||||||
|
|
||||||
foreach( const Tomahawk::query_ptr& query, m_queries )
|
m_suggestionsModel->appendQueries( m_queries );
|
||||||
{
|
|
||||||
m_suggestionsModel->append( query );
|
|
||||||
}
|
|
||||||
|
|
||||||
loader->deleteLater();
|
loader->deleteLater();
|
||||||
}
|
}
|
||||||
|
@@ -356,7 +356,7 @@ NewReleasesWidget::newReleasesLoaded( ChartDataLoader* loader, const QList< albu
|
|||||||
Q_ASSERT( m_albumModels.contains( chartId ) );
|
Q_ASSERT( m_albumModels.contains( chartId ) );
|
||||||
|
|
||||||
if ( m_albumModels.contains( chartId ) )
|
if ( m_albumModels.contains( chartId ) )
|
||||||
m_albumModels[ chartId ]->append( albums );
|
m_albumModels[ chartId ]->appendAlbums( albums );
|
||||||
|
|
||||||
m_workers.remove( loader );
|
m_workers.remove( loader );
|
||||||
loader->deleteLater();
|
loader->deleteLater();
|
||||||
|
@@ -124,7 +124,7 @@ SearchWidget::onResultsFound( const QList<Tomahawk::result_ptr>& results )
|
|||||||
Tomahawk::query_ptr q = result->toQuery();
|
Tomahawk::query_ptr q = result->toQuery();
|
||||||
q->addResults( rl );
|
q->addResults( rl );
|
||||||
|
|
||||||
m_resultsModel->append( q );
|
m_resultsModel->appendQuery( q );
|
||||||
|
|
||||||
m_artists << result->artist();
|
m_artists << result->artist();
|
||||||
m_albums << result->album();
|
m_albums << result->album();
|
||||||
@@ -178,7 +178,7 @@ SearchWidget::sortArtists()
|
|||||||
}
|
}
|
||||||
|
|
||||||
m_artistsModel->clear();
|
m_artistsModel->clear();
|
||||||
m_artistsModel->append( sortedArtists );
|
m_artistsModel->appendArtists( sortedArtists );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -205,5 +205,5 @@ SearchWidget::sortAlbums()
|
|||||||
}
|
}
|
||||||
|
|
||||||
m_albumsModel->clear();
|
m_albumsModel->clear();
|
||||||
m_albumsModel->append( sortedAlbums );
|
m_albumsModel->appendAlbums( sortedAlbums );
|
||||||
}
|
}
|
||||||
|
@@ -140,7 +140,7 @@ SocialPlaylistWidget::popularAlbumsFetched( QList< album_ptr > albums )
|
|||||||
{
|
{
|
||||||
m_popularNewAlbumsModel->clear();
|
m_popularNewAlbumsModel->clear();
|
||||||
|
|
||||||
m_popularNewAlbumsModel->append( albums );
|
m_popularNewAlbumsModel->appendAlbums( albums );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -148,6 +148,6 @@ void
|
|||||||
SocialPlaylistWidget::topForeignTracksFetched( QList< query_ptr > tracks )
|
SocialPlaylistWidget::topForeignTracksFetched( QList< query_ptr > tracks )
|
||||||
{
|
{
|
||||||
m_topForeignTracksModel->clear();
|
m_topForeignTracksModel->clear();
|
||||||
foreach( const query_ptr& q, tracks )
|
|
||||||
m_topForeignTracksModel->append( q );
|
m_topForeignTracksModel->appendQueries( tracks );
|
||||||
}
|
}
|
||||||
|
@@ -507,7 +507,7 @@ WhatsHotWidget::chartTracksLoaded( ChartDataLoader* loader, const QList< query_p
|
|||||||
if ( m_trackModels.contains( chartId ) )
|
if ( m_trackModels.contains( chartId ) )
|
||||||
{
|
{
|
||||||
Pipeline::instance()->resolve( tracks );
|
Pipeline::instance()->resolve( tracks );
|
||||||
m_trackModels[ chartId ]->append( tracks );
|
m_trackModels[ chartId ]->appendQueries( tracks );
|
||||||
m_trackModels[ chartId ]->finishLoading();
|
m_trackModels[ chartId ]->finishLoading();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -524,7 +524,7 @@ WhatsHotWidget::chartAlbumsLoaded( ChartDataLoader* loader, const QList< album_p
|
|||||||
|
|
||||||
if ( m_albumModels.contains( chartId ) )
|
if ( m_albumModels.contains( chartId ) )
|
||||||
{
|
{
|
||||||
m_albumModels[ chartId ]->append( albums );
|
m_albumModels[ chartId ]->appendAlbums( albums );
|
||||||
m_albumModels[ chartId ]->finishLoading();
|
m_albumModels[ chartId ]->finishLoading();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -184,7 +184,7 @@ AlbumInfoWidget::gotAlbums( const QList<Tomahawk::album_ptr>& albums )
|
|||||||
if ( al.contains( m_album ) )
|
if ( al.contains( m_album ) )
|
||||||
al.removeAll( m_album );
|
al.removeAll( m_album );
|
||||||
|
|
||||||
m_albumsModel->append( al );
|
m_albumsModel->appendAlbums( al );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -251,7 +251,7 @@ ArtistInfoWidget::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, Model
|
|||||||
{
|
{
|
||||||
Q_UNUSED( mode );
|
Q_UNUSED( mode );
|
||||||
|
|
||||||
m_albumsModel->append( albums );
|
m_albumsModel->appendAlbums( albums );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -261,14 +261,14 @@ ArtistInfoWidget::onTracksFound( const QList<Tomahawk::query_ptr>& queries, Mode
|
|||||||
Q_UNUSED( mode );
|
Q_UNUSED( mode );
|
||||||
|
|
||||||
m_topHitsModel->finishLoading();
|
m_topHitsModel->finishLoading();
|
||||||
m_topHitsModel->append( queries );
|
m_topHitsModel->appendQueries( queries );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ArtistInfoWidget::onSimilarArtistsLoaded()
|
ArtistInfoWidget::onSimilarArtistsLoaded()
|
||||||
{
|
{
|
||||||
m_relatedModel->append( m_artist->similarArtists() );
|
m_relatedModel->appendArtists( m_artist->similarArtists() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -244,7 +244,7 @@ TrackInfoWidget::onSimilarArtistsLoaded()
|
|||||||
void
|
void
|
||||||
TrackInfoWidget::onSimilarTracksLoaded()
|
TrackInfoWidget::onSimilarTracksLoaded()
|
||||||
{
|
{
|
||||||
m_relatedTracksModel->append( m_query->similarTracks() );
|
m_relatedTracksModel->appendQueries( m_query->similarTracks() );
|
||||||
m_relatedTracksModel->finishLoading();
|
m_relatedTracksModel->finishLoading();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user