1 files changed, 25 insertions, 116 deletions

diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index c82a9cb9f4..1f62dc17a4 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -9,17 +9,10 @@ currently playing audio file.
   or off independently. Refer to \reference{ref:wps_tags} for details on how
   to change the display of the WPS.
   \begin{itemize}
-    \nopt{ondio}{
-    \item Status bar: The Status bar shows Battery level, charger status, 
-      volume, play mode, repeat mode, shuffle mode\opt{rtc}{ and clock}.
-      In contrast to all other items, the status bar is always at the top of
-      the screen.
-    }
-    \opt{ondio}{
-    \item Status bar: The Status bar shows Battery level, USB power mode, key
-      lock status, memory access indicator. In contrast to all other items, the
-      status bar is always at the top of the screen.
-    }
+  \item Status bar: The Status bar shows Battery level, charger status,
+    volume, play mode, repeat mode, shuffle mode\opt{rtc}{ and clock}.
+    In contrast to all other items, the status bar is always at the top of
+    the screen.
   \item (Scrolling) path and filename of the current song.
   \item The ID3 track name.
   \item The ID3 album name.
@@ -30,24 +23,7 @@ currently playing audio file.
   \item Peak meter.
   \end{itemize}
 }
-\opt{recorder,recorderv2fm,ondio}{
-  \note{
-  \begin{itemize}
-  \item The number of lines shown depends on the size of the font used.
-  \item The peak meter is only visible if you turn off the status bar or if
-    using a small font that gives 8 or more display lines.
-  \end{itemize}
-  }
-}
 %
-\opt{player}{
-  \note{
-  \begin{itemize}
-  \item Playlist index/Playlist size: Artist {}- Title.
-  \item Current{}-time Progress{}-indicator Left.
-  \end{itemize}
-  }
-}
 
 See \reference{ref:ConfiguringtheWPS} for details of customising
 your WPS (While Playing Screen).
@@ -81,7 +57,7 @@ your WPS (While Playing Screen).
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPlay}
       & Toggle play/pause.\\
       %
-      \ActionWpsStop 
+      \ActionWpsStop
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsStop}
       & Stop playback.\\
       %
@@ -93,11 +69,10 @@ your WPS (While Playing Screen).
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsContext}
       & Enter \setting{WPS Context Menu}.\\
       %
-      \opt{ONDIO_PAD}{\ActionWpsContext{} twice}%
-      \nopt{ONDIO_PAD}{\ActionWpsMenu}%
+      \ActionWpsMenu
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsMenu}
       & Enter \setting{Main Menu}%
-      \opt{ONDIO_PAD}{ via the \setting{WPS Context Menu}}.\\%
+      .\\%
       %
       \opt{quickscreen}{%
         \ActionWpsQuickScreen
@@ -107,25 +82,14 @@ your WPS (While Playing Screen).
       %
       % software hold targets
       \nopt{hold_button}{%
-          \opt{RECORDER_PAD}{\ButtonFOne+\ButtonDown}
-          \opt{PLAYER_PAD}{\ButtonMenu+\ButtonStop}
-          \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
           \opt{SANSA_CLIP_PAD}{\ButtonHome+\ButtonSelect}
           \opt{SANSA_FUZEPLUS_PAD}{\ButtonPower}
           & Key lock (software hold switch) on/off.\\
       }%
-      %These actions need definitions for the other targets
-      \opt{RECORDER_PAD}{%
-        \ButtonFThree & Toggles Display quick screen.\\%
-        \ButtonFOne+\ButtonPlay & Mute on/off.\\%
-      }%
-      \opt{PLAYER_PAD}{%
-        \ButtonMenu+\ButtonPlay & Mute on/off.\\%
-      }%
       % We explicitly list all the appropriate targets here and do no condition
       % on the 'pitchscreen' feature since some players have the feature but do
       % not have the button to go from the WPS to the pitch screen.
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
           ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{%
         \ActionWpsPitchScreen
         \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsPitchScreen}
@@ -137,9 +101,9 @@ your WPS (While Playing Screen).
         \opt{HAVEREMOTEKEYMAP}{&}
           & Show current \setting{Playlist}.\\%
       }%
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
           ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{%
-        \ActionWpsIdThreeScreen 
+        \ActionWpsIdThreeScreen
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsIdThreeScreen}
           & Enter \setting{ID3 Viewer}.\\%
       }%
@@ -168,7 +132,7 @@ your WPS (While Playing Screen).
       %
       \opt{SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
         \ActionStdRec
-          \opt{HAVEREMOTEKEYMAP}{&} 
+          \opt{HAVEREMOTEKEYMAP}{&}
           & Switch to the \setting{Recording Screen}.\\
       }%
   \end{btnmap}
@@ -177,7 +141,7 @@ your WPS (While Playing Screen).
 \opt{lcd_bitmap}{
   \subsection{\label{ref:peak_meter}Peak Meter}
   The peak meter can be displayed on the While Playing Screen and consists of
-  several indicators. 
+  several indicators.
   \opt{recording}{
     For a picture of the peak meter, please see the While
     Recording Screen in \reference{ref:while_recording_screen}.
@@ -187,12 +151,12 @@ your WPS (While Playing Screen).
      suffers when this feature is enabled. For this \dap{} it is highly recommended
      to not use peak meter.}
   }
-  
+
   \begin{description}
   \item [The bar:]
     This is the wide horizontal bar. It represents the current volume value.
   \item [The peak indicator:]
-    This is a little vertical line at the right end of the bar. It indicates 
+    This is a little vertical line at the right end of the bar. It indicates
     the peak volume value that occurred recently.
   \item [The clip indicator:]
     This is a little black block that is displayed at the very right of the
@@ -234,7 +198,7 @@ menu, you can find the \setting{Playlist Viewer Settings}.
        for playlist entries
   \end{description}
 
-    
+
 \subsubsection{Playlist catalogue}
   \begin{description}
     \item [View catalogue.] This lists all playlists that are part of the
@@ -249,12 +213,12 @@ menu, you can find the \setting{Playlist Viewer Settings}.
 
 \subsubsection{Sound Settings}
 This is a shortcut to the \setting{Sound Settings Menu}, where you can configure volume,
-bass, treble, and other settings affecting the sound of your music.  
+bass, treble, and other settings affecting the sound of your music.
 See \reference{ref:configure_rockbox_sound} for more information.
 
 \subsubsection{Playback Settings}
 This is a shortcut to the \setting{Playback Settings Menu}, where you can configure shuffle,
-repeat, party mode, skip length and other settings affecting the playback of your music.  
+repeat, party mode, skip length and other settings affecting the playback of your music.
 
 \subsubsection{Rating}
 The menu entry is only shown if \setting{Gather Runtime Information} is
@@ -271,19 +235,17 @@ This screen is accessible from the WPS screen, and provides a detailed view of
 all the identity information about the current track. This info is known as
 meta data and is stored in audio file formats to keep information on artist,
 album etc. To access this screen, %
-\opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,%
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,%
       SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_FUZEPLUS_PAD}{
   press \ActionWpsIdThreeScreen. }%
-\opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD,%
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD,%
       GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD,PBELL_VIBE500_PAD,%
       MPIO_HD200_PAD,MPIO_HD300_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}%
-      {press \ActionWpsContext{} to access the 
+      {press \ActionWpsContext{} to access the
       \setting{WPS Context Menu} and select \setting{Show Track Info}. }
-\opt{RECORDER_PAD,PLAYER_PAD,ONDIO_PAD}{Use \ButtonLeft\ and \ButtonRight\
-  to move through the information.}%
 
 \subsubsection{Open With...}
-This \setting{Open With} function is the same as the \setting{Open With} 
+This \setting{Open With} function is the same as the \setting{Open With}
 function in the file browser's \setting{Context Menu}.
 
 \subsubsection{Delete}
@@ -294,7 +256,7 @@ This may even be the whole track.
 
 \opt{pitchscreen}{
   \subsubsection{\label{sec:pitchscreen}Pitch}
-  
+
   The \setting{Pitch Screen} allows you to change the rate of playback
   (i.e. the playback speed and at the same time the pitch) of your
   \dap.  The rate value can be adjusted
@@ -304,20 +266,20 @@ This may even be the whole track.
 
   The rate can be changed in two modes: procentual and semitone.
   Initially, procentual mode is active.
-  
+
   \opt{swcodec}{
     If you've enabled the \setting{Timestretch} option in
     \setting{Sound Settings} and have since rebooted, you can also use
     timestretch mode. This allows you to change the playback speed
     without affecting the pitch, and vice versa.
-    
+
     In timestretch mode there are separate displays for pitch and
     speed, and each can be altered independently.  Due to the
     limitations of the algorithm, speed is limited to be between 35\%
     and 250\% of the current pitch value.  Pitch must maintain the
     same ratio as well as remain between 50\% and 200\%.
   }
-  
+
   The value of the \opt{swcodec}{rate, pitch and speed}\nopt{swcodec}{rate}
   is not persistent, i.e. after the \dap\ is turned on it will
   always be set to 100\%.  \opt{swcodec}{ However, the rate, pitch and speed
@@ -386,56 +348,3 @@ This may even be the whole track.
   }
 
 }
-
-%********************QUICKSCREENS***********************************************
-\opt{RECORDER_PAD}{
-  \section{\label{ref:QuickScreens}Quick Screens}
-  \screenshot{rockbox_interface/images/ss-quick-screen-112x64x1.png}{The F2 quick screen}{}
-  \screenshot{rockbox_interface/images/ss-quick-screen2-112x64x1.png}{The F3 quick screen}{}
-  Rockbox handles function buttons in a different way to the Archos software.
-  \ButtonFOne\ is always bound to the menu function, while \ButtonFTwo\ and
-  \ButtonFThree\ enable two quick screens.
-  
-  \ButtonFTwo\ displays some browse and play settings which are likely to be
-  changed frequently. This settings are Shuffle mode, Repeat mode and the Show
-  files options
-  
-  Shuffle mode plays each track in the currently playing list in a random order
-  rather than in the order shown in the browser.
-
-  Repeat mode repeats either a single track (One) or the entire playlist (All).
-
-  Show files determines what type files can be seen in the browser.  This can be
-  just MP3 files and directories (Music), Playlists, MP3 files and directories
-  (Playlists), any files that Rockbox supports (Supported) or all files on the
-  disk (All).
-
-  See \reference{ref:PlaybackOptions} for more information about these
-  settings.
-
-  \begin{btnmap}
-      \ButtonLeft & Control Shuffle mode setting. \\
-      \ButtonRight & Control Repeat mode setting. \\
-      \ButtonDown & Control Show file setting. \\
-  \end{btnmap}
-  
-  \ButtonFThree\ controls frequently used display options.
-  
-  Scroll bar turns the display of the Scroll bar on the left of the screen on
-  or off.
-  
-  Status bar turns the status display at the top of the screen on or off. 
-  Upside down inverts the screen so that the top of the display appears nearest
-  to the buttons. This is sometimes useful when storing the \dap\ in a pocket.
-  Key assignments swap over with the display orientation where it is logical 
-  for them to do so.
-
-  See \reference{ref:Displayoptions} for more information about these
-  settings.
-  
-  \begin{btnmap}
-      \ButtonLeft & Control scroll bar display. \\
-      \ButtonRight & Control status bar display. \\
-      \ButtonDown & Control upside down screen setting. \\
-  \end{btnmap}
-}