Fix the description of the quick screen exit buttons by creating ActionQuickScreenExit and simply referring to it. Also adds the quick screen to the button table for the WPS and the browser with references to the Quick Screen section. Thanks to Costas Calamvokis. FS#7769.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17886 a1c6a512-1295-4272-9138-f99709370657

manual/main_menu/main.tex

@@ -211,12 +211,12 @@ pages of information.}
 
 \nopt{PLAYER_PAD,ONDIO_PAD}
 {
-\section{Quick Screen}
+\section{\label{ref:QuickScreen}Quick Screen}
   Whilst not strictly part of the \setting{Main Menu}, it is worth noting that
   a few of the more commonly used settings are available from the
   \setting{Quick Screen}.
   The \setting{Quick Screen} screen is accessed with \ActionStdQuickScreen{}
-  and exited with the same button.
+  and exited with \ActionQuickScreenExit.
   It allows rapid access to the \setting{Shuffle} and \setting{Repeat}
   modes (\reference{ref:PlaybackOptions}) and the \setting{Show Files}
   option (\reference{ref:ShowFiles}).

manual/platform/e200.tex

@@ -39,6 +39,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonDown}
+\newcommand{\ActionQuickScreenExit}{\ButtonPower}
 \newcommand{\ActionStdMenu}{\ButtonDown}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdRec}{Long \ButtonRec}

manual/platform/gigabeatf.tex

@@ -41,6 +41,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonMenu}

manual/platform/h10.tex

@@ -38,6 +38,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft}
 \newcommand{\ActionStdContext}{Long \ButtonRight}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonLeft}
+\newcommand{\ActionQuickScreenExit}{\ButtonLeft}
 \newcommand{\ActionStdMenu}{\ButtonPower}
 \newcommand{\ActionStdOk}{\ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonRight}

manual/platform/h10_5gb.tex

@@ -38,6 +38,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft}
 \newcommand{\ActionStdContext}{Long \ButtonRight}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonLeft}
+\newcommand{\ActionQuickscreenExit}{\ButtonLeft}
 \newcommand{\ActionStdMenu}{\ButtonPower}
 \newcommand{\ActionStdOk}{\ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonRight}

manual/platform/h1xx.tex

@@ -40,6 +40,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonOff}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMode}
+\newcommand{\ActionQuickScreenExit}{\ButtonMode}
 \newcommand{\ActionStdMenu}{\ButtonMode}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdRec}{Long \ButtonRec}

manual/platform/h300.tex

@@ -40,6 +40,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonOff}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMode}
+\newcommand{\ActionQuickscreenExit}{\ButtonMode}
 \newcommand{\ActionStdMenu}{\ButtonMode}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonRec}

manual/platform/ipod1g2g.tex

@@ -36,6 +36,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 

manual/platform/ipod3g.tex

@@ -36,6 +36,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 

manual/platform/ipod4g.tex

@@ -36,6 +36,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonMenu}

manual/platform/ipodcolor.tex

@@ -36,6 +36,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonMenu}

manual/platform/ipodmini.tex

@@ -36,6 +36,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonMenu}

manual/platform/ipodnano.tex

@@ -35,6 +35,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonMenu}

manual/platform/ipodvideo.tex

@@ -37,6 +37,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or Long \ButtonPlay}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonMenu}
 \newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
 \newcommand{\ActionStdUsbCharge}{\ButtonMenu}

manual/platform/m5.tex

@@ -39,6 +39,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonRec}
+\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
 \newcommand{\ActionStdMenu}{\ButtonRec}
 \newcommand{\ActionStdOk}{\ButtonSelect, \ButtonRight{} or \ButtonPlay}
 

manual/platform/recorder.tex

@@ -40,6 +40,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonOff}
 \newcommand{\ActionStdContext}{Long \ButtonPlay}
 \newcommand{\ActionStdQuickScreen}{\ButtonFTwo}
+\newcommand{\ActionQuickScreenExit}{\ButtonPlay}
 \newcommand{\ActionStdMenu}{\ButtonFOne}
 \newcommand{\ActionStdOk}{\ButtonRight{} or \ButtonOn}
 \newcommand{\ActionStdUsbCharge}{\ButtonFOne}

manual/platform/recorderv2fm.tex

@@ -39,6 +39,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonOff}
 \newcommand{\ActionStdContext}{Long \ButtonPlay}
 \newcommand{\ActionStdQuickScreen}{\ButtonFTwo}
++\newcommand{\ActionQuickScreenExit}{\ButtonPlay}
 \newcommand{\ActionStdMenu}{\ButtonFOne}
 \newcommand{\ActionStdOk}{\ButtonRight{} or \ButtonOn}
 \newcommand{\ActionStdUsbCharge}{\ButtonFOne}

manual/platform/x5.tex

@@ -39,6 +39,7 @@
 \newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonRec}
++\newcommand{\ActionQuickScreenExit}{\ButtonRec}
 \newcommand{\ActionStdMenu}{\ButtonRec}
 \newcommand{\ActionStdOk}{\ButtonSelect, \ButtonRight{} or \ButtonPlay}
 

manual/rockbox_interface/browsing_and_playing.tex

@@ -80,9 +80,12 @@ the \setting{Show Files} setting to all.
       \ActionStdMenu{}
       & Enter the \setting{Main Menu}\\
       %
-      \opt{RECORDER_PAD}{
-        \ButtonFTwo & Switches to the Browse/Play Quick Screen \\
+      \nopt{PLAYER_PAD,ONDIO_PAD} {
+        \ActionStdQuickScreen & Switches to the \setting{Quick Screen}
+        (see \reference{ref:QuickScreen}) \\
         %
+      }	  
+      \opt{RECORDER_PAD}{
         \ButtonFThree & Switches to the Display Quick Screen \\ 
         %
       }

manual/rockbox_interface/main.tex

@@ -354,11 +354,11 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
 
 \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,IPOD_4G_PAD,SANSA_E200_PAD%
 ,SANSA_C200_PAD,IAUDIO_X5_PAD,IAUDIO_M5_PAD,IPOD_3G_PAD}{%
-  In the unlikely event of a software failure, hardware poweroff/reset can be
+  In the unlikely event of a software failure, hardware poweroff or reset can be
   performed by holding down \opt{PLAYER_PAD}{\ButtonStop}\opt{RECORDER_PAD,ONDIO_PAD}
   {\ButtonOff}\opt{GIGABEAT_PAD}{the battery switch}\opt{IPOD_4G_PAD}
   {\ButtonMenu + \ButtonSelect}\opt{IPOD_3G_PAD}{\ButtonMenu + \ButtonPlay}
-  \opt{SANSA_E200_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD%,IAUDIO_M5_PAD}
+  \opt{SANSA_E200_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD,IAUDIO_M5_PAD}
   {\ButtonPower} until the \dap{} shuts off or reboots.
 }%
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_M3_PAD,IRIVER_H10_PAD,MROBE100_PAD}{%

manual/rockbox_interface/wps.tex

@@ -87,7 +87,8 @@ your WPS (While Playing Screen).
       \opt{ONDIO_PAD}{ via the \setting{WPS Context Menu}}.\\%
       %
       \nopt{PLAYER_PAD,ONDIO_PAD}{%
-        \ActionWpsQuickScreen & Enter \setting{Quick Screen}.\\}%
+        \ActionWpsQuickScreen & Switches to the \setting{Quick Screen}.
+		(see \reference{ref:QuickScreen}) \\}%
       %
       %These actions need definitions for the other targets
       \opt{RECORDER_PAD}{%