mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-03-19 23:39:42 +01:00
* FlexibleView is becoming a ViewPage wrapper for ContextView.
This commit is contained in:
Christian Muehlhaeuser
parent
b470c95115
commit
a17c7a2e8d
@ -22,20 +22,12 @@
|
||||
#include <QStackedWidget>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#include "audio/AudioEngine.h"
|
||||
#include "widgets/CaptionLabel.h"
|
||||
#include "widgets/FilterHeader.h"
|
||||
#include "playlist/PlayableModel.h"
|
||||
#include "playlist/PlaylistModel.h"
|
||||
#include "playlist/ContextView.h"
|
||||
#include "playlist/TrackView.h"
|
||||
#include "playlist/GridView.h"
|
||||
#include "playlist/TrackItemDelegate.h"
|
||||
#include "playlist/TrackDetailView.h"
|
||||
#include "PlayableProxyModelPlaylistInterface.h"
|
||||
#include "utils/TomahawkStyle.h"
|
||||
#include "utils/TomahawkUtilsGui.h"
|
||||
#include "utils/ImageRegistry.h"
|
||||
#include "utils/Closure.h"
|
||||
#include "utils/Logger.h"
|
||||
|
||||
using namespace Tomahawk;
|
||||
@ -44,80 +36,22 @@ using namespace Tomahawk;
|
||||
FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader )
|
||||
: QWidget( parent )
|
||||
, m_header( new FilterHeader( this ) )
|
||||
, m_trackView( new TrackView() )
|
||||
, m_detailedView( new TrackView() )
|
||||
, m_gridView( new GridView() )
|
||||
, m_model( 0 )
|
||||
, m_view( new ContextView( this ) )
|
||||
, m_temporary( false )
|
||||
{
|
||||
qRegisterMetaType< FlexibleViewMode >( "FlexibleViewMode" );
|
||||
|
||||
m_header->setBackground( ImageRegistry::instance()->pixmap( RESPATH "images/playlist_background.png", QSize( 0, 0 ) ) );
|
||||
|
||||
// m_trackView->setPlaylistInterface( m_playlistInterface );
|
||||
m_detailedView->setPlaylistInterface( m_trackView->proxyModel()->playlistInterface() );
|
||||
m_gridView->setPlaylistInterface( m_trackView->proxyModel()->playlistInterface() );
|
||||
|
||||
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::Composer, true ); // Hide composer column per default
|
||||
|
||||
TrackItemDelegate* del = new TrackItemDelegate( TrackItemDelegate::LovedTracks, m_trackView, m_trackView->proxyModel() );
|
||||
m_trackView->setPlaylistItemDelegate( del );
|
||||
m_trackView->proxyModel()->setStyle( PlayableProxyModel::Fancy );
|
||||
|
||||
m_stack = new QStackedWidget();
|
||||
setLayout( new QVBoxLayout() );
|
||||
TomahawkUtils::unmarginLayout( layout() );
|
||||
|
||||
m_trackView->setStyleSheet( QString( "QTreeView { background-color: white; }" ) );
|
||||
m_gridView->setStyleSheet( QString( "QListView { background-color: white; }" ) );
|
||||
TomahawkStyle::styleScrollBar( m_trackView->verticalScrollBar() );
|
||||
|
||||
layout()->addWidget( m_header );
|
||||
if ( extraHeader )
|
||||
layout()->addWidget( extraHeader );
|
||||
layout()->addWidget( m_view );
|
||||
|
||||
CaptionLabel* caption = new CaptionLabel( this );
|
||||
caption->setText( tr( "Playlist Details" ) );
|
||||
|
||||
QWidget* vbox = new QWidget;
|
||||
QPalette pal = vbox->palette();
|
||||
pal.setBrush( vbox->backgroundRole(), Qt::white );
|
||||
vbox->setPalette( pal );
|
||||
vbox->setAutoFillBackground( true );
|
||||
|
||||
QVBoxLayout* vboxl = new QVBoxLayout;
|
||||
TomahawkUtils::unmarginLayout( vboxl );
|
||||
vboxl->setContentsMargins( 32, 32, 32, 32 );
|
||||
vboxl->setSpacing( 32 );
|
||||
|
||||
vbox->setLayout( vboxl );
|
||||
|
||||
QWidget* hbox = new QWidget;
|
||||
QHBoxLayout* hboxl = new QHBoxLayout;
|
||||
TomahawkUtils::unmarginLayout( hboxl );
|
||||
hboxl->setSpacing( 32 );
|
||||
|
||||
m_detailView = new TrackDetailView;
|
||||
m_detailView->setPlaylistInterface( playlistInterface() );
|
||||
hboxl->addWidget( m_detailView );
|
||||
hboxl->addWidget( m_stack );
|
||||
hbox->setLayout( hboxl );
|
||||
|
||||
vboxl->addWidget( caption );
|
||||
vboxl->addWidget( hbox );
|
||||
layout()->addWidget( vbox );
|
||||
|
||||
m_stack->addWidget( m_trackView );
|
||||
m_stack->addWidget( m_detailedView );
|
||||
m_stack->addWidget( m_gridView );
|
||||
|
||||
setCurrentMode( Flat );
|
||||
|
||||
connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), m_detailView, SLOT( setQuery( Tomahawk::query_ptr ) ) );
|
||||
connect( m_header, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) );
|
||||
connect( m_view->trackView(), SIGNAL( modelChanged() ), SLOT( onModelChanged() ) );
|
||||
|
||||
TomahawkUtils::unmarginLayout( layout() );
|
||||
TomahawkUtils::fixMargins( this );
|
||||
}
|
||||
|
||||
@ -128,158 +62,24 @@ FlexibleView::~FlexibleView()
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
FlexibleView::setGuid( const QString& guid )
|
||||
{
|
||||
m_trackView->setGuid( guid );
|
||||
m_detailedView->setGuid( guid );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
FlexibleView::setTrackView( TrackView* view )
|
||||
{
|
||||
if ( m_trackView )
|
||||
{
|
||||
disconnect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), m_detailView, SLOT( setQuery( Tomahawk::query_ptr ) ) );
|
||||
|
||||
m_stack->removeWidget( m_trackView );
|
||||
delete m_trackView;
|
||||
}
|
||||
|
||||
m_trackView = view;
|
||||
m_stack->addWidget( view );
|
||||
|
||||
// view->setPlaylistInterface( m_playlistInterface );
|
||||
m_detailView->setPlaylistInterface( playlistInterface() );
|
||||
|
||||
m_trackView->setStyleSheet( QString( "QTreeView { background-color: white; }" ) );
|
||||
TomahawkStyle::styleScrollBar( m_trackView->verticalScrollBar() );
|
||||
connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), m_detailView, SLOT( setQuery( Tomahawk::query_ptr ) ) );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
FlexibleView::setDetailedView( TrackView* view )
|
||||
{
|
||||
if ( m_detailedView )
|
||||
{
|
||||
m_stack->removeWidget( m_detailedView );
|
||||
delete m_detailedView;
|
||||
}
|
||||
|
||||
connect( view, SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ), Qt::UniqueConnection );
|
||||
|
||||
view->setPlaylistInterface( m_trackView->proxyModel()->playlistInterface() );
|
||||
|
||||
m_detailedView = view;
|
||||
m_stack->addWidget( view );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
FlexibleView::setGridView( GridView* view )
|
||||
{
|
||||
if ( m_gridView )
|
||||
{
|
||||
m_stack->removeWidget( m_gridView );
|
||||
delete m_gridView;
|
||||
}
|
||||
|
||||
view->setPlaylistInterface( m_trackView->proxyModel()->playlistInterface() );
|
||||
|
||||
m_gridView = view;
|
||||
m_stack->addWidget( view );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
FlexibleView::setPlayableModel( PlayableModel* model )
|
||||
{
|
||||
if ( m_model )
|
||||
{
|
||||
delete m_model;
|
||||
}
|
||||
|
||||
m_model = model;
|
||||
|
||||
m_trackView->setPlayableModel( model );
|
||||
m_detailedView->setPlayableModel( model );
|
||||
m_gridView->setPlayableModel( model );
|
||||
|
||||
m_trackView->setSortingEnabled( false );
|
||||
m_trackView->sortByColumn( -1 );
|
||||
m_trackView->proxyModel()->sort( -1 );
|
||||
m_detailedView->proxyModel()->sort( -1 );
|
||||
m_gridView->proxyModel()->sort( -1 );
|
||||
|
||||
onModelChanged();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
FlexibleView::setPlaylistModel( PlaylistModel* model )
|
||||
{
|
||||
if ( m_model )
|
||||
{
|
||||
disconnect( m_model, SIGNAL( changed() ), this, SLOT( onModelChanged() ) );
|
||||
}
|
||||
|
||||
setPlayableModel( model );
|
||||
|
||||
connect( model, SIGNAL( changed() ), SLOT( onModelChanged() ), Qt::UniqueConnection );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
FlexibleView::setCurrentMode( FlexibleViewMode mode )
|
||||
{
|
||||
m_mode = mode;
|
||||
|
||||
switch ( mode )
|
||||
{
|
||||
case Flat:
|
||||
{
|
||||
tDebug() << "m_trackView:" << m_trackView << m_stack->indexOf( m_trackView );
|
||||
m_stack->setCurrentWidget( m_trackView );
|
||||
break;
|
||||
}
|
||||
|
||||
case Detailed:
|
||||
{
|
||||
m_stack->setCurrentWidget( m_detailedView );
|
||||
break;
|
||||
}
|
||||
|
||||
case Grid:
|
||||
{
|
||||
m_stack->setCurrentWidget( m_gridView );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
emit modeChanged( mode );
|
||||
}
|
||||
|
||||
|
||||
Tomahawk::playlistinterface_ptr
|
||||
FlexibleView::playlistInterface() const
|
||||
{
|
||||
return m_trackView->proxyModel()->playlistInterface();
|
||||
return m_view->playlistInterface();
|
||||
}
|
||||
|
||||
|
||||
QString
|
||||
FlexibleView::title() const
|
||||
{
|
||||
return m_trackView->title();
|
||||
return m_view->trackView()->title();
|
||||
}
|
||||
|
||||
|
||||
QString
|
||||
FlexibleView::description() const
|
||||
{
|
||||
return m_trackView->description();
|
||||
return m_view->trackView()->description();
|
||||
}
|
||||
|
||||
|
||||
@ -293,16 +93,7 @@ FlexibleView::pixmap() const
|
||||
bool
|
||||
FlexibleView::jumpToCurrentTrack()
|
||||
{
|
||||
tDebug() << Q_FUNC_INFO;
|
||||
|
||||
bool b = false;
|
||||
|
||||
// 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_trackView->jumpToCurrentTrack() || b;
|
||||
b = m_detailedView->jumpToCurrentTrack() || b;
|
||||
b = m_gridView->jumpToCurrentTrack() || b;
|
||||
|
||||
return b;
|
||||
return m_view->jumpToCurrentTrack();
|
||||
}
|
||||
|
||||
|
||||
@ -311,20 +102,7 @@ FlexibleView::setFilter( const QString& pattern )
|
||||
{
|
||||
ViewPage::setFilter( pattern );
|
||||
|
||||
m_trackView->setFilter( pattern );
|
||||
m_detailedView->setFilter( pattern );
|
||||
m_gridView->setFilter( pattern );
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
FlexibleView::setEmptyTip( const QString& tip )
|
||||
{
|
||||
m_trackView->setEmptyTip( tip );
|
||||
m_detailedView->setEmptyTip( tip );
|
||||
m_gridView->setEmptyTip( tip );
|
||||
return m_view->setFilter( pattern );
|
||||
}
|
||||
|
||||
|
||||
@ -339,14 +117,8 @@ FlexibleView::setPixmap( const QPixmap& pixmap )
|
||||
void
|
||||
FlexibleView::onModelChanged()
|
||||
{
|
||||
m_header->setPixmap( m_pixmap );
|
||||
m_header->setCaption( m_model->title() );
|
||||
m_header->setDescription( m_model->description() );
|
||||
|
||||
if ( m_model->isReadOnly() )
|
||||
setEmptyTip( tr( "This playlist is currently empty." ) );
|
||||
else
|
||||
setEmptyTip( tr( "This playlist is currently empty. Add some tracks to it and enjoy the music!" ) );
|
||||
m_header->setCaption( m_view->trackView()->model()->title() );
|
||||
m_header->setDescription( m_view->trackView()->model()->description() );
|
||||
}
|
||||
|
||||
|
||||
@ -375,14 +147,12 @@ FlexibleView::setTemporaryPage( bool b )
|
||||
bool
|
||||
FlexibleView::isBeingPlayed() const
|
||||
{
|
||||
if ( !playlistInterface() )
|
||||
return false;
|
||||
|
||||
if ( playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() )
|
||||
return true;
|
||||
|
||||
if ( playlistInterface()->hasChildInterface( AudioEngine::instance()->currentTrackPlaylist() ) )
|
||||
return true;
|
||||
|
||||
return false;
|
||||
return m_view->isBeingPlayed();
|
||||
}
|
||||
|
||||
|
||||
ContextView*
|
||||
FlexibleView::view() const
|
||||
{
|
||||
return m_view;
|
||||
}
|
||||
|
||||
@ -25,11 +25,7 @@
|
||||
|
||||
class QStackedWidget;
|
||||
|
||||
class TrackDetailView;
|
||||
class GridView;
|
||||
class TrackView;
|
||||
class PlayableModel;
|
||||
class PlaylistModel;
|
||||
class ContextView;
|
||||
class FilterHeader;
|
||||
|
||||
class DLLEXPORT FlexibleView : public QWidget, public Tomahawk::ViewPage
|
||||
@ -37,9 +33,6 @@ class DLLEXPORT FlexibleView : public QWidget, public Tomahawk::ViewPage
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
enum FlexibleViewMode
|
||||
{ Flat = 0, Detailed = 1, Grid = 2 };
|
||||
|
||||
explicit FlexibleView( QWidget* parent = 0, QWidget* extraHeader = 0 );
|
||||
~FlexibleView();
|
||||
|
||||
@ -56,28 +49,14 @@ public:
|
||||
virtual bool isBeingPlayed() const;
|
||||
void setTemporaryPage( bool b );
|
||||
|
||||
TrackView* trackView() const { return m_trackView; }
|
||||
TrackView* detailedView() const { return m_detailedView; }
|
||||
GridView* gridView() const { return m_gridView; }
|
||||
|
||||
void setGuid( const QString& guid );
|
||||
|
||||
void setTrackView( TrackView* view );
|
||||
void setDetailedView( TrackView* view );
|
||||
void setGridView( GridView* view );
|
||||
|
||||
void setPlayableModel( PlayableModel* model );
|
||||
void setPlaylistModel( PlaylistModel* model );
|
||||
ContextView* view() const;
|
||||
|
||||
void setPixmap( const QPixmap& pixmap );
|
||||
void setEmptyTip( const QString& tip );
|
||||
|
||||
public slots:
|
||||
void setCurrentMode( FlexibleViewMode mode );
|
||||
virtual bool setFilter( const QString& pattern );
|
||||
|
||||
signals:
|
||||
void modeChanged( FlexibleViewMode mode );
|
||||
void destroyed( QWidget* widget );
|
||||
|
||||
private slots:
|
||||
@ -86,21 +65,9 @@ private slots:
|
||||
|
||||
private:
|
||||
FilterHeader* m_header;
|
||||
ContextView* m_view;
|
||||
QPixmap m_pixmap;
|
||||
|
||||
TrackView* m_trackView;
|
||||
TrackView* m_detailedView;
|
||||
GridView* m_gridView;
|
||||
|
||||
TrackDetailView* m_detailView;
|
||||
|
||||
PlayableModel* m_model;
|
||||
QStackedWidget* m_stack;
|
||||
|
||||
FlexibleViewMode m_mode;
|
||||
bool m_temporary;
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE( FlexibleView::FlexibleViewMode );
|
||||
|
||||
#endif // FLEXIBLEVIEW_H
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user