From a4858cfa1c0f3c271ebc301b75769fdac74d3a20 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Sun, 10 Sep 2006 10:56:46 +0000 Subject: Correct key for accepting delete git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10916 a1c6a512-1295-4272-9138-f99709370657 --- manual/platform/h10.tex | 2 ++ manual/platform/h10_5gb.tex | 2 ++ manual/platform/h1xx.tex | 3 +++ manual/platform/h300.tex | 5 ++++- manual/platform/ipod3g.tex | 2 ++ manual/platform/ipod4g.tex | 2 ++ manual/platform/ipodcolor.tex | 5 ++++- manual/platform/ipodmini.tex | 3 +++ manual/platform/ipodnano.tex | 5 ++++- manual/platform/ipodvideo.tex | 5 ++++- manual/platform/ondiofm.tex | 3 +++ manual/platform/ondiosp.tex | 3 +++ manual/platform/player.tex | 3 +++ manual/platform/recorder.tex | 3 +++ manual/platform/recorderv2fm.tex | 3 +++ manual/platform/x5.tex | 3 ++- manual/rockbox_interface/playback.tex | 16 +++++++++------- 17 files changed, 56 insertions(+), 12 deletions(-) (limited to 'manual') diff --git a/manual/platform/h10.tex b/manual/platform/h10.tex index 3cc53bb75a..08e954d773 100644 --- a/manual/platform/h10.tex +++ b/manual/platform/h10.tex @@ -58,3 +58,5 @@ \newcommand{\ActionWpsPitchScreen}{\ButtonPlay+\ButtonLeft} \newcommand{\ActionWpsIdThreeScreen}{\ButtonPlay+\ButtonRight} +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonRight} diff --git a/manual/platform/h10_5gb.tex b/manual/platform/h10_5gb.tex index 347ae978be..dad0ca1f70 100644 --- a/manual/platform/h10_5gb.tex +++ b/manual/platform/h10_5gb.tex @@ -58,3 +58,5 @@ \newcommand{\ActionWpsPitchScreen}{\ButtonPlay+\ButtonLeft} \newcommand{\ActionWpsIdThreeScreen}{\ButtonPlay+\ButtonRight} +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonRight} diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex index e8fd08588e..c25ac063e9 100644 --- a/manual/platform/h1xx.tex +++ b/manual/platform/h1xx.tex @@ -59,3 +59,6 @@ \newcommand{\ActionWpsBrowse}{\ButtonSelect} \newcommand{\ActionWpsAbReset}{\ButtonOn{} + \ButtonSelect} \newcommand{\ActionWpsIdThreeScreen}{\ButtonOn{} + \ButtonMode} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonSelect} diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex index eecbdcb839..eade9d8f76 100644 --- a/manual/platform/h300.tex +++ b/manual/platform/h300.tex @@ -60,4 +60,7 @@ \newcommand{\ActionWpsContext}{Long \ButtonSelect} \newcommand{\ActionWpsBrowse}{\ButtonSelect} \newcommand{\ActionWpsAbReset}{\ButtonOn{} + \ButtonSelect} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonOn{} + \ButtonMode} \ No newline at end of file +\newcommand{\ActionWpsIdThreeScreen}{\ButtonOn{} + \ButtonMode} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonSelect} diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex index 980d9c5e6c..836ac697cc 100644 --- a/manual/platform/ipod3g.tex +++ b/manual/platform/ipod3g.tex @@ -53,3 +53,5 @@ \newcommand{\ActionWpsContext}{Long \ButtonSelect} \newcommand{\ActionWpsBrowse}{\ButtonSelect} +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex index 4cdf5b97bc..69309f623d 100644 --- a/manual/platform/ipod4g.tex +++ b/manual/platform/ipod4g.tex @@ -53,3 +53,5 @@ \newcommand{\ActionWpsContext}{Long \ButtonSelect} \newcommand{\ActionWpsBrowse}{\ButtonSelect} +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex index 32df2a3c22..100e2b7d61 100644 --- a/manual/platform/ipodcolor.tex +++ b/manual/platform/ipodcolor.tex @@ -52,4 +52,7 @@ \newcommand{\ActionWpsQuickScreen}{Long \ButtonMenu} \newcommand{\ActionWpsMenu}{\ButtonMenu} \newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} \ No newline at end of file +\newcommand{\ActionWpsBrowse}{\ButtonSelect} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex index de4d51c460..b28ef3a70d 100644 --- a/manual/platform/ipodmini.tex +++ b/manual/platform/ipodmini.tex @@ -52,3 +52,6 @@ \newcommand{\ActionWpsMenu}{\ButtonMenu} \newcommand{\ActionWpsContext}{Long \ButtonSelect} \newcommand{\ActionWpsBrowse}{\ButtonSelect} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex index 3228fe14a6..f0111bcaa3 100644 --- a/manual/platform/ipodnano.tex +++ b/manual/platform/ipodnano.tex @@ -52,4 +52,7 @@ \newcommand{\ActionWpsQuickScreen}{Long \ButtonMenu} \newcommand{\ActionWpsMenu}{\ButtonMenu} \newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} \ No newline at end of file +\newcommand{\ActionWpsBrowse}{\ButtonSelect} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex index e5609983b8..3d9a4f9c6b 100644 --- a/manual/platform/ipodvideo.tex +++ b/manual/platform/ipodvideo.tex @@ -52,4 +52,7 @@ \newcommand{\ActionWpsQuickScreen}{Long \ButtonMenu} \newcommand{\ActionWpsMenu}{\ButtonMenu} \newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} \ No newline at end of file +\newcommand{\ActionWpsBrowse}{\ButtonSelect} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex index b9312fda29..3db49d8331 100644 --- a/manual/platform/ondiofm.tex +++ b/manual/platform/ondiofm.tex @@ -50,3 +50,6 @@ \newcommand{\ActionWpsVolUp}{\ButtonUp} \newcommand{\ActionWpsContext}{Long \ButtonMenu} \newcommand{\ActionWpsBrowse}{\ButtonMenu} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonRight} diff --git a/manual/platform/ondiosp.tex b/manual/platform/ondiosp.tex index 93158734aa..0dd3d23ff4 100644 --- a/manual/platform/ondiosp.tex +++ b/manual/platform/ondiosp.tex @@ -47,3 +47,6 @@ \newcommand{\ActionWpsVolUp}{\ButtonUp} \newcommand{\ActionWpsContext}{Long \ButtonMenu} \newcommand{\ActionWpsBrowse}{\ButtonMenu} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonRight} diff --git a/manual/platform/player.tex b/manual/platform/player.tex index 1e8b14cafa..0149735294 100644 --- a/manual/platform/player.tex +++ b/manual/platform/player.tex @@ -48,3 +48,6 @@ \newcommand{\ActionWpsContext}{Long \ButtonPlay} \newcommand{\ActionWpsBrowse}{\ButtonOn} \newcommand{\ActionWpsIdThreeScreen}{\ButtonMenu{} + \ButtonOn} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex index 16ca8c3a2a..f9587718d0 100644 --- a/manual/platform/recorder.tex +++ b/manual/platform/recorder.tex @@ -57,3 +57,6 @@ \newcommand{\ActionWpsContext}{Long \ButtonPlay} \newcommand{\ActionWpsBrowse}{\ButtonOn} \newcommand{\ActionWpsIdThreeScreen}{\ButtonFOne{} + \ButtonOn} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex index 03186f8259..4dc71abbcd 100644 --- a/manual/platform/recorderv2fm.tex +++ b/manual/platform/recorderv2fm.tex @@ -57,3 +57,6 @@ \newcommand{\ActionWpsContext}{Long \ButtonPlay} \newcommand{\ActionWpsBrowse}{\ButtonOn} \newcommand{\ActionWpsIdThreeScreen}{\ButtonFOne{} + \ButtonOn} + +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonPlay} diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex index 178540d2d7..42f9d17229 100644 --- a/manual/platform/x5.tex +++ b/manual/platform/x5.tex @@ -57,4 +57,5 @@ \newcommand{\ActionWpsContext}{Long \ButtonSelect} \newcommand{\ActionWpsBrowse}{\ButtonSelect} - +%Button actions, YesNo context +\newcommand{\ActionYesNoAccept}{\ButtonSelect} diff --git a/manual/rockbox_interface/playback.tex b/manual/rockbox_interface/playback.tex index c773e28a23..de4962c02c 100644 --- a/manual/rockbox_interface/playback.tex +++ b/manual/rockbox_interface/playback.tex @@ -18,9 +18,10 @@ lets you select what types of files you wish to view. See \reference{ref:ShowFiles} for more information on the \setting{Show Files} setting. -\note{The \setting{File Browser} allows you to manipulate your files in ways -that are not available within the \setting{Tag Cache Browser}. Read more about -\setting{Tag Cache} in \reference{ref:tagcache}. The remainder of this section deals with the \setting{File Browser}.} +\note{The \setting{File Browser} allows you to manipulate your files in ways +that are not available within the \setting{Tag Cache Browser}. Read more about +\setting{Tag Cache} in \reference{ref:tagcache}. The remainder of this section +deals with the \setting{File Browser}.} \opt{ondio}{ Unlike the Archos Firmware, Rockbox provides multivolume support for the @@ -28,7 +29,8 @@ MultiMediaCard, this means the \dap{} can access both data volumes (internal memory and the MMC), thus being able to for instance, build playlists with files from both volumes. In File Browser mode a new folder will appear as soon as the device has read -the content after inserting the card. This new folders name is generated as \fname{}, and will behave exactly as any other folder on the \dap{}. +the content after inserting the card. This new folders name is generated as +\fname{}, and will behave exactly as any other folder on the \dap{}. } \subsection{\label{ref:controls}File Browser Controls} @@ -108,9 +110,9 @@ each option pertains both to files and directories): Only visible if a file or directory name is on the clipboard. When selected it will move or copy the clipboard to the current directory. \item [Delete.] - Deletes the currently selected file. This option applies only to files, and - not to directories. Rockbox will ask for confirmation before deleting a file. - Press \ActionStdOk{} + Deletes the currently selected file. This option applies only to files, and + not to directories. Rockbox will ask for confirmation before deleting a file. + Press \ActionYesNoAccept{} to confirm deletion or any other key to cancel. \item [Delete Directory.] Deletes the currently selected directory and all of the files and folders -- cgit