From 3715e5f15e007ba689d777230c9e6a3a6557b355 Mon Sep 17 00:00:00 2001 From: Arnaud Bienner Date: Fri, 22 Nov 2013 20:58:58 +0100 Subject: [PATCH] Revert revision 316b5d7db478064fd488ae6de20dad2e721b31b5 and revision e7a5c482fed1ec174257d5e998558831e5df2967 (aka re-enable inline editing) --- src/playlist/playlist.cpp | 17 +++++++++++------ src/ui/mainwindow.cpp | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index 8ee04cffa..ea07cca42 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -171,12 +171,17 @@ QVariant Playlist::headerData(int section, Qt::Orientation, int role) const { bool Playlist::column_is_editable(Playlist::Column column) { switch (column) { - // For a long time, we had Column_Artist, etc. here, to allow inline editing - // of tags. This was a pretty good idea, but now we have a dedicated tag - // dialog editor, I'm not sure it is very useful. It was probably faster to - // edit tags this way, but I'm afraid lot of people may inadvertently modify - // their tags because of this. Still allow inline editing of score and - // comment, because they sound less critical to me. + case Column_Title: + case Column_Artist: + case Column_Album: + case Column_AlbumArtist: + case Column_Composer: + case Column_Performer: + case Column_Grouping: + case Column_Track: + case Column_Disc: + case Column_Year: + case Column_Genre: case Column_Score: case Column_Comment: return true; diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 722fc7f0a..b4edfb485 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -1393,7 +1393,7 @@ void MainWindow::PlaylistRightClick(const QPoint& global_pos, const QModelIndex& ui_->action_selection_set_value->setText(tr("Set %1 to \"%2\"...") .arg(column_name.toLower()).arg(column_value)); - ui_->action_edit_value->setText(tr("Edit \"%1\"...").arg(column_name)); + ui_->action_edit_value->setText(tr("Edit tag \"%1\"...").arg(column_name)); // Is it a library item? PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());