diff --git a/src/libtomahawk/widgets/HistoryWidget.cpp b/src/libtomahawk/widgets/HistoryWidget.cpp index a4604206e..f81d09cf5 100644 --- a/src/libtomahawk/widgets/HistoryWidget.cpp +++ b/src/libtomahawk/widgets/HistoryWidget.cpp @@ -37,47 +37,8 @@ using namespace Tomahawk; HistoryWidget::HistoryWidget( const source_ptr& source, QWidget* parent ) - : FlexibleView( parent, m_header = new QWidget() ) + : FlexibleView( parent ) { - m_header->setMaximumHeight( 160 ); -/* QCalendarWidget* m_calendarFrom = new QCalendarWidget(); - QCalendarWidget* m_calendarTo = new QCalendarWidget(); - m_calendarFrom->setGridVisible( false ); - m_calendarTo->setGridVisible( false );*/ - m_calendarFrom = new QDateEdit( QDate::currentDate() ); - m_calendarTo = new QDateEdit( QDate::currentDate() ); - m_calendarFrom->setDisplayFormat( "yyyy MMMM dd" ); - m_calendarTo->setDisplayFormat( "yyyy MMMM dd" ); - - // setting an empty style-sheet prevents the QDateEdits from adopting their parent's QPalette - QString calSheet = QString( "QDateEdit {}" ); - m_calendarFrom->setStyleSheet( calSheet ); - m_calendarTo->setStyleSheet( calSheet ); - - QPalette pal = m_header->palette(); - pal.setColor( QPalette::Foreground, TomahawkStyle::HEADER_TEXT ); - pal.setColor( QPalette::Text, TomahawkStyle::HEADER_TEXT ); - pal.setColor( foregroundRole(), TomahawkStyle::HEADER_TEXT ); - pal.setBrush( backgroundRole(), TomahawkStyle::HEADER_BACKGROUND.lighter() ); - m_header->setPalette( pal ); - m_header->setAutoFillBackground( true ); - - QLabel* fromLabel = new QLabel( tr( "From:" ) ); - fromLabel->setPalette( m_header->palette() ); - QLabel* toLabel = new QLabel( tr( "To:" ) ); - toLabel->setPalette( m_header->palette() ); - QHBoxLayout* layout = new QHBoxLayout( m_header ); - layout->setContentsMargins( 4, 4, 4, 4 ); - layout->setSpacing( 4 ); - layout->addSpacerItem( new QSpacerItem( 1, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum ) ); - layout->addWidget( fromLabel ); - layout->addWidget( m_calendarFrom ); - layout->addSpacerItem( new QSpacerItem( 16, 0, QSizePolicy::Fixed, QSizePolicy::Minimum ) ); - layout->addWidget( toLabel ); - layout->addWidget( m_calendarTo ); - layout->addSpacerItem( new QSpacerItem( 1, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum ) ); - m_header->setLayout( layout ); - setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::RecentlyPlayed ) ); m_model = new RecentlyPlayedModel( this ); @@ -96,11 +57,6 @@ HistoryWidget::HistoryWidget( const source_ptr& source, QWidget* parent ) m_model->setSource( source ); setGuid( QString( "recentplays/%1" ).arg( source->nodeId() ) ); - -/* connect( m_calendarFrom, SIGNAL( clicked( QDate ) ), SLOT( onDateClicked( QDate ) ) ); - connect( m_calendarTo, SIGNAL( clicked( QDate ) ), SLOT( onDateClicked( QDate ) ) );*/ - connect( m_calendarFrom, SIGNAL( dateChanged( QDate ) ), SLOT( onDateClicked( QDate ) ) ); - connect( m_calendarTo, SIGNAL( dateChanged( QDate ) ), SLOT( onDateClicked( QDate ) ) ); } @@ -112,7 +68,7 @@ HistoryWidget::~HistoryWidget() void HistoryWidget::onDateClicked( const QDate& date ) { - QDateEdit* cw = qobject_cast< QDateEdit* >( sender() ); +/* QDateEdit* cw = qobject_cast< QDateEdit* >( sender() ); if ( cw == m_calendarFrom && date > m_calendarTo->date()) { m_calendarTo->setDate( date ); @@ -124,5 +80,5 @@ HistoryWidget::onDateClicked( const QDate& date ) m_model->setLimit( 0 ); m_model->setDateFrom( m_calendarFrom->date() ); - m_model->setDateTo( m_calendarTo->date() ); + m_model->setDateTo( m_calendarTo->date() );*/ } diff --git a/src/libtomahawk/widgets/HistoryWidget.h b/src/libtomahawk/widgets/HistoryWidget.h index f3fa5d674..af635021a 100644 --- a/src/libtomahawk/widgets/HistoryWidget.h +++ b/src/libtomahawk/widgets/HistoryWidget.h @@ -42,7 +42,6 @@ private slots: void onDateClicked( const QDate& date ); private: - QWidget* m_header; RecentlyPlayedModel* m_model; /* QCalendarWidget* m_calendarFrom;