Rename "Playing Next..." menu items & hide Queue/Shuffle

"Play Next" instead of "Insert Next"
"Add" instead of "Insert"
"Play Last" instead of "Insert Last"
"Add Shuffled" instead of "Insert Shuffled"
"Play Last Shuffled" instead of "Insert Last Shuffled"

-"Queue" items hidden by default
- Shuffled options hidden by default
(Both can be enabled in options)

Resulting default menu:

Playing Next...
	Play Next
	Add
	Play Last
	Play

Change-Id: Ib0c07a8077ab4b10c2dbc7af33516adcd0d4b83a

apps/lang/english.lang

@@ -6228,58 +6228,58 @@
 </phrase>
 <phrase>
   id: LANG_INSERT
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
+  desc: deprecated
   user: core
   <source>
-    *: "Insert"
+    *: ""
   </source>
   <dest>
-    *: "Insert"
+    *: ""
   </dest>
   <voice>
-    *: "Insert"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_INSERT_FIRST
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
+  desc: deprecated
   user: core
   <source>
-    *: "Insert Next"
+    *: ""
   </source>
   <dest>
-    *: "Insert Next"
+    *: ""
   </dest>
   <voice>
-    *: "Insert Next"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_INSERT_LAST
-  desc: in onplay menu.  append a track/playlist into dynamic playlist.
+  desc: deprecated
   user: core
   <source>
-    *: "Insert Last"
+    *: ""
   </source>
   <dest>
-    *: "Insert Last"
+    *: ""
   </dest>
   <voice>
-    *: "Insert Last"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_INSERT_SHUFFLED
-  desc: in onplay menu.  insert a track/playlist randomly into dynamic playlist
+  desc: deprecated
   user: core
   <source>
-    *: "Insert Shuffled"
+    *: ""
   </source>
   <dest>
-    *: "Insert Shuffled"
+    *: ""
   </dest>
   <voice>
-    *: "Insert Shuffled"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10980,16 +10980,16 @@
 </phrase>
 <phrase>
   id: LANG_INSERT_LAST_SHUFFLED
-  desc: in onplay menu.  insert a playlist randomly at end of dynamic playlist
+  desc: deprecated
   user: core
   <source>
-    *: "Insert Last Shuffled"
+    *: ""
   </source>
   <dest>
-    *: "Insert Last Shuffled"
+    *: ""
   </dest>
   <voice>
-    *: "Insert Last Shuffled"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -16503,4 +16503,59 @@
     *: "Playing Next..."
   </voice>
 </phrase>
-
+<phrase>
+  id: LANG_PLAY_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Next"
+  </source>
+  <dest>
+    *: "Play Next"
+  </dest>
+  <voice>
+    *: "Play Next"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add Shuffled"
+  </source>
+  <dest>
+    *: "Add Shuffled"
+  </dest>
+  <voice>
+    *: "Add Shuffled"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last"
+  </source>
+  <dest>
+    *: "Play Last"
+  </dest>
+  <voice>
+    *: "Play Last"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last Shuffled"
+  </source>
+  <dest>
+    *: "Play Last Shuffled"
+  </dest>
+  <voice>
+    *: "Play Last Shuffled"
+  </voice>
+</phrase>

apps/onplay.c

@@ -626,19 +626,19 @@ static int treeplaylist_callback(int action,
                                  struct gui_synclist *this_list);
 
 /* insert items */
-MENUITEM_FUNCTION_W_PARAM(i_pl_item, 0, ID2P(LANG_INSERT),
+MENUITEM_FUNCTION_W_PARAM(i_pl_item, 0, ID2P(LANG_ADD),
                   add_to_playlist, &addtopl_insert,
                   treeplaylist_callback, Icon_Playlist);
-MENUITEM_FUNCTION_W_PARAM(i_first_pl_item, 0, ID2P(LANG_INSERT_FIRST),
+MENUITEM_FUNCTION_W_PARAM(i_first_pl_item, 0, ID2P(LANG_PLAY_NEXT),
                   add_to_playlist, &addtopl_insert_first,
                   treeplaylist_callback, Icon_Playlist);
-MENUITEM_FUNCTION_W_PARAM(i_last_pl_item, 0, ID2P(LANG_INSERT_LAST),
+MENUITEM_FUNCTION_W_PARAM(i_last_pl_item, 0, ID2P(LANG_PLAY_LAST),
                   add_to_playlist, &addtopl_insert_last,
                   treeplaylist_callback, Icon_Playlist);
-MENUITEM_FUNCTION_W_PARAM(i_shuf_pl_item, 0, ID2P(LANG_INSERT_SHUFFLED),
+MENUITEM_FUNCTION_W_PARAM(i_shuf_pl_item, 0, ID2P(LANG_ADD_SHUFFLED),
                   add_to_playlist, &addtopl_insert_shuf,
                   treeplaylist_callback, Icon_Playlist);
-MENUITEM_FUNCTION_W_PARAM(i_last_shuf_pl_item, 0, ID2P(LANG_INSERT_LAST_SHUFFLED),
+MENUITEM_FUNCTION_W_PARAM(i_last_shuf_pl_item, 0, ID2P(LANG_PLAY_LAST_SHUFFLED),
                   add_to_playlist, &addtopl_insert_last_shuf,
                   treeplaylist_callback, Icon_Playlist);
 /* queue items */
@@ -661,10 +661,10 @@ MENUITEM_FUNCTION_W_PARAM(q_last_shuf_pl_item, 0, ID2P(LANG_QUEUE_LAST_SHUFFLED)
 /* queue submenu */
 MAKE_ONPLAYMENU(queue_menu, ID2P(LANG_QUEUE_MENU),
                 treeplaylist_callback, Icon_Playlist,
-                &q_pl_item,
                 &q_first_pl_item,
-                &q_last_pl_item,
+                &q_pl_item,
                 &q_shuf_pl_item,
+                &q_last_pl_item,
                 &q_last_shuf_pl_item);
 
 /* replace playlist */
@@ -680,15 +680,15 @@ MAKE_ONPLAYMENU(tree_playlist_menu, ID2P(LANG_PLAYING_NEXT),
                 treeplaylist_callback, Icon_Playlist,
 
                 /* insert */
-                &i_pl_item,
                 &i_first_pl_item,
+                &i_pl_item,
                 &i_last_pl_item,
                 &i_shuf_pl_item,
                 &i_last_shuf_pl_item,
 
                 /* queue */
-                &q_pl_item,
                 &q_first_pl_item,
+                &q_pl_item,
                 &q_last_pl_item,
                 &q_shuf_pl_item,
                 &q_last_shuf_pl_item,

apps/settings_list.c

@@ -1766,9 +1766,9 @@ const struct settings_list settings[] = {
                   true, "warn when erasing dynamic playlist",NULL),
     OFFON_SETTING(0, keep_current_track_on_replace_playlist, LANG_KEEP_CURRENT_TRACK_ON_REPLACE,
                   true, "keep current track when replacing playlist",NULL),
-    OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, true,
+    OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, false,
                       "show shuffled adding options", NULL),
-    CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 1,
+    CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 0,
                       "show queue options", "off,on,in submenu",
                       NULL, 3,
                       ID2P(LANG_SET_BOOL_NO),

manual/working_with_playlists/main.tex

@@ -20,16 +20,12 @@ playlists:
   \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}), you are
   creating (or adding to) a dynamic playlist.
 
-\item[Insert.] In Rockbox, to \setting{Insert} an item into a playlist means
+\item[Play/Add.] In Rockbox, to \setting{Play} or \setting{Add} an item means
-  putting an item into a playlist and leaving it there, even after it is
+  putting it into a playlist and leaving it there, even after it is
-  played. As you will see later in this chapter, Rockbox can \setting{Insert}
+  played.
-  into a playlist in several places.
 
-\item[Queue.] In Rockbox, to \setting{Queue} a song means to put the song
+\item[Queue.] To \setting{Queue} a song means to put it into a playlist, but then
-  into a playlist and then to remove the song from the playlist once it has
+  to remove the song from the playlist once it has been played.
-  been played. The only difference between \setting{Insert} and
-  \setting{Queue} is that the \setting{Queue} option removes the song from the
-  playlist once it has been played, and the \setting{Insert} option does not.
 \end{description}
 
 \subsection{Creating playlists}
@@ -84,33 +80,16 @@ selected tracks are added to the playlist is determined by these
 options:
 
 \begin{description}
-\item [Insert.] Add track(s) after the most recently added tracks or, if tracks
+\item [Play Next.] Play track(s) immediately after the currently playing track.
+
+\item [Add.] Add track(s) after the most recently added tracks or, if tracks
 have not been added yet, immediately after the currently playing track.
 
-\item [Insert Next.] Add track(s) immediately after the currently playing track.
+\item [Play Last.] Add track(s) to the end of the playlist.
 
-\item [Insert Last.] Add track(s) to the end of the playlist.
+\item [Add Shuffled.] Add track(s) to the playlist at random positions.
 
-\item [Insert Shuffled.] Add track(s) to the playlist at random positions.
+\item [Play Last Shuffled.] Add tracks in a random order to the end of the playlist.
-
-\item [Insert Last Shuffled.] Add tracks in a random order to the end of the playlist.
-\end{description}
-
-Another possibility is to add tracks \emph{temporarily} to the dynamic playlist.
-In Rockbox’s parlance, this is called queuing. Queued tracks are automatically
-removed from the playlist after they have been played. They are also not saved
-to the playlist file (see \reference{ref:playlistoptions}).
-
-\begin{description}
-\item [Queue.] Corresponds to \setting{Insert}.
-
-\item [Queue Next.] Corresponds to \setting{Insert Next}.
-
-\item [Queue Last.] Corresponds to \setting{Insert Last}.
-
-\item [Queue Shuffled.] Corresponds to \setting{Insert Shuffled}.
-
-\item [Queue Last Shuffled.] Corresponds to \setting{Insert Last Shuffled}.
 \end{description}
 
 If you'd like to replace the current playlist with the new selection, the
@@ -127,10 +106,26 @@ following two options will achieve that effect.
   playlist in random order.
 \end{description}
 
-\note{You can hide the options to add shuffled tracks or to queue tracks, if you wish.
+Another possibility is to add tracks \emph{temporarily} to the dynamic playlist.
-The latter can also be put into its own submenu.  Simply go to
+In Rockbox’s parlance, this is called queuing. Queued tracks are automatically
+removed from the playlist after they have been played. They are also not saved
+to the playlist file (see \reference{ref:playlistoptions}).
+
+\begin{description}
+\item [Queue Next.] Corresponds to \setting{Play Next}.
+
+\item [Queue.] Corresponds to \setting{Add}.
+
+\item [Queue Last.] Corresponds to \setting{Play Last}.
+
+\item [Queue Shuffled.] Corresponds to \setting{Add Shuffled}.
+
+\item [Queue Last Shuffled.] Corresponds to \setting{Play Last Shuffled}.
+\end{description}
+
+\note{Visibility of options to add shuffled tracks or to queue tracks can be toggled by going to
 \setting{Settings} $\rightarrow$ \setting{General Settings} $\rightarrow$ \setting{Playlists}
-$\rightarrow$ \setting{Current Playlist} and select either \setting{Show Shuffled Adding Options}
+$\rightarrow$ \setting{Current Playlist}. Select either \setting{Show Shuffled Adding Options}
 or \setting{Show Queue Options} to customize the displayed set of options.}
 
 The \setting{Playing Next Submenu}  can be used to add either single tracks or