mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-28 16:20:01 +02:00
Code Issues Releases Wiki Activity

* Removed ModeHeader entirely.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-27 20:03:40 +02:00
parent 662feab530
commit 68b38cd7bc
4 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/playlist/ContextView.cpp
View File

@@ -25,7 +25,6 @@
#include "audio/AudioEngine.h" #include "audio/AudioEngine.h"
#include "widgets/CaptionLabel.h" #include "widgets/CaptionLabel.h"
#include "widgets/FilterHeader.h" #include "widgets/FilterHeader.h"
#include "playlist/ModeHeader.h"
#include "playlist/PlayableModel.h" #include "playlist/PlayableModel.h"
#include "playlist/PlaylistModel.h" #include "playlist/PlaylistModel.h"
#include "playlist/TrackView.h" #include "playlist/TrackView.h"
@@ -45,7 +44,6 @@ using namespace Tomahawk;
ContextView::ContextView( QWidget* parent, const QString& caption, QWidget* extraHeader ) ContextView::ContextView( QWidget* parent, const QString& caption, QWidget* extraHeader )
: QWidget( parent ) : QWidget( parent )
// , m_header( new FilterHeader( this ) ) // , m_header( new FilterHeader( this ) )
// , m_modeHeader( new ModeHeader( this ) )
, m_trackView( new TrackView() ) , m_trackView( new TrackView() )
, m_model( 0 ) , m_model( 0 )
, m_temporary( false ) , m_temporary( false )
@@ -80,7 +78,6 @@ ContextView::ContextView( QWidget* parent, const QString& caption, QWidget* extr
// m_gridView->setStyleSheet( QString( "QListView { background-color: white; }" ) ); // m_gridView->setStyleSheet( QString( "QListView { background-color: white; }" ) );
// layout()->addWidget( m_header ); // layout()->addWidget( m_header );
// layout()->addWidget( m_modeHeader );
// if ( extraHeader ) // if ( extraHeader )
// layout()->addWidget( extraHeader ); // layout()->addWidget( extraHeader );
// layout()->addWidget( lineBelow ); // layout()->addWidget( lineBelow );
@@ -126,10 +123,6 @@ ContextView::ContextView( QWidget* parent, const QString& caption, QWidget* extr
connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), SLOT( onQuerySelected( Tomahawk::query_ptr ) ) ); connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), SLOT( onQuerySelected( Tomahawk::query_ptr ) ) );
connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), detailView, SLOT( setQuery( Tomahawk::query_ptr ) ) ); connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), detailView, SLOT( setQuery( Tomahawk::query_ptr ) ) );
// connect( m_header, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) ); // connect( m_header, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) );
/* NewClosure( m_modeHeader, SIGNAL( flatClicked() ), const_cast< ContextView* >( this ), SLOT( setCurrentMode( ContextViewMode ) ), ContextView::Flat )->setAutoDelete( false );
NewClosure( m_modeHeader, SIGNAL( detailedClicked() ), const_cast< ContextView* >( this ), SLOT( setCurrentMode( ContextViewMode ) ), ContextView::Detailed )->setAutoDelete( false );
NewClosure( m_modeHeader, SIGNAL( gridClicked() ), const_cast< ContextView* >( this ), SLOT( setCurrentMode( ContextViewMode ) ), ContextView::Grid )->setAutoDelete( false );*/
} }

2
src/libtomahawk/playlist/ContextView.h
View File

@@ -31,7 +31,6 @@ class TrackView;
class PlayableModel; class PlayableModel;
class PlaylistModel; class PlaylistModel;
class FilterHeader; class FilterHeader;
class ModeHeader;
class DLLEXPORT ContextView : public QWidget, public Tomahawk::ViewPage class DLLEXPORT ContextView : public QWidget, public Tomahawk::ViewPage
{ {
@@ -86,7 +85,6 @@ private slots:
private: private:
FilterHeader* m_header; FilterHeader* m_header;
ModeHeader* m_modeHeader;
QPixmap m_pixmap; QPixmap m_pixmap;
CaptionLabel* m_captionLabel; CaptionLabel* m_captionLabel;

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

@@ -25,7 +25,6 @@
#include "audio/AudioEngine.h" #include "audio/AudioEngine.h"
#include "widgets/CaptionLabel.h" #include "widgets/CaptionLabel.h"
#include "widgets/FilterHeader.h" #include "widgets/FilterHeader.h"
#include "playlist/ModeHeader.h"
#include "playlist/PlayableModel.h" #include "playlist/PlayableModel.h"
#include "playlist/PlaylistModel.h" #include "playlist/PlaylistModel.h"
#include "playlist/TrackView.h" #include "playlist/TrackView.h"
@@ -45,7 +44,6 @@ using namespace Tomahawk;
FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader ) FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader )
: QWidget( parent ) : QWidget( parent )
, m_header( new FilterHeader( this ) ) , m_header( new FilterHeader( this ) )
// , m_modeHeader( new ModeHeader( this ) )
, m_trackView( new TrackView() ) , m_trackView( new TrackView() )
, m_detailedView( new TrackView() ) , m_detailedView( new TrackView() )
, m_gridView( new GridView() ) , m_gridView( new GridView() )
@@ -76,7 +74,6 @@ FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader )
m_gridView->setStyleSheet( QString( "QListView { background-color: white; }" ) ); m_gridView->setStyleSheet( QString( "QListView { background-color: white; }" ) );
layout()->addWidget( m_header ); layout()->addWidget( m_header );
// layout()->addWidget( m_modeHeader );
if ( extraHeader ) if ( extraHeader )
layout()->addWidget( extraHeader ); layout()->addWidget( extraHeader );
@@ -118,10 +115,6 @@ FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader )
connect( m_trackView, SIGNAL( querySelected( Tomahawk::query_ptr ) ), m_detailView, SLOT( setQuery( Tomahawk::query_ptr ) ) ); 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_header, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) );
/* NewClosure( m_modeHeader, SIGNAL( flatClicked() ), const_cast< FlexibleView* >( this ), SLOT( setCurrentMode( FlexibleViewMode ) ), FlexibleView::Flat )->setAutoDelete( false );
NewClosure( m_modeHeader, SIGNAL( detailedClicked() ), const_cast< FlexibleView* >( this ), SLOT( setCurrentMode( FlexibleViewMode ) ), FlexibleView::Detailed )->setAutoDelete( false );
NewClosure( m_modeHeader, SIGNAL( gridClicked() ), const_cast< FlexibleView* >( this ), SLOT( setCurrentMode( FlexibleViewMode ) ), FlexibleView::Grid )->setAutoDelete( false );*/
} }

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

@@ -31,7 +31,6 @@ class TrackView;
class PlayableModel; class PlayableModel;
class PlaylistModel; class PlaylistModel;
class FilterHeader; class FilterHeader;
class ModeHeader;
class DLLEXPORT FlexibleView : public QWidget, public Tomahawk::ViewPage class DLLEXPORT FlexibleView : public QWidget, public Tomahawk::ViewPage
{ {
@@ -87,7 +86,6 @@ private slots:
private: private:
FilterHeader* m_header; FilterHeader* m_header;
ModeHeader* m_modeHeader;
QPixmap m_pixmap; QPixmap m_pixmap;
TrackView* m_trackView; TrackView* m_trackView;