PictureFlow: Remove menu items for "Return" and "Clear Playlist"

On all players, it should be possible to return from the Main Menu
by pressing the Back or Menu key. Unless I'm missing something...

"Clear Playlist" has hopefully become superfluous after the "Playing Next"
context menu was added, which offers similar functionality.

Change-Id: I741544978fb7936b8d5a34dfc656472e20c1737e

3 files changed, 4 insertions, 18 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 49a953f995..695de3b232 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -15110,16 +15110,16 @@
 </phrase>
 <phrase>
   id: LANG_CLEAR_PLAYLIST
-  desc: in the pictureflow main menu
+  desc: deprecated
   user: core
   <source>
-    *: "Clear playlist"
+    *: ""
   </source>
   <dest>
-    *: "Clear playlist"
+    *: ""
   </dest>
   <voice>
-    *: "Clear playlist"
+    *: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 9896ca45bf..75504cf17e 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -3657,11 +3657,9 @@ enum {
     PF_GOTO_LAST_ALBUM,
     PF_GOTO_WPS,
 #if PF_PLAYBACK_CAPABLE
-    PF_MENU_CLEAR_PLAYLIST,
     PF_MENU_PLAYBACK_CONTROL,
 #endif
     PF_MENU_SETTINGS,
-    PF_MENU_RETURN,
     PF_MENU_QUIT,
 };
 
@@ -3679,11 +3677,9 @@ static int main_menu(void)
                         ID2P(LANG_GOTO_LAST_ALBUM),
                         ID2P(LANG_GOTO_WPS),
 #if PF_PLAYBACK_CAPABLE
-                        ID2P(LANG_CLEAR_PLAYLIST),
                         ID2P(LANG_PLAYBACK_CONTROL),
 #endif
                         ID2P(LANG_SETTINGS),
-                        ID2P(LANG_RETURN),
                         ID2P(LANG_MENU_QUIT));
     while (1)  {
         switch (rb->do_menu(&main_menu,&selection, NULL, false)) {
@@ -3718,12 +3714,6 @@ static int main_menu(void)
             case PF_GOTO_WPS: /* WPS */
                 return -2;
 #if PF_PLAYBACK_CAPABLE
-            case PF_MENU_CLEAR_PLAYLIST:
-                if(rb->warn_on_pl_erase() && rb->playlist_remove_all_tracks(NULL) == 0) {
-                    rb->playlist_create(NULL, NULL);
-                    rb->splash(HZ*2, ID2P(LANG_PLAYLIST_CLEARED));
-                }
-                break;
             case PF_MENU_PLAYBACK_CONTROL: /* Playback Control */
                 playback_control(NULL);
                 break;
@@ -3732,8 +3722,6 @@ static int main_menu(void)
                 result = settings_menu();
                 if ( result != 0 ) return result;
                 break;
-            case PF_MENU_RETURN:
-                return 0;
             case PF_MENU_QUIT:
                 return -1;
 
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index b00ccea8c7..f409fd8241 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -203,10 +203,8 @@ reduces the time it takes for cover art to be displayed.}}
   \item[Show Tracks While Browsing.] Scroll through albums from their track list.
   \item[Go to Last Album.] Go to selected album when PictureFlow was last quit or the sorting changed.
   \item[Go to WPS.] Leave PictureFlow and enter the While Playing Screen.
-  \item[Clear playlist] Removes all entries from the current playlist.
   \item[Playback Control.] Control music playback from within the plugin.
   \item[Settings.] Enter the settings menu.
-  \item[Return.] Exit menu.
   \item[Quit.] Exit PictureFlow plugin.
 \end{description}