From 69ead151ba1836279f7acd1848ab6be8c5297831 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 19 Oct 2014 10:40:22 +0200
Subject: [PATCH] Drop the multiple versions of the empty-collection hint.

---
 src/libtomahawk/ViewManager.cpp               | 8 ++++++--
 src/libtomahawk/collection/Collection.cpp     | 7 -------
 src/libtomahawk/collection/Collection.h       | 1 -
 src/libtomahawk/database/LocalCollection.cpp  | 8 --------
 src/libtomahawk/database/LocalCollection.h    | 1 -
 src/libtomahawk/playlist/FlexibleTreeView.cpp | 3 ++-
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 3106808ad..82431094c 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -281,8 +281,12 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
 
         setPage( view );
 
-        if ( !collection.isNull() )
-            view->setEmptyTip( collection->emptyText() );
+        if ( collection && collection->source() && collection->source()->isLocal() )
+        {
+            view->setEmptyTip( tr( "After you have scanned your music collection you will find your tracks right here." ) );
+        }
+        else
+            view->setEmptyTip( tr( "This collection is empty." ) );
 
         if ( collection.objectCast<ScriptCollection>() )
             view->trackView()->setEmptyTip( tr( "Cloud collections aren't supported in the flat view yet. We will have them covered soon. Switch to another view to navigate them." ) );
diff --git a/src/libtomahawk/collection/Collection.cpp b/src/libtomahawk/collection/Collection.cpp
index 01eee09ee..b230d7bd3 100644
--- a/src/libtomahawk/collection/Collection.cpp
+++ b/src/libtomahawk/collection/Collection.cpp
@@ -98,13 +98,6 @@ Collection::bigIcon() const
 }
 
 
-QString
-Collection::emptyText() const
-{
-    return  tr( "This collection is empty." );
-}
-
-
 const
 source_ptr& Collection::source() const
 {
diff --git a/src/libtomahawk/collection/Collection.h b/src/libtomahawk/collection/Collection.h
index 9063a8948..60ee3bab2 100644
--- a/src/libtomahawk/collection/Collection.h
+++ b/src/libtomahawk/collection/Collection.h
@@ -67,7 +67,6 @@ public:
     virtual BackendType backendType() const { return NullCollectionType; }
     virtual QIcon icon() const;
     virtual QPixmap bigIcon() const; //for the ViewPage header
-    virtual QString emptyText() const;
 
     virtual void loadPlaylists();
     virtual void loadAutoPlaylists();
diff --git a/src/libtomahawk/database/LocalCollection.cpp b/src/libtomahawk/database/LocalCollection.cpp
index ea6c0be5f..78a2bb606 100644
--- a/src/libtomahawk/database/LocalCollection.cpp
+++ b/src/libtomahawk/database/LocalCollection.cpp
@@ -1,7 +1,6 @@
 /*
     Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
 
-
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -42,10 +41,3 @@ LocalCollection::prettyName() const
 {
     return tr( "Your Collection" );
 }
-
-
-QString
-LocalCollection::emptyText() const
-{
-    return tr( "After you have scanned your music collection you will find your tracks right here." );
-}
diff --git a/src/libtomahawk/database/LocalCollection.h b/src/libtomahawk/database/LocalCollection.h
index 31e806592..7641ffb37 100644
--- a/src/libtomahawk/database/LocalCollection.h
+++ b/src/libtomahawk/database/LocalCollection.h
@@ -34,7 +34,6 @@ public:
     explicit LocalCollection( const Tomahawk::source_ptr& source, QObject* parent = 0 );
 
     virtual QString prettyName() const;
-    virtual QString emptyText() const;
 };
 
 }
diff --git a/src/libtomahawk/playlist/FlexibleTreeView.cpp b/src/libtomahawk/playlist/FlexibleTreeView.cpp
index 0b72a1e80..a896cbc49 100644
--- a/src/libtomahawk/playlist/FlexibleTreeView.cpp
+++ b/src/libtomahawk/playlist/FlexibleTreeView.cpp
@@ -361,6 +361,7 @@ void
 FlexibleTreeView::setEmptyTip( const QString& tip )
 {
     m_columnView->setEmptyTip( tip );
+    m_albumView->setEmptyTip( tip );
     m_trackView->setEmptyTip( tip );
 }
 
@@ -380,7 +381,7 @@ FlexibleTreeView::onModelChanged()
     m_header->setCaption( m_model->title() );
     m_header->setDescription( m_model->description() );
 
-    setEmptyTip( tr( "This collection is currently empty." ) );
+//    setEmptyTip( tr( "This collection is currently empty." ) );
 }