From 488672dc5cd7ab821e08f2a8376955b4f120b723 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 11 Dec 2010 14:06:45 -0500 Subject: [PATCH] a few fixes --- src/playlist/playlistmanager.cpp | 4 ---- src/sourcetree/sourcesmodel.cpp | 5 +++++ src/sourcetree/sourcetreeview.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index e715366da..3f73b46a5 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -97,10 +97,6 @@ PlaylistManager::show( const Tomahawk::playlist_ptr& playlist ) if ( !m_loadedPlaylists.contains( playlist ) ) { playlist->resolve(); - - } - else - { m_loadedPlaylists << playlist; } diff --git a/src/sourcetree/sourcesmodel.cpp b/src/sourcetree/sourcesmodel.cpp index 6929d7b2a..796802cc4 100644 --- a/src/sourcetree/sourcesmodel.cpp +++ b/src/sourcetree/sourcesmodel.cpp @@ -55,6 +55,11 @@ SourcesModel::flags( const QModelIndex& index ) const playlist_ptr playlist = indexToPlaylist( index ); if ( !playlist.isNull() && playlist->author()->isLocal() ) defaultFlags |= Qt::ItemIsEditable; + } else if ( indexType( index ) == DynamicPlaylistSource ) + { + dynplaylist_ptr playlist = indexToDynamicPlaylist( index ); + if ( !playlist.isNull() && playlist->author()->isLocal() ) + defaultFlags |= Qt::ItemIsEditable; } return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags; diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index 387b4455e..4305f8d2a 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -376,7 +376,7 @@ SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co { o.state = QStyle::State_Enabled; - if ( ( SourcesModel::indexType( index ) == SourcesModel::PlaylistSource || SourcesModel::indexType( index ) == SourcesModel::PlaylistSource ) && + if ( ( SourcesModel::indexType( index ) == SourcesModel::PlaylistSource || SourcesModel::indexType( index ) == SourcesModel::DynamicPlaylistSource ) && ( option.state & QStyle::State_Selected ) == QStyle::State_Selected ) { o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );