mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

* Made Artist- / TreeView the default view. Disabled album mode for this release.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-05-19 08:00:57 +02:00
parent c2982e7312
commit 03451c9197
12 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libtomahawk/viewmanager.cpp
View File

@@ -67,7 +67,7 @@ ViewManager::ViewManager( QObject* parent )
: QObject( parent )
, m_widget( new QWidget() )
, m_welcomeWidget( new WelcomeWidget() )
, m_currentMode( 0 )
, m_currentMode( PlaylistInterface::Tree )
{
s_instance = this;
@@ -107,6 +107,7 @@ ViewManager::ViewManager( QObject* parent )
m_superCollectionView->setModel( m_superCollectionModel );
m_superCollectionView->setFrameShape( QFrame::NoFrame );
m_superCollectionView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_superCollectionView->setShowModes( false );
// m_superCollectionView->proxyModel()->setShowOfflineResults( false );
m_superAlbumView = new AlbumView();
@@ -275,7 +276,7 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
qDebug() << Q_FUNC_INFO << m_currentMode;
m_currentCollection = collection;
ViewPage* shown = 0;
if ( m_currentMode == 0 )
if ( m_currentMode == PlaylistInterface::Flat )
{
CollectionView* view;
if ( !m_collectionViews.contains( collection ) )
@@ -299,7 +300,7 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
setPage( view );
}
if ( m_currentMode == 1 )
if ( m_currentMode == PlaylistInterface::Tree )
{
ArtistView* view;
if ( !m_treeViews.contains( collection ) )
@@ -323,7 +324,7 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
setPage( view );
}
if ( m_currentMode == 2 )
if ( m_currentMode == PlaylistInterface::Album )
{
AlbumView* aview;
if ( !m_collectionAlbumViews.contains( collection ) )
@@ -401,17 +402,17 @@ ViewManager::showSuperCollection()
m_superAlbumModel->setTitle( tr( "All available albums" ) );
ViewPage* shown = 0;
if ( m_currentMode == 0 )
if ( m_currentMode == PlaylistInterface::Tree )
{
shown = m_superCollectionView;
setPage( m_superCollectionView );
}
else if ( m_currentMode == 1 )
else if ( m_currentMode == PlaylistInterface::Flat )
{
shown = m_superCollectionView;
setPage( m_superCollectionView );
}
else if ( m_currentMode == 2 )
else if ( m_currentMode == PlaylistInterface::Album )
{
shown = m_superAlbumView;
setPage( m_superAlbumView );
@@ -450,7 +451,7 @@ ViewManager::setTableMode()
{
qDebug() << Q_FUNC_INFO;
m_currentMode = 0;
m_currentMode = PlaylistInterface::Flat;
if ( isSuperCollectionVisible() )
showSuperCollection();
@@ -464,7 +465,7 @@ ViewManager::setTreeMode()
{
qDebug() << Q_FUNC_INFO;
m_currentMode = 1;
m_currentMode = PlaylistInterface::Tree;
if ( isSuperCollectionVisible() )
showSuperCollection();
@@ -478,7 +479,7 @@ ViewManager::setAlbumMode()
{
qDebug() << Q_FUNC_INFO;
m_currentMode = 2;
m_currentMode = PlaylistInterface::Album;
if ( isSuperCollectionVisible() )
showSuperCollection();
@@ -705,8 +706,9 @@ ViewManager::updateView()
emit statsAvailable( currentPage()->showStatsBar() );
emit modesAvailable( currentPage()->showModes() );
emit filterAvailable( currentPage()->showFilter() );
if ( !currentPage()->showStatsBar() && !currentPage()->showModes() )
if ( !currentPage()->showStatsBar() && !currentPage()->showModes() && !currentPage()->showFilter() )
m_topbar->setVisible( false );
else
m_topbar->setVisible( true );