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
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index e678072..a964028 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -211,12 +211,12 @@
\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}).
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index 0a8d0d8..48cf8c9 100644
--- a/manual/platform/e200.tex
+++ b/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}
diff --git a/manual/platform/gigabeatf.tex b/manual/platform/gigabeatf.tex
index dcabbc9..7c7bfd7 100644
--- a/manual/platform/gigabeatf.tex
+++ b/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}
diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex
index a9ee8ba..79f918c 100644
--- a/manual/platform/h10.tex
+++ b/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}
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex
index ec52fa7..5baa7b2 100644
--- a/manual/platform/h10_5gb.tex
+++ b/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}
diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index 11b903e..7b7ed39 100644
--- a/manual/platform/h1xx.tex
+++ b/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}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index 42f57fe..44c143a 100644
--- a/manual/platform/h300.tex
+++ b/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}
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index d1c9f82..4676629 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/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}
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 451ca5d..38fa21e 100644
--- a/manual/platform/ipod3g.tex
+++ b/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}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index ae4049b..cae07d3 100644
--- a/manual/platform/ipod4g.tex
+++ b/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}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 315761f..832d2e1 100644
--- a/manual/platform/ipodcolor.tex
+++ b/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}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index 8b2ce45..9cfdf9e 100644
--- a/manual/platform/ipodmini.tex
+++ b/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}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index 27d327f..4c51c86 100644
--- a/manual/platform/ipodnano.tex
+++ b/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}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 34162d7..e925e8d 100644
--- a/manual/platform/ipodvideo.tex
+++ b/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}
diff --git a/manual/platform/m5.tex b/manual/platform/m5.tex
index ef45ee0..66b104f 100644
--- a/manual/platform/m5.tex
+++ b/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}
diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex
index 633fd08..4e47e84 100644
--- a/manual/platform/recorder.tex
+++ b/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}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 5d0d868..d0c9c3f 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/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}
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index 681aa7b..e537c88 100644
--- a/manual/platform/x5.tex
+++ b/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}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 9446905..4c2c1ed 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -80,9 +80,12 @@
\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 \\
%
}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index b60d1bf..c637268 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -354,11 +354,11 @@
\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}{%
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 847659e..1cd23fe 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -87,7 +87,8 @@
\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}{%