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

use the proxymodel instead of the model directly

Browse Source
This commit is contained in:
Michael Zanetti
2012-07-05 13:17:12 +02:00
parent 0a1f2304e9
commit 64f4445a01
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/playlist/PlayableProxyModel.h
View File

@@ -67,6 +67,7 @@ public:
virtual void setMaxVisibleItems( int items ); virtual void setMaxVisibleItems( int items );
virtual PlayableItem* itemFromIndex( const QModelIndex& index ) const { return sourceModel()->itemFromIndex( index ); } virtual PlayableItem* itemFromIndex( const QModelIndex& index ) const { return sourceModel()->itemFromIndex( index ); }
Q_INVOKABLE virtual PlayableItem* itemFromIndex( int itemIndex ) const { return sourceModel()->itemFromIndex( itemIndex ); }
virtual Tomahawk::playlistinterface_ptr playlistInterface(); virtual Tomahawk::playlistinterface_ptr playlistInterface();

16
src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp
View File

@@ -28,12 +28,12 @@ DynamicQmlWidget::DynamicQmlWidget( const dynplaylist_ptr& playlist, QWidget* pa
m_model = new DynamicModel( this ); m_model = new DynamicModel( this );
m_proxyModel = new PlayableProxyModel( this ); m_proxyModel = new PlayableProxyModel( this );
m_proxyModel->setSourcePlayableModel( m_model ); m_proxyModel->setSourcePlayableModel( m_model );
m_proxyModel->setShowOfflineResults( false );
m_model->loadPlaylist( m_playlist ); m_model->loadPlaylist( m_playlist );
m_model->startOnDemand(); m_model->startOnDemand();
rootContext()->setContextProperty( "dynamicModel", m_model ); rootContext()->setContextProperty( "dynamicModel", m_proxyModel );
currentItemChanged( m_model->currentItem() ); currentItemChanged( m_model->currentItem() );
// TODO: In case QML is used in more places, this should probably be moved to some generic place // TODO: In case QML is used in more places, this should probably be moved to some generic place
@@ -93,10 +93,12 @@ QPixmap DynamicQmlWidget::requestPixmap(const QString &id, QSize *size, const QS
if( size ) if( size )
*size = QSize( width, height ); *size = QSize( width, height );
QModelIndex index = m_model->index( id.toInt(), 0, QModelIndex() ); QModelIndex index = m_proxyModel->index( id.toInt(), 0, QModelIndex() );
qDebug() << "got index" << index; qDebug() << "!*!*!*! got index" << index << id;
if( index.isValid() ) { if( index.isValid() ) {
PlayableItem *item = m_model->itemFromIndex( index ); PlayableItem *item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
qDebug() << "item:" << item;
qDebug() << "item2:" << item->artistName() << item->name();
if ( !item->album().isNull() ) { if ( !item->album().isNull() ) {
return item->album()->cover( *size ); return item->album()->cover( *size );
} else if ( !item->artist().isNull() ) { } else if ( !item->artist().isNull() ) {
@@ -113,9 +115,9 @@ QPixmap DynamicQmlWidget::requestPixmap(const QString &id, QSize *size, const QS
return pixmap; return pixmap;
} }
void DynamicQmlWidget::currentItemChanged(const QPersistentModelIndex &currentIndex) void DynamicQmlWidget::currentItemChanged( const QPersistentModelIndex &currentIndex )
{ {
rootContext()->setContextProperty( "currentlyPlayedIndex", m_model->currentItem().row() ); rootContext()->setContextProperty( "currentlyPlayedIndex", m_proxyModel->mapFromSource( currentIndex ).row() );
} }
} }

2
src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.h
View File

@@ -51,7 +51,7 @@ public:
virtual bool jumpToCurrentTrack(); virtual bool jumpToCurrentTrack();
QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize); QPixmap requestPixmap( const QString &id, QSize *size, const QSize &requestedSize );
private slots: private slots:
void currentItemChanged( const QPersistentModelIndex &currentIndex ); void currentItemChanged( const QPersistentModelIndex &currentIndex );