mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +02:00
Code Issues Releases Wiki Activity

Drop the multiple versions of the empty-collection hint.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-10-19 10:40:22 +02:00
parent 8a58114f73
commit 01534d222f
6 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/ViewManager.cpp
View File

@@ -281,8 +281,12 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
setPage( view ); setPage( view );
if ( !collection.isNull() ) if ( collection && collection->source() && collection->source()->isLocal() )
view->setEmptyTip( collection->emptyText() ); {
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>() ) 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." ) ); 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." ) );

7
src/libtomahawk/collection/Collection.cpp
View File

@@ -98,13 +98,6 @@ Collection::bigIcon() const
} }
QString
Collection::emptyText() const
{
return tr( "This collection is empty." );
}
const const
source_ptr& Collection::source() const source_ptr& Collection::source() const
{ {

1
src/libtomahawk/collection/Collection.h
View File

@@ -67,7 +67,6 @@ public:
virtual BackendType backendType() const { return NullCollectionType; } virtual BackendType backendType() const { return NullCollectionType; }
virtual QIcon icon() const; virtual QIcon icon() const;
virtual QPixmap bigIcon() const; //for the ViewPage header virtual QPixmap bigIcon() const; //for the ViewPage header
virtual QString emptyText() const;
virtual void loadPlaylists(); virtual void loadPlaylists();
virtual void loadAutoPlaylists(); virtual void loadAutoPlaylists();

8
src/libtomahawk/database/LocalCollection.cpp
View File

@@ -1,7 +1,6 @@
/* /*
Copyright (C) 2011 Leo Franchi <lfranchi@kde.org> Copyright (C) 2011 Leo Franchi <lfranchi@kde.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
@@ -42,10 +41,3 @@ LocalCollection::prettyName() const
{ {
return tr( "Your Collection" ); return tr( "Your Collection" );
} }
QString
LocalCollection::emptyText() const
{
return tr( "After you have scanned your music collection you will find your tracks right here." );
}

1
src/libtomahawk/database/LocalCollection.h
View File

@@ -34,7 +34,6 @@ public:
explicit LocalCollection( const Tomahawk::source_ptr& source, QObject* parent = 0 ); explicit LocalCollection( const Tomahawk::source_ptr& source, QObject* parent = 0 );
virtual QString prettyName() const; virtual QString prettyName() const;
virtual QString emptyText() const;
}; };
} }

3
src/libtomahawk/playlist/FlexibleTreeView.cpp
View File

@@ -361,6 +361,7 @@ void
FlexibleTreeView::setEmptyTip( const QString& tip ) FlexibleTreeView::setEmptyTip( const QString& tip )
{ {
m_columnView->setEmptyTip( tip ); m_columnView->setEmptyTip( tip );
m_albumView->setEmptyTip( tip );
m_trackView->setEmptyTip( tip ); m_trackView->setEmptyTip( tip );
} }
@@ -380,7 +381,7 @@ FlexibleTreeView::onModelChanged()
m_header->setCaption( m_model->title() ); m_header->setCaption( m_model->title() );
m_header->setDescription( m_model->description() ); m_header->setDescription( m_model->description() );
setEmptyTip( tr( "This collection is currently empty." ) ); // setEmptyTip( tr( "This collection is currently empty." ) );
} }