From 2f28d4ea2908cabbdc7451dc7b97f5d7e6ce9de1 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 17 Oct 2014 21:21:45 +0200 Subject: [PATCH] Readd a header widget to station view. --- .../playlist/dynamic/widgets/DynamicWidget.cpp | 11 +++++++++-- .../playlist/dynamic/widgets/DynamicWidget.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp index eee3d03db..5885f993f 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp @@ -34,6 +34,7 @@ #include "ViewManager.h" #include "playlist/dynamic/DynamicView.h" #include "DynamicSetupWidget.h" +#include "widgets/BasicHeader.h" #include "utils/AnimatedSpinner.h" #include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" @@ -64,6 +65,9 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget , m_view( 0 ) , m_model() { + m_header = new BasicHeader; + m_layout->addWidget( m_header ); + m_controls = new CollapsibleControls( this ); m_layout->addWidget( m_controls ); setContentsMargins( 0, 0, 0, 1 ); // to align the bottom with the bottom of the sourcelist @@ -163,7 +167,7 @@ DynamicWidget::loadDynamicPlaylist( const Tomahawk::dynplaylist_ptr& playlist ) m_model->loadPlaylist( m_playlist ); m_controlsChanged = false; m_setup->setPlaylist( m_playlist ); - + m_header->setCaption( m_playlist->title() ); if ( !m_playlist->author()->isLocal() ) // hide controls, as we show the description in the summary m_layout->removeWidget( m_controls ); @@ -551,5 +555,8 @@ DynamicWidget::onChanged() { if ( !m_playlist.isNull() && ViewManager::instance()->currentPage() == this ) - emit nameChanged( m_playlist->title() ); + { + m_header->setCaption( m_playlist->title() ); + emit nameChanged( m_playlist->title() ); + } } diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h index 08bc47885..79090a9f2 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h @@ -27,6 +27,7 @@ #include "playlist/dynamic/DynamicPlaylistRevision.h" class AnimatedSpinner; +class BasicHeader; class QShowEvent; class QHideEvent; class QVBoxLayout; @@ -121,6 +122,7 @@ private: bool m_controlsChanged; QWidget* m_steering; + BasicHeader* m_header; CollapsibleControls* m_controls; DynamicView* m_view;