mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-02 20:28:14 +02:00
* NetworkActivityWidget needs to call model's startLoading() earlier to make spinners show up.
This commit is contained in:
@@ -99,7 +99,6 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
|
|||||||
d->ui->breadCrumbLeft->setModel( d->sortedProxy );
|
d->ui->breadCrumbLeft->setModel( d->sortedProxy );
|
||||||
d->ui->breadCrumbLeft->setVisible( true );
|
d->ui->breadCrumbLeft->setVisible( true );
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
AlbumItemDelegate* del = new AlbumItemDelegate( d->ui->tracksViewLeft, d->ui->tracksViewLeft->proxyModel(), true );
|
AlbumItemDelegate* del = new AlbumItemDelegate( d->ui->tracksViewLeft, d->ui->tracksViewLeft->proxyModel(), true );
|
||||||
d->ui->tracksViewLeft->setPlaylistItemDelegate( del );
|
d->ui->tracksViewLeft->setPlaylistItemDelegate( del );
|
||||||
@@ -124,7 +123,6 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
|
|||||||
TomahawkStyle::stylePageFrame( d->ui->chartsFrame );
|
TomahawkStyle::stylePageFrame( d->ui->chartsFrame );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Trending Tracks
|
// Trending Tracks
|
||||||
{
|
{
|
||||||
d->trendingTracksModel = new PlaylistModel( d->ui->trendingTracksView );
|
d->trendingTracksModel = new PlaylistModel( d->ui->trendingTracksView );
|
||||||
@@ -134,6 +132,7 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
|
|||||||
d->ui->trendingTracksView->setAutoResize( true );
|
d->ui->trendingTracksView->setAutoResize( true );
|
||||||
d->ui->trendingTracksView->setAlternatingRowColors( false );
|
d->ui->trendingTracksView->setAlternatingRowColors( false );
|
||||||
d->ui->trendingTracksView->setEmptyTip( tr( "Sorry, we couldn't find any trending tracks." ) );
|
d->ui->trendingTracksView->setEmptyTip( tr( "Sorry, we couldn't find any trending tracks." ) );
|
||||||
|
d->trendingTracksModel->startLoading();
|
||||||
|
|
||||||
QPalette p = d->ui->trendingTracksView->palette();
|
QPalette p = d->ui->trendingTracksView->palette();
|
||||||
p.setColor( QPalette::Text, TomahawkStyle::PAGE_TRACKLIST_TRACK_SOLVED );
|
p.setColor( QPalette::Text, TomahawkStyle::PAGE_TRACKLIST_TRACK_SOLVED );
|
||||||
@@ -200,6 +199,7 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
|
|||||||
{
|
{
|
||||||
d->artistsModel = new PlayableModel( d->ui->trendingArtistsView );
|
d->artistsModel = new PlayableModel( d->ui->trendingArtistsView );
|
||||||
d->ui->trendingArtistsView->setPlayableModel( d->artistsModel );
|
d->ui->trendingArtistsView->setPlayableModel( d->artistsModel );
|
||||||
|
d->artistsModel->startLoading();
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
d->ui->trendingArtistsView->setFrameShape( QFrame::NoFrame );
|
d->ui->trendingArtistsView->setFrameShape( QFrame::NoFrame );
|
||||||
@@ -223,7 +223,6 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
|
|||||||
d->ui->trendingArtistsLabel->setPalette( p );
|
d->ui->trendingArtistsLabel->setPalette( p );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
QScrollArea* area = new QScrollArea();
|
QScrollArea* area = new QScrollArea();
|
||||||
area->setWidgetResizable( true );
|
area->setWidgetResizable( true );
|
||||||
@@ -241,7 +240,6 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent )
|
|||||||
mpl->addChildInterface( d->ui->tracksViewLeft->playlistInterface() );
|
mpl->addChildInterface( d->ui->tracksViewLeft->playlistInterface() );
|
||||||
d->playlistInterface = playlistinterface_ptr( mpl );
|
d->playlistInterface = playlistinterface_ptr( mpl );
|
||||||
|
|
||||||
|
|
||||||
// Load data in separate thread
|
// Load data in separate thread
|
||||||
d->workerThread = new QThread();
|
d->workerThread = new QThread();
|
||||||
d->workerThread->start();
|
d->workerThread->start();
|
||||||
@@ -311,7 +309,6 @@ void
|
|||||||
NetworkActivityWidget::weeklyCharts( const QList<Tomahawk::track_ptr>& tracks )
|
NetworkActivityWidget::weeklyCharts( const QList<Tomahawk::track_ptr>& tracks )
|
||||||
{
|
{
|
||||||
d_func()->weeklyChartsModel = new PlaylistModel( d_func()->ui->tracksViewLeft );
|
d_func()->weeklyChartsModel = new PlaylistModel( d_func()->ui->tracksViewLeft );
|
||||||
d_func()->weeklyChartsModel->startLoading();
|
|
||||||
d_func()->weeklyChartsModel->appendTracks( tracks );
|
d_func()->weeklyChartsModel->appendTracks( tracks );
|
||||||
d_func()->weeklyChartsModel->finishLoading();
|
d_func()->weeklyChartsModel->finishLoading();
|
||||||
|
|
||||||
@@ -326,7 +323,6 @@ void
|
|||||||
NetworkActivityWidget::monthlyCharts( const QList<Tomahawk::track_ptr>& tracks )
|
NetworkActivityWidget::monthlyCharts( const QList<Tomahawk::track_ptr>& tracks )
|
||||||
{
|
{
|
||||||
d_func()->monthlyChartsModel = new PlaylistModel( d_func()->ui->tracksViewLeft );
|
d_func()->monthlyChartsModel = new PlaylistModel( d_func()->ui->tracksViewLeft );
|
||||||
d_func()->monthlyChartsModel->startLoading();
|
|
||||||
d_func()->monthlyChartsModel->appendTracks( tracks );
|
d_func()->monthlyChartsModel->appendTracks( tracks );
|
||||||
d_func()->monthlyChartsModel->finishLoading();
|
d_func()->monthlyChartsModel->finishLoading();
|
||||||
|
|
||||||
@@ -341,7 +337,6 @@ void
|
|||||||
NetworkActivityWidget::yearlyCharts( const QList<Tomahawk::track_ptr>& tracks )
|
NetworkActivityWidget::yearlyCharts( const QList<Tomahawk::track_ptr>& tracks )
|
||||||
{
|
{
|
||||||
d_func()->yearlyChartsModel = new PlaylistModel( d_func()->ui->tracksViewLeft );
|
d_func()->yearlyChartsModel = new PlaylistModel( d_func()->ui->tracksViewLeft );
|
||||||
d_func()->yearlyChartsModel->startLoading();
|
|
||||||
d_func()->yearlyChartsModel->appendTracks( tracks );
|
d_func()->yearlyChartsModel->appendTracks( tracks );
|
||||||
d_func()->yearlyChartsModel->finishLoading();
|
d_func()->yearlyChartsModel->finishLoading();
|
||||||
|
|
||||||
@@ -356,7 +351,6 @@ void
|
|||||||
NetworkActivityWidget::overallCharts( const QList<track_ptr>& tracks )
|
NetworkActivityWidget::overallCharts( const QList<track_ptr>& tracks )
|
||||||
{
|
{
|
||||||
d_func()->overallChartsModel = new PlaylistModel( d_func()->ui->tracksViewLeft );
|
d_func()->overallChartsModel = new PlaylistModel( d_func()->ui->tracksViewLeft );
|
||||||
d_func()->overallChartsModel->startLoading();
|
|
||||||
d_func()->overallChartsModel->appendTracks( tracks );
|
d_func()->overallChartsModel->appendTracks( tracks );
|
||||||
d_func()->overallChartsModel->finishLoading();
|
d_func()->overallChartsModel->finishLoading();
|
||||||
|
|
||||||
@@ -366,6 +360,7 @@ NetworkActivityWidget::overallCharts( const QList<track_ptr>& tracks )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
NetworkActivityWidget::hotPlaylists( const QList<playlist_ptr>& playlists )
|
NetworkActivityWidget::hotPlaylists( const QList<playlist_ptr>& playlists )
|
||||||
{
|
{
|
||||||
@@ -379,7 +374,6 @@ NetworkActivityWidget::trendingArtists( const QList<artist_ptr>& artists )
|
|||||||
{
|
{
|
||||||
Q_D( NetworkActivityWidget );
|
Q_D( NetworkActivityWidget );
|
||||||
|
|
||||||
d->artistsModel->startLoading();
|
|
||||||
d->artistsModel->appendArtists( artists );
|
d->artistsModel->appendArtists( artists );
|
||||||
d->artistsModel->finishLoading();
|
d->artistsModel->finishLoading();
|
||||||
}
|
}
|
||||||
@@ -390,7 +384,6 @@ NetworkActivityWidget::trendingTracks( const QList<track_ptr>& tracks )
|
|||||||
{
|
{
|
||||||
Q_D( NetworkActivityWidget );
|
Q_D( NetworkActivityWidget );
|
||||||
|
|
||||||
d->trendingTracksModel->startLoading();
|
|
||||||
d->trendingTracksModel->appendTracks( tracks );
|
d->trendingTracksModel->appendTracks( tracks );
|
||||||
d->trendingTracksModel->finishLoading();
|
d->trendingTracksModel->finishLoading();
|
||||||
}
|
}
|
||||||
@@ -497,6 +490,7 @@ NetworkActivityWidget::showWeekCharts()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
d_func()->weeklyChartsModel->startLoading();
|
||||||
fetchWeekCharts();
|
fetchWeekCharts();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -515,6 +509,7 @@ NetworkActivityWidget::showMonthCharts()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
d_func()->monthlyChartsModel->startLoading();
|
||||||
fetchMonthCharts();
|
fetchMonthCharts();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -533,6 +528,7 @@ NetworkActivityWidget::showYearCharts()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
d_func()->yearlyChartsModel->startLoading();
|
||||||
fetchYearCharts();
|
fetchYearCharts();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -551,6 +547,7 @@ NetworkActivityWidget::showOverallCharts()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
d_func()->overallChartsModel->startLoading();
|
||||||
fetchOverallCharts();
|
fetchOverallCharts();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -569,6 +566,7 @@ NetworkActivityWidget::showTopLoved()
|
|||||||
model->setSource( source_ptr() );
|
model->setSource( source_ptr() );
|
||||||
d->topLovedModel = model;
|
d->topLovedModel = model;
|
||||||
}
|
}
|
||||||
|
|
||||||
d->ui->tracksViewLeft->setPlaylistModel( d->topLovedModel );
|
d->ui->tracksViewLeft->setPlaylistModel( d->topLovedModel );
|
||||||
d->ui->tracksViewLeft->setAutoResize( true );
|
d->ui->tracksViewLeft->setAutoResize( true );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user