mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-19 12:21:52 +02:00
Code Issues Releases Wiki Activity

Expose DisplayRole as name in sourcesModel

Browse Source
This commit is contained in:
Dominik Schmidt
2011-09-07 06:59:24 +02:00
parent 2472171e8e
commit 354f1f8f2e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/active/tomahawktouchwindow.cpp
View File

@@ -21,6 +21,8 @@
#include "utils/logger.h" #include "utils/logger.h"
#include "audio/audioengine.h" #include "audio/audioengine.h"
#include "globalactionmanager.h" #include "globalactionmanager.h"
#include "sourcesmodel.h"
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
#include <QtDeclarative> #include <QtDeclarative>
@@ -70,18 +72,14 @@ TomahawkTouchWindow::loadQml()
tLog()<< Q_FUNC_INFO << "clear component cache"; tLog()<< Q_FUNC_INFO << "clear component cache";
m_view->engine()->clearComponentCache(); m_view->engine()->clearComponentCache();
tLog()<< Q_FUNC_INFO << "set source";
m_view->setSource( QUrl::fromLocalFile( QMLGUI "/main.qml" ) );
tLog()<< Q_FUNC_INFO << "set context property"; tLog()<< Q_FUNC_INFO << "set context property";
QDeclarativeContext* context = m_view->rootContext(); QDeclarativeContext* context = m_view->rootContext();
//context->setContextProperty( "myModel", m_superCollectionProxyModel );
tLog()<< Q_FUNC_INFO << "make objects accessible from qml";
context->setContextProperty( "audioEngine", AudioEngine::instance() ); context->setContextProperty( "audioEngine", AudioEngine::instance() );
context->setContextProperty( "globalActionManager", GlobalActionManager::instance() ); context->setContextProperty( "globalActionManager", GlobalActionManager::instance() );
context->setContextProperty( "sourcesModel", s_sourcesModel ); context->setContextProperty( "sourcesModel", s_sourcesModel );
tLog()<< Q_FUNC_INFO << "finished"; tLog()<< Q_FUNC_INFO << "set source";
m_view->setSource( QUrl::fromLocalFile( QMLGUI "/main.qml" ) );
} }

4
src/sourcetree/sourcesmodel.cpp
View File

@@ -55,6 +55,10 @@ SourcesModel::SourcesModel( QObject* parent )
connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) ); connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
connect( SourceList::instance(), SIGNAL( sourceRemoved( Tomahawk::source_ptr ) ), SLOT( onSourceRemoved( Tomahawk::source_ptr ) ) ); connect( SourceList::instance(), SIGNAL( sourceRemoved( Tomahawk::source_ptr ) ), SLOT( onSourceRemoved( Tomahawk::source_ptr ) ) );
connect( ViewManager::instance(), SIGNAL( viewPageActivated( Tomahawk::ViewPage* ) ), this, SLOT( viewPageActivated( Tomahawk::ViewPage* ) ) ); connect( ViewManager::instance(), SIGNAL( viewPageActivated( Tomahawk::ViewPage* ) ), this, SLOT( viewPageActivated( Tomahawk::ViewPage* ) ) );
QHash<int, QByteArray> roles;
roles[Qt::DisplayRole] = "name";
setRoleNames(roles);
} }