From 68b38cd7bcb5c85efcafc7a0d11e0b0a0523046e Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 27 Aug 2014 20:03:40 +0200 Subject: [PATCH] * Removed ModeHeader entirely. --- src/libtomahawk/playlist/ContextView.cpp | 7 ------- src/libtomahawk/playlist/ContextView.h | 2 -- src/libtomahawk/playlist/FlexibleView.cpp | 7 ------- src/libtomahawk/playlist/FlexibleView.h | 2 -- 4 files changed, 18 deletions(-) diff --git a/src/libtomahawk/playlist/ContextView.cpp b/src/libtomahawk/playlist/ContextView.cpp index 02766d1a2..d53210ea7 100644 --- a/src/libtomahawk/playlist/ContextView.cpp +++ b/src/libtomahawk/playlist/ContextView.cpp @@ -25,7 +25,6 @@ #include "audio/AudioEngine.h" #include "widgets/CaptionLabel.h" #include "widgets/FilterHeader.h" -#include "playlist/ModeHeader.h" #include "playlist/PlayableModel.h" #include "playlist/PlaylistModel.h" #include "playlist/TrackView.h" @@ -45,7 +44,6 @@ using namespace Tomahawk; ContextView::ContextView( QWidget* parent, const QString& caption, QWidget* extraHeader ) : QWidget( parent ) // , m_header( new FilterHeader( this ) ) -// , m_modeHeader( new ModeHeader( this ) ) , m_trackView( new TrackView() ) , m_model( 0 ) , m_temporary( false ) @@ -80,7 +78,6 @@ ContextView::ContextView( QWidget* parent, const QString& caption, QWidget* extr // m_gridView->setStyleSheet( QString( "QListView { background-color: white; }" ) ); // layout()->addWidget( m_header ); -// layout()->addWidget( m_modeHeader ); // if ( extraHeader ) // layout()->addWidget( extraHeader ); // 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 ) ), detailView, SLOT( setQuery( Tomahawk::query_ptr ) ) ); // 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 );*/ } diff --git a/src/libtomahawk/playlist/ContextView.h b/src/libtomahawk/playlist/ContextView.h index 5d8610268..fa642935a 100644 --- a/src/libtomahawk/playlist/ContextView.h +++ b/src/libtomahawk/playlist/ContextView.h @@ -31,7 +31,6 @@ class TrackView; class PlayableModel; class PlaylistModel; class FilterHeader; -class ModeHeader; class DLLEXPORT ContextView : public QWidget, public Tomahawk::ViewPage { @@ -86,7 +85,6 @@ private slots: private: FilterHeader* m_header; - ModeHeader* m_modeHeader; QPixmap m_pixmap; CaptionLabel* m_captionLabel; diff --git a/src/libtomahawk/playlist/FlexibleView.cpp b/src/libtomahawk/playlist/FlexibleView.cpp index 89412c7c9..e8655140d 100644 --- a/src/libtomahawk/playlist/FlexibleView.cpp +++ b/src/libtomahawk/playlist/FlexibleView.cpp @@ -25,7 +25,6 @@ #include "audio/AudioEngine.h" #include "widgets/CaptionLabel.h" #include "widgets/FilterHeader.h" -#include "playlist/ModeHeader.h" #include "playlist/PlayableModel.h" #include "playlist/PlaylistModel.h" #include "playlist/TrackView.h" @@ -45,7 +44,6 @@ using namespace Tomahawk; FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader ) : QWidget( parent ) , m_header( new FilterHeader( this ) ) -// , m_modeHeader( new ModeHeader( this ) ) , m_trackView( new TrackView() ) , m_detailedView( new TrackView() ) , m_gridView( new GridView() ) @@ -76,7 +74,6 @@ FlexibleView::FlexibleView( QWidget* parent, QWidget* extraHeader ) m_gridView->setStyleSheet( QString( "QListView { background-color: white; }" ) ); layout()->addWidget( m_header ); -// layout()->addWidget( m_modeHeader ); if ( 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_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 );*/ } diff --git a/src/libtomahawk/playlist/FlexibleView.h b/src/libtomahawk/playlist/FlexibleView.h index 773489a93..ee98afc23 100644 --- a/src/libtomahawk/playlist/FlexibleView.h +++ b/src/libtomahawk/playlist/FlexibleView.h @@ -31,7 +31,6 @@ class TrackView; class PlayableModel; class PlaylistModel; class FilterHeader; -class ModeHeader; class DLLEXPORT FlexibleView : public QWidget, public Tomahawk::ViewPage { @@ -87,7 +86,6 @@ private slots: private: FilterHeader* m_header; - ModeHeader* m_modeHeader; QPixmap m_pixmap; TrackView* m_trackView;