From 47eca3182dd4775293f57fcebb478d7749fc3631 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 8 Sep 2014 13:32:57 +0200
Subject: [PATCH] * Fade in spinners when newly set model is already in
 loading-state.

---
 src/libtomahawk/playlist/GridView.cpp  | 12 ++++++++++++
 src/libtomahawk/playlist/TrackView.cpp |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp
index bed35fcae..60e73f96e 100644
--- a/src/libtomahawk/playlist/GridView.cpp
+++ b/src/libtomahawk/playlist/GridView.cpp
@@ -141,6 +141,12 @@ GridView::setModel( QAbstractItemModel* model )
 void
 GridView::setPlayableModel( PlayableModel* model )
 {
+    if ( m_model )
+    {
+        disconnect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) );
+        disconnect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
+    }
+
     m_inited = false;
     m_model = model;
 
@@ -150,6 +156,12 @@ GridView::setPlayableModel( PlayableModel* model )
         m_proxyModel->sort( -1 );
     }
 
+    connect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) );
+    connect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
+
+    if ( m_model->isLoading() )
+        m_loadingSpinner->fadeIn();
+
     emit modelChanged();
 }
 
diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp
index c4e362ae1..b94dfda27 100644
--- a/src/libtomahawk/playlist/TrackView.cpp
+++ b/src/libtomahawk/playlist/TrackView.cpp
@@ -239,6 +239,9 @@ TrackView::setPlayableModel( PlayableModel* model )
     connect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) );
     connect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
 
+    if ( m_model->isLoading() )
+        m_loadingSpinner->fadeIn();
+
     if ( m_autoExpanding )
     {
         expandAll();