From 92d7757e471ba28998c329f4cde4fa1f5e5f4b70 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 3 Jul 2012 17:05:42 +0200 Subject: [PATCH] * Setup (proxy-)model and load dynamic playlist in DynamicQmlWidget. --- .../playlist/dynamic/widgets/DynamicQmlWidget.cpp | 12 +++++++++--- .../playlist/dynamic/widgets/DynamicQmlWidget.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp index a712b978b..59d2c840e 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp @@ -14,18 +14,24 @@ namespace Tomahawk DynamicQmlWidget::DynamicQmlWidget( const dynplaylist_ptr& playlist, QWidget* parent ) : QDeclarativeView( parent ) + , m_playlist( playlist ) { - setResizeMode(QDeclarativeView::SizeRootObjectToView); + setResizeMode( QDeclarativeView::SizeRootObjectToView ); + setSource( QUrl( "qrc" RESPATH "qml/ArtistInfoScene.qml" ) ); m_model = new DynamicModel( this ); + m_proxyModel = new PlayableProxyModel( this ); + m_proxyModel->setSourcePlayableModel( m_model ); - rootContext()->setContextProperty("dynamicModel", m_model); + rootContext()->setContextProperty( "dynamicModel", m_proxyModel ); - setSource(QUrl("qrc" RESPATH "qml/StationScene.qml")); + m_model->loadPlaylist( m_playlist ); + setSource( QUrl( "qrc" RESPATH "qml/StationScene.qml" ) ); // TODO: fill m_model with the station stuff } + DynamicQmlWidget::~DynamicQmlWidget() { } diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.h b/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.h index 0a9a6c729..20d8000cc 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.h +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.h @@ -53,6 +53,8 @@ public: private: DynamicModel* m_model; PlayableProxyModel* m_proxyModel; + + dynplaylist_ptr m_playlist; }; }