From 20181affd1ac7e9281f348dbb7cae204216aab5c Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 21 Jun 2011 08:10:30 +0200 Subject: [PATCH] * Fixed a few playlist issues: don't lose current track when dropping / moving items on the playlist. --- src/libtomahawk/playlist/playlistmodel.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/playlist/playlistmodel.cpp b/src/libtomahawk/playlist/playlistmodel.cpp index 4cf20fb9c..3d9942c86 100644 --- a/src/libtomahawk/playlist/playlistmodel.cpp +++ b/src/libtomahawk/playlist/playlistmodel.cpp @@ -71,6 +71,10 @@ PlaylistModel::headerData( int section, Qt::Orientation orientation, int role ) void PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEntries ) { + QString currentuuid; + if ( currentItem().isValid() ) + currentuuid = itemFromIndex( currentItem() )->query()->id(); + if ( !m_playlist.isNull() ) { disconnect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( onRevisionLoaded( Tomahawk::PlaylistRevision ) ) ); @@ -114,6 +118,9 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEn connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) ); + if ( entry->query()->id() == currentuuid ) + setCurrentItem( plitem->index ); + if ( !entry->query()->resolvingFinished() && !entry->query()->playable() ) { m_waitingForResolved.append( entry->query().data() ); @@ -339,6 +346,7 @@ bool PlaylistModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent ) { Q_UNUSED( column ); + if ( action == Qt::IgnoreAction || isReadOnly() ) return true; @@ -355,7 +363,10 @@ PlaylistModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int r else beginRow = rowCount( QModelIndex() ); - qDebug() << data->formats(); +// qDebug() << data->formats(); + QString currentuuid; + if ( currentItem().isValid() ) + currentuuid = itemFromIndex( currentItem() )->query()->id(); QList queries; if ( data->hasFormat( "application/tomahawk.result.list" ) ) @@ -418,14 +429,15 @@ PlaylistModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int r TrackModelItem* plitem = new TrackModelItem( e, m_rootItem, beginRow ); plitem->index = createIndex( beginRow++, 0, plitem ); + if ( query->id() == currentuuid ) + setCurrentItem( plitem->index ); + connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) ); } emit endInsertRows(); if ( action == Qt::CopyAction ) - { - onPlaylistChanged(); - } + onPlaylistChanged( true ); } return true; @@ -507,7 +519,7 @@ PlaylistModel::removeIndex( const QModelIndex& index, bool moreToCome ) if ( !moreToCome && !m_playlist.isNull() ) { - onPlaylistChanged(); + onPlaylistChanged( true ); } }