mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00
Code Issues Releases Wiki Activity

* Rip out obsolete tree-view in collection.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-27 21:49:22 +02:00
parent 0a9a70ba38
commit 50a304b407
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,6 @@ FlexibleTreeView::FlexibleTreeView( QWidget* parent, QWidget* extraHeader )
: QWidget( parent )
, m_header( new FilterHeader( this ) )
, m_columnView( new ColumnView() )
, m_treeView( new TreeView() )
, m_trackView( new TrackView() )
, m_albumView( new GridView() )
, m_model( 0 )
@@ -57,9 +56,6 @@ FlexibleTreeView::FlexibleTreeView( QWidget* parent, QWidget* extraHeader )
m_header->setBackgroundColor( Qt::black );
m_header->setBackground( ImageRegistry::instance()->pixmap( RESPATH "images/collection_background_small.png", QSize( 0, 0 ) ), false );
m_treeView->proxyModel()->setStyle( PlayableProxyModel::Collection );
m_treeView->proxyModel()->setPlaylistInterface( m_columnView->proxyModel()->playlistInterface() );
// m_trackView->setPlaylistInterface( m_playlistInterface );
// m_columnView->setPlaylistInterface( m_trackView->proxyModel()->playlistInterface() );
// m_gridView->setPlaylistInterface( m_trackView->proxyModel()->playlistInterface() );
@@ -132,7 +128,6 @@ FlexibleTreeView::~FlexibleTreeView()
void
FlexibleTreeView::setGuid( const QString& guid )
{
m_treeView->setGuid( guid );
m_columnView->setGuid( guid );
}
@@ -171,22 +166,6 @@ FlexibleTreeView::setColumnView( ColumnView* view )
}
void
FlexibleTreeView::setTreeView( TreeView* view )
{
if ( m_treeView )
{
m_stack->removeWidget( m_treeView );
delete m_treeView;
}
// view->setPlaylistInterface( m_columnView->proxyModel()->playlistInterface() );
m_treeView = view;
m_stack->addWidget( view );
}
void
FlexibleTreeView::setTreeModel( TreeModel* model )
{
@@ -200,7 +179,6 @@ FlexibleTreeView::setTreeModel( TreeModel* model )
// m_trackView->setPlayableModel( model );
m_columnView->setTreeModel( model );
m_treeView->setTreeModel( model );
/* m_trackView->setSortingEnabled( false );
m_trackView->sortByColumn( -1 );
@@ -351,7 +329,7 @@ FlexibleTreeView::jumpToCurrentTrack()
// note: the order of comparison is important here, if we'd write "b || foo" then foo will not be executed if b is already true!
b = m_columnView->jumpToCurrentTrack() || b;
b = m_trackView->jumpToCurrentTrack() || b;
b = m_treeView->jumpToCurrentTrack() || b;
b = m_albumView->jumpToCurrentTrack() || b;
return b;
}
@@ -363,7 +341,6 @@ FlexibleTreeView::setFilter( const QString& pattern )
ViewPage::setFilter( pattern );
m_columnView->setFilter( pattern );
m_treeView->proxyModel()->setFilter( pattern );
m_trackView->setFilter( pattern );
return true;
@@ -386,7 +363,6 @@ void
FlexibleTreeView::setEmptyTip( const QString& tip )
{
m_columnView->setEmptyTip( tip );
m_treeView->setEmptyTip( tip );
m_trackView->setEmptyTip( tip );
}

4
src/libtomahawk/playlist/FlexibleTreeView.h
View File

@@ -28,7 +28,6 @@ class QStackedWidget;
class GridView;
class TrackView;
class TreeView;
class ColumnView;
class TreeModel;
class PlayableModel;
@@ -60,13 +59,11 @@ public:
void setTemporaryPage( bool b );
ColumnView* columnView() const { return m_columnView; }
TreeView* treeView() const { return m_treeView; }
TrackView* trackView() const { return m_trackView; }
void setGuid( const QString& guid );
void setColumnView( ColumnView* view );
void setTreeView( TreeView* view );
void setTrackView( TrackView* view );
void setTreeModel( TreeModel* model );
@@ -94,7 +91,6 @@ private:
QPixmap m_pixmap;
ColumnView* m_columnView;
TreeView* m_treeView;
TrackView* m_trackView;
GridView* m_albumView;