Offer choice of default browsers

The database or playlist catalogue can now be set
as the browser that is launched when pressing
ACTION_WPS_BROWSE on the WPS, unless another browser
has more recently been opened.

Previously you'd always have to exit the File Browser
first, after the player had been restarted, which is
annoying for users who prefer the database.

The playlist catalogue has become part of the MRU
browser list, so pressing ACTION_WPS_BROWSE after
selecting a track from a playlist in the playlist
catalogue will now take you back there.

Settings menus have been slightly restructured.

- Eliminated "Set WPS Context Plugin" and "Hotkey" menus
  from the General menu

- Added "What's Playing Screen" menu in Settings-General
  with option for setting default browser. The "WPS Hotkey"
  and "WPS Context Plugin" menu options have been moved to
  this menu.

- "File Browser Hotkey" is now part of the File View menu,
  which means it is accessible from the browser's context
  menu as well.

Overview of resulting menu structure in Settings->General:

What's Playing Screen
    Default Browser
    WPS Hotkey
    Set WPS Context Plugin

File View
    (...)
    File Browser Hotkey

Change-Id: Iaa3619a791c20ce3562a1efd2cf90c72933b729a

5 files changed, 25 insertions, 24 deletions

diff --git a/manual/configure_rockbox/file_view.tex b/manual/configure_rockbox/file_view.tex
index 8b86e71906..112aa4c06f 100644
--- a/manual/configure_rockbox/file_view.tex
+++ b/manual/configure_rockbox/file_view.tex
@@ -1,5 +1,5 @@
 % $Id$ %
-\section{File View}
+\section{\label{ref:FileView}File View}
 The File View menu deals with options relating to how the File Browser 
 displays files.
 %
@@ -90,4 +90,11 @@ displays files.
   \setting{Current Directory Only} or \setting{Full Path}, then the title of
   each menu will be displayed on the first line in the \setting{Database Browser}.
 
+\opt{hotkey}{
+  \nopt{touchscreen}{\item[File Browser Hotkey.]
+    Sets the hotkey function for the \setting{File Browser},
+      \setting{Database} and \setting{Playlist Viewer} (see \reference{ref:Hotkeys}).
+    The default is \setting{Off}.
+  }
+}
 \end{description}
diff --git a/manual/configure_rockbox/hotkey_settings.tex b/manual/configure_rockbox/hotkey_settings.tex
deleted file mode 100644
index de2b3a872a..0000000000
--- a/manual/configure_rockbox/hotkey_settings.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-% $Id: hotkey_settings.tex 16765 2008-03-23 22:07:09Z nls $ %
-\opt{hotkey}{
-\section{\label{ref:HotkeySettings}Hotkey}
-
-  \begin{description}
-  \item[WPS Hotkey.] \opt{touchscreen}{This options sets the hotkey function for
-                         the WPS (see \reference{ref:Hotkeys}). The 
-                         default is \setting{View Playlist}.}
-  \nopt{touchscreen}{\item[File Browser Hotkey.]}
-   \end{description}
-
-  \nopt{touchscreen}{These options set the hotkey function for their respective
-  screens (see \reference{ref:Hotkeys}).  The default for the WPS is
-    \setting{View Playlist}.  The File Browser default is \setting{Off}.}
-}
diff --git a/manual/configure_rockbox/main.tex b/manual/configure_rockbox/main.tex
index b0711e5b71..b7d980d918 100644
--- a/manual/configure_rockbox/main.tex
+++ b/manual/configure_rockbox/main.tex
@@ -9,6 +9,7 @@
 \chapter{General Settings}
 \label{ref:configure_rockbox_general}
   \input{configure_rockbox/general_settings.tex}
+    \input{configure_rockbox/wps.tex}
     \input{configure_rockbox/playlist_options.tex}
     \input{configure_rockbox/file_view.tex}
     \input{configure_rockbox/database.tex}
@@ -21,8 +22,6 @@
 }
     \input{configure_rockbox/language.tex}
     \input{configure_rockbox/voice.tex}
-    \input{configure_rockbox/wps_context_plugin.tex}
-    \input{configure_rockbox/hotkey_settings.tex}
 
 \chapter{Theme Settings}
 \label{ref:configure_rockbox_themes}
diff --git a/manual/configure_rockbox/wps.tex b/manual/configure_rockbox/wps.tex
new file mode 100644
index 0000000000..dca27c056b
--- /dev/null
+++ b/manual/configure_rockbox/wps.tex
@@ -0,0 +1,16 @@
+
+\section{\label{ref:WPSSettings}What's Playing Screen}
+
+  \begin{description}
+  \item[Default Browser.]
+  Decide if you want the \setting{File Browser}, \setting{Database}, or
+  \setting{Playlist Catalogue} to launch after pressing \ActionWpsBrowse{}
+  on the WPS, when no other browser has recently been used.
+  \opt{hotkey}{
+    \item[WPS Hotkey.] Sets the hotkey function for
+                     the WPS (see \reference{ref:Hotkeys}). The
+                     default is \setting{View Playlist}.
+  }
+  \item[Set WPS Context Plugin.]
+  This option will allow you to run a Rockbox plugin from the WPS context menu.
+   \end{description}
diff --git a/manual/configure_rockbox/wps_context_plugin.tex b/manual/configure_rockbox/wps_context_plugin.tex
deleted file mode 100644
index 469a0e5ca2..0000000000
--- a/manual/configure_rockbox/wps_context_plugin.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-\section{\label{ref:SetWPSContextPlugin}Set WPS Context Plugin}
-
-  \begin{description}
-  \item[Set WPS Context Plugin.]
-  This option will allow you to run a rockbox plugin from the WPS context menu
-   \end{description}