From 0dc1d6664ab51a2879325259ee5ce758ac98d889 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 21 Jun 2012 21:12:15 +0200 Subject: [PATCH] * Show loading spinner and emptiness tooltip on track page. --- src/libtomahawk/playlist/GridView.cpp | 4 +++- .../widgets/infowidgets/TrackInfoWidget.cpp | 4 +++- .../widgets/infowidgets/TrackInfoWidget.ui | 13 ------------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp index 9626667a0..de1204bf4 100644 --- a/src/libtomahawk/playlist/GridView.cpp +++ b/src/libtomahawk/playlist/GridView.cpp @@ -232,7 +232,9 @@ GridView::verifySize() const int rows = floor( (double)m_model->rowCount( QModelIndex() ) / (double)itemsPerRow ); const int newHeight = rows * m_model->itemSize().height(); - setFixedHeight( newHeight ); + if ( newHeight > 0 ) + setFixedHeight( newHeight ); + m_proxyModel->setMaxVisibleItems( m_model->rowCount( QModelIndex() ) - overlapRows ); } diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp index c9c651418..0a6996cec 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp @@ -186,7 +186,8 @@ TrackInfoWidget::load( const query_ptr& query ) ui->albumLabel->setVisible( !query->album().isEmpty() ); m_relatedTracksModel->clear(); - + m_relatedTracksModel->startLoading(); + if ( !m_query->similarTracks().isEmpty() ) onSimilarTracksLoaded(); } @@ -244,6 +245,7 @@ void TrackInfoWidget::onSimilarTracksLoaded() { m_relatedTracksModel->append( m_query->similarTracks() ); + m_relatedTracksModel->finishLoading(); } diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui index 4e03a139a..7096059b8 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui @@ -103,19 +103,6 @@ - - - - Qt::Vertical - - - - 20 - 0 - - - -