mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 23:57:34 +02:00
Code Issues Releases Wiki Activity

* FlexibleViewInterface is obsolete.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-28 04:53:12 +01:00
parent df1235b8df
commit 223f834233
2 changed files with 5 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/libtomahawk/playlist/FlexibleView.cpp
View File

@@ -35,38 +35,6 @@
using namespace Tomahawk; using namespace Tomahawk;
class FlexibleViewInterface : public PlayableProxyModelPlaylistInterface
{
Q_OBJECT
public:
explicit FlexibleViewInterface( PlayableProxyModel* proxy, FlexibleView* view )
: PlayableProxyModelPlaylistInterface( proxy )
, m_view( view )
{
}
virtual bool hasChildInterface( playlistinterface_ptr playlistInterface )
{
if ( m_view.isNull() )
return false;
if ( m_view.data()->detailedView() && m_view.data()->detailedView()->proxyModel()->playlistInterface() == playlistInterface )
return true;
if ( m_view.data()->gridView() && m_view.data()->gridView()->playlistInterface()->hasChildInterface( playlistInterface ) )
return true;
if ( m_view.data()->trackView() && m_view.data()->trackView()->proxyModel()->playlistInterface() == playlistInterface )
return true;
return false;
}
private:
QWeakPointer<FlexibleView> m_view;
};
FlexibleView::FlexibleView( QWidget* parent ) FlexibleView::FlexibleView( QWidget* parent )
: QWidget( parent ) : QWidget( parent )
, m_header( new FlexibleHeader( this ) ) , m_header( new FlexibleHeader( this ) )
@@ -77,9 +45,8 @@ FlexibleView::FlexibleView( QWidget* parent )
{ {
qRegisterMetaType< FlexibleViewMode >( "FlexibleViewMode" ); qRegisterMetaType< FlexibleViewMode >( "FlexibleViewMode" );
m_playlistInterface = playlistinterface_ptr( new FlexibleViewInterface( m_trackView->proxyModel(), this ) ); // m_trackView->setPlaylistInterface( m_playlistInterface );
m_trackView->setPlaylistInterface( m_playlistInterface ); m_detailedView->setPlaylistInterface( m_trackView->proxyModel()->playlistInterface() );
m_detailedView->setPlaylistInterface( m_playlistInterface );
m_detailedView->setColumnHidden( PlayableModel::Age, true ); // Hide age column per default m_detailedView->setColumnHidden( PlayableModel::Age, true ); // Hide age column per default
m_detailedView->setColumnHidden( PlayableModel::Filesize, true ); // Hide filesize column per default m_detailedView->setColumnHidden( PlayableModel::Filesize, true ); // Hide filesize column per default
@@ -130,7 +97,7 @@ FlexibleView::setTrackView( TrackView* view )
delete m_trackView; delete m_trackView;
} }
view->setPlaylistInterface( m_playlistInterface ); // view->setPlaylistInterface( m_playlistInterface );
m_trackView = view; m_trackView = view;
m_stack->addWidget( view ); m_stack->addWidget( view );
@@ -148,7 +115,7 @@ FlexibleView::setDetailedView( TrackView* view )
connect( view, SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ), Qt::UniqueConnection ); connect( view, SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ), Qt::UniqueConnection );
view->setPlaylistInterface( m_playlistInterface ); view->setPlaylistInterface( m_trackView->proxyModel()->playlistInterface() );
m_detailedView = view; m_detailedView = view;
m_stack->addWidget( view ); m_stack->addWidget( view );
@@ -241,7 +208,7 @@ FlexibleView::setCurrentMode( FlexibleViewMode mode )
Tomahawk::playlistinterface_ptr Tomahawk::playlistinterface_ptr
FlexibleView::playlistInterface() const FlexibleView::playlistInterface() const
{ {
return m_playlistInterface; return m_trackView->proxyModel()->playlistInterface();
} }

5
src/libtomahawk/playlist/FlexibleView.h
View File

@@ -30,7 +30,6 @@ class TrackView;
class PlayableModel; class PlayableModel;
class PlaylistModel; class PlaylistModel;
class FlexibleHeader; class FlexibleHeader;
class FlexibleViewInterface;
class DLLEXPORT FlexibleView : public QWidget, public Tomahawk::ViewPage class DLLEXPORT FlexibleView : public QWidget, public Tomahawk::ViewPage
{ {
@@ -89,14 +88,10 @@ private:
TrackView* m_detailedView; TrackView* m_detailedView;
GridView* m_gridView; GridView* m_gridView;
Tomahawk::playlistinterface_ptr m_playlistInterface;
PlayableModel* m_model; PlayableModel* m_model;
QStackedWidget* m_stack; QStackedWidget* m_stack;
FlexibleViewMode m_mode; FlexibleViewMode m_mode;
friend class ::FlexibleViewInterface;
}; };
Q_DECLARE_METATYPE( FlexibleView::FlexibleViewMode ); Q_DECLARE_METATYPE( FlexibleView::FlexibleViewMode );