[amarok] /: Finally harmonize the double-click and other playlist-related actions

[Matěj Laitl]

Git commit 71a0e27a7aa1899f063affd4854abf650978887b by Matěj Laitl.
Committed on 27/06/2013 at 10:40.
Pushed by laitl into branch 'master'.

Finally harmonize the double-click and other playlist-related actions

CHANGES:
 * Playlist-related actions were harmonized, double-clicking or pressing enter will
   append tracks to playlist, middle-clicking or using any "play media" action will
   prepend tracks to queue and immediately start playing; append or replace actions will
   no longer start playback.

Funnily enough, this is exactly what Myriam suggested from the start, but
wasn't understood by me, because her Amarok behaved differently than mine
(how so?) and we both referred to that behaviour.

The CHANGES above are current state vs. Amarok 2.7.1 and ignore any
intermediate steps.

BUG: 145468
BUG: 145490
BUG: 194549
FIXED-IN: 2.8
GUI: revisit playlist-related actions, the changes are more subtle now, see CHANGES
CCMAIL: amarok-devel at kde.org
CCMAIL: amarok-promo at kde.org

M  +4    -4    ChangeLog
M  +3    -3    src/playlist/PlaylistController.h

http://commits.kde.org/amarok/71a0e27a7aa1899f063affd4854abf650978887b

diff --git a/ChangeLog b/ChangeLog
index d75cbd0..a0a39d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,10 +34,10 @@ VERSION 2.8-Beta 1
 
   CHANGES:
    * Removed the splash screen.
-   * Playlist-related actions were harmonized, double-clicking, pressing enter or using
-     any "play media" action will prepend tracks to queue and immediately start playing;
-     middle-clicking appends to playlist; append or replace actions will no longer start
-     playback. (BR 145468, BR 145490, BR 194549)
+   * Playlist-related actions were harmonized, double-clicking or pressing enter will
+     append tracks to playlist, middle-clicking or using any "play media" action will
+     prepend tracks to queue and immediately start playing; append or replace actions will
+     no longer start playback. (BR 145468, BR 145490, BR 194549)
    * When a new collection plugin is enabled, its collections appear immediately without a
      need for restart.
    * Update the MusicBrainz tagger to MusicBrainz web service 2, make it show some more
diff --git a/src/playlist/PlaylistController.h b/src/playlist/PlaylistController.h
index 5f96d0e..a338153 100644
--- a/src/playlist/PlaylistController.h
+++ b/src/playlist/PlaylistController.h
@@ -55,9 +55,9 @@ enum AddOption
     // bahaviour of similarly-looking UI elements the same. These enums are the preferred
     // ones on calling sites. Feel free to add a new one if you find another UI element
     // that appears on multiple places. Prefix these with On*.
-    OnDoubleClickOnSelectedItems = StartPlay,
-    OnMiddleClickOnSelectedItems = 0, // append
-    OnReturnPressedOnSelectedItems = OnDoubleClickOnSelectedItems, // these should be kept same
+    OnDoubleClickOnSelectedItems = 0, // append
+    OnMiddleClickOnSelectedItems = DirectPlay,
+    OnReturnPressedOnSelectedItems = 0, // append, should be kept same as double-click
 
     OnPlayMediaAction = DirectPlay,
     OnAppendToPlaylistAction = 0, // no-brainer, just for consistency, applied to popup-dropper too