From 4ff7085d34b4bbc05c22e9a07971349f0db30f87 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sat, 20 Jul 2013 15:02:29 +0200 Subject: [PATCH] Temporarily deactivate hot playlists --- src/libtomahawk-widgets/NetworkActivityWidget.cpp | 9 ++++++++- src/libtomahawk-widgets/NetworkActivityWorker.cpp | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk-widgets/NetworkActivityWidget.cpp b/src/libtomahawk-widgets/NetworkActivityWidget.cpp index e2a6a266b..dfde28f10 100644 --- a/src/libtomahawk-widgets/NetworkActivityWidget.cpp +++ b/src/libtomahawk-widgets/NetworkActivityWidget.cpp @@ -162,8 +162,10 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent ) d->ui->playlistView->setFrameShape( QFrame::NoFrame ); d->ui->playlistView->setAttribute( Qt::WA_MacShowFocusRect, 0 ); d->ui->playlistView->setItemDelegate( new PlaylistDelegate() ); - d->ui->playlistView->overlay()->resize( 380, 86 ); d->ui->playlistView->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel ); + d->ui->playlistView->overlay()->setText( tr( "Coming soon." ) ); + d->ui->playlistView->overlay()->resize( 380, 86 ); + d->ui->playlistView->overlay()->setEnabled( true ); QPalette p = d->ui->playlistView->palette(); p.setColor( QPalette::Text, TomahawkStyle::HEADER_TEXT ); @@ -173,6 +175,7 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent ) p.setColor( QPalette::HighlightedText, TomahawkStyle::HEADER_BACKGROUND ); d->ui->playlistView->setPalette( p ); + d->ui->playlistView->overlay()->setPalette( p ); d->ui->playlistView->setMinimumHeight( 400 ); d->ui->playlistView->setStyleSheet( "QListView { background-color: transparent; }" ); TomahawkStyle::styleScrollBar( d->ui->playlistView->verticalScrollBar() ); @@ -212,6 +215,10 @@ NetworkActivityWidget::NetworkActivityWidget( QWidget* parent ) // connect( d->workerThread, SIGNAL( finished() ), d->workerThread, SLOT( deleteLater() ), Qt::QueuedConnection ); // connect( d->workerThread, SIGNAL( destroyed() ), d->worker, SLOT( deleteLater() ), Qt::QueuedConnection ); QMetaObject::invokeMethod( d->worker, "run", Qt::QueuedConnection ); + + // FIXME: Activate hot playlists again + d->ui->playlistsFrame->hide(); + } diff --git a/src/libtomahawk-widgets/NetworkActivityWorker.cpp b/src/libtomahawk-widgets/NetworkActivityWorker.cpp index afce0db8c..7ec76149c 100644 --- a/src/libtomahawk-widgets/NetworkActivityWorker.cpp +++ b/src/libtomahawk-widgets/NetworkActivityWorker.cpp @@ -63,11 +63,11 @@ NetworkActivityWorker::run() Database::instance()->enqueue( dbcmd_ptr( dbcmd ) ); } { - DatabaseCommand_LoadAllSources* dbcmd = new DatabaseCommand_LoadAllSources(); + /* DatabaseCommand_LoadAllSources* dbcmd = new DatabaseCommand_LoadAllSources(); connect( dbcmd, SIGNAL( done( QList ) ), SLOT( allSourcesReceived( QList ) ), Qt::QueuedConnection); - Database::instance()->enqueue( dbcmd_ptr( dbcmd ) ); + Database::instance()->enqueue( dbcmd_ptr( dbcmd ) ); */ } tLog() << Q_FUNC_INFO << QDateTime::currentDateTime().toTime_t(); } @@ -163,7 +163,7 @@ void NetworkActivityWorker::checkDone() { Q_D( NetworkActivityWorker ); - if ( d->trendingTracksDone && d->hotPlaylistsDone ) + if ( d->trendingTracksDone /* && d->hotPlaylistsDone */ ) { emit finished(); }