Accept FS#9908 by Alex Parker 'Add missing keys to main menu and bookmarking'

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

14 files changed, 116 insertions, 59 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index 002e6c3ccd..158ade2f4a 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -59,12 +59,33 @@
   but in addition all older entries for the current (dynamic) playlist will 
   be removed from the MRB whenever a new entry is added.
   
-  \item [Bookmark Actions context menu.]
-  
-  When viewing any bookmark list, pressing the standard 
-  context menu key (\ActionStdContext) will bring up the Bookmark Actions context menu.
+  \item [Bookmark list keys.]  The following keys can be used to navigate in
+  any bookmark list.\\
+\begin{table}
+    \begin{btnmap}{}{}
+      \ActionStdNext
+      & Selects the next bookmark.\\
+      %
+      \ActionStdPrev
+      & Selects the previous bookmark.\\
+      %
+      \ActionStdOk
+      & Resumes from the selected bookmark.\\
+      %
+      \ActionStdCancel
+      & Exits Recent Bookmark menu\\
+      %
+      \nopt{GIGABEATS_PAD}{\ActionBmDelete}  
+      & Deletes the currently selected bookmark\\
+      %
+      \ActionStdContext  
+      & Enters the context menu for the selected bookmark.\\
+    \end{btnmap}
+\end{table}
+
+There are two options in the context menu:\\*
   
-  \setting{Resume} will commence playback of the currently-selected bookmark entry.
+  \setting{Resume} will commence playback of the currently selected bookmark entry.
   
-  \setting{Delete} will remove just the currently-selected bookmark entry from the list.
-  \end{description}
+  \setting{Delete} will remove the currently selected bookmark entry from the list.
+\end{description}
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 83414db2b7..f526193f1a 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -16,60 +16,64 @@ Changes to settings may therefore not be saved unless the \dap{} is shut down
 safely (see \reference{ref:Safeshutdown}).
 
 \section{Navigating the Main Menu}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}{
-  \begin{table}
-    \begin{btnmap}{}{}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollFwd}
-      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
-      \opt{IRIVER_H10_PAD}{\ButtonScrollUp} 
-      & Moves up in the menu.\\
-      & Inside a setting, increases the value or
-        chooses next option \\
-      %
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollBack}
-      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown}
-      \opt{IRIVER_H10_PAD}{\ButtonScrollDown} 
-      & Moves down in the menu.\\
-      & Inside a setting, decreases the value or
-        chooses previous option \\
-      %
-      \opt{RECORDER_PAD}{\ButtonPlay/\ButtonRight}
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect/\ButtonRight}
-      \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,IRIVER_H10_PAD}{\ButtonRight} 
-      & Selects option \\
-      %
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff/\ButtonLeft}
-      \opt{IAUDIO_X5_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,IRIVER_H10_PAD}{\ButtonLeft} 
-      & Exits menu, setting or moves to parent menu\\
-    \end{btnmap}
-  \end{table}
-}
-\opt{PLAYER_PAD}{
-  \begin{table}
-    \begin{btnmap}{}{}
-      %
-      \ButtonLeft  & Selects previous option in the menu.\\
-                   & Inside an setting, decreases the value or chooses previous option \\
-      %
-      \ButtonRight & Selects next option in the menu.\\
-                   & Inside an setting increases the value or chooses next option \\
-      %
-      \ButtonPlay  & Selects item \\
-      %
-      \ButtonStop  & Exit menu, setting or moves to parent menu.\\
-    \end{btnmap}
-  \end{table}
-}
+\begin{table}
+  \begin{btnmap}{}{}
+    \ActionStdNext
+    & Selects the next option in the menu.\\
+    & Inside a setting, increases the value or
+      chooses next option \\
+    %
+    \ActionStdPrev
+    & Selects the previous option in the menu.\\
+    & Inside a setting, decreases the value or
+      chooses previous option \\
+    %
+    \ActionStdOk
+    & Selects option \\
+    %
+    \ActionStdCancel
+    & Exits menu, setting or moves to parent menu\\
+  \end{btnmap}
+\end{table}
 
 \section {Recent Bookmarks}
 \screenshot{main_menu/images/ss-list-bookmarks}%
-  {The list bookmarks screen}{}
+{The list bookmarks screen}{}
 If the \setting{Save a list of recently created bookmarks} option is enabled 
 then you can view a list of several recent bookmarks here and select one to 
-jump straight to that track. See \reference{ref:Bookmarkconfigactual} 
+jump straight to that track.
+
+\begin{table}
+  \begin{btnmap}{}{}
+    \ActionStdNext
+    & Selects the next bookmark.\\
+    %
+    \ActionStdPrev
+    & Selects the previous bookmark.\\
+    %
+    \ActionStdOk
+    & Resumes from the selected bookmark.\\
+    %
+    \ActionStdCancel
+    & Exits Recent Bookmark menu\\
+    %
+    \nopt{GIGABEATS_PAD}{\ActionBmDelete}  
+    & Deletes the currently selected bookmark\\
+    %
+    \ActionStdContext  
+    & Enters the context menu for the selected bookmark.\\
+  \end{btnmap}
+\end{table}
+
+There are two options in the context menu:\\*
+  
+  \setting{Resume} will commence playback of the currently selected bookmark entry.
+  
+  \setting{Delete} will remove the currently selected bookmark entry from the list.\\*
+  
+This entry is not shown in the \setting{Main Menu} when the option is off
+(the default setting).  See \reference{ref:Bookmarkconfigactual} 
 for more details on configuring bookmarking in Rockbox.
-\note{This entry is not shown in the \setting{Main Menu} when the option is off
-  and the option is off by default.}
 
 \section{Files}
 Browse the files on your \dap{} (see \reference{ref:file_browser}).
diff --git a/manual/platform/keymap-c200.tex b/manual/platform/keymap-c200.tex
index 4039228f4c..84bc06b985 100644
--- a/manual/platform/keymap-c200.tex
+++ b/manual/platform/keymap-c200.tex
@@ -108,3 +108,6 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{\ButtonRec}
+
diff --git a/manual/platform/keymap-e200.tex b/manual/platform/keymap-e200.tex
index 3f562954c5..ab1182c091 100644
--- a/manual/platform/keymap-e200.tex
+++ b/manual/platform/keymap-e200.tex
@@ -16,7 +16,7 @@
 \newcommand{\ActionStdPrevRepeat}{Long \ButtonScrollBack}
 \newcommand{\ActionStdNext}{\ButtonScrollFwd}
 \newcommand{\ActionStdNextRepeat}{Long \ButtonScrollFwd}
-\newcommand{\ActionStdCancel}{\ButtonLeft}
+\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonDown}
 \newcommand{\ActionQuickScreenExit}{\ButtonPower}
@@ -57,8 +57,8 @@
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
 
 %Button actions, Setting context
-\newcommand{\ActionSettingInc}{\ButtonScrollBack}
-\newcommand{\ActionSettingDec}{\ButtonScrollFwd}
+\newcommand{\ActionSettingInc}{\ButtonScrollFwd}
+\newcommand{\ActionSettingDec}{\ButtonScrollBack}
 
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
@@ -106,3 +106,6 @@
 \newcommand{\ActionFMPrev}{\ActionRecSettingsInc}
 \newcommand{\ActionFMNext}{\ActionRecSettingsDec}
 
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{\ButtonRec}
+
diff --git a/manual/platform/keymap-gigabeatf.tex b/manual/platform/keymap-gigabeatf.tex
index e74b53576e..39d51b0dd5 100644
--- a/manual/platform/keymap-gigabeatf.tex
+++ b/manual/platform/keymap-gigabeatf.tex
@@ -82,3 +82,6 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonA}
 \newcommand{\ActionPsExit}{\ButtonPower}
+
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{\ButtonA}
\ No newline at end of file
diff --git a/manual/platform/keymap-h10.tex b/manual/platform/keymap-h10.tex
index 20b93a7da1..364504fcd7 100644
--- a/manual/platform/keymap-h10.tex
+++ b/manual/platform/keymap-h10.tex
@@ -108,3 +108,6 @@
 \newcommand{\ActionRecPrev}{\ButtonRew}
 \newcommand{\ActionRecNext}{\ButtonFF}
 
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{Long \ButtonRew}
+
diff --git a/manual/platform/keymap-h100_h300.tex b/manual/platform/keymap-h100_h300.tex
index 925d2fb20a..419dc0bfcf 100644
--- a/manual/platform/keymap-h100_h300.tex
+++ b/manual/platform/keymap-h100_h300.tex
@@ -105,3 +105,5 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{\ButtonRec}
\ No newline at end of file
diff --git a/manual/platform/keymap-ipod1g2g.tex b/manual/platform/keymap-ipod1g2g.tex
index 4656391bde..f3bf5d6785 100644
--- a/manual/platform/keymap-ipod1g2g.tex
+++ b/manual/platform/keymap-ipod1g2g.tex
@@ -77,3 +77,6 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonMenu}
 \newcommand{\ActionPsExit}{\ButtonSelect}
+
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{Long \ButtonMenu}
diff --git a/manual/platform/keymap-ipod3g.tex b/manual/platform/keymap-ipod3g.tex
index 4656391bde..f3bf5d6785 100644
--- a/manual/platform/keymap-ipod3g.tex
+++ b/manual/platform/keymap-ipod3g.tex
@@ -77,3 +77,6 @@
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonMenu}
 \newcommand{\ActionPsExit}{\ButtonSelect}
+
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{Long \ButtonMenu}
diff --git a/manual/platform/keymap-ipod4g.tex b/manual/platform/keymap-ipod4g.tex
index 7ec3f97771..281d16682a 100644
--- a/manual/platform/keymap-ipod4g.tex
+++ b/manual/platform/keymap-ipod4g.tex
@@ -88,3 +88,6 @@
 \newcommand{\ActionRecSettingsDec}{\ButtonLeft}
 \newcommand{\ActionRecPrev}{\ButtonScrollBack}
 \newcommand{\ActionRecNext}{\ButtonScrollFwd}
+
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{Long \ButtonMenu}
diff --git a/manual/platform/keymap-mx5.tex b/manual/platform/keymap-mx5.tex
index 50d2ace0ad..aea09f4496 100644
--- a/manual/platform/keymap-mx5.tex
+++ b/manual/platform/keymap-mx5.tex
@@ -90,4 +90,6 @@
 \newcommand{\ActionFMSettingsDec}{\ActionSettingDec}

 \newcommand{\ActionFMPrev}{\ButtonLeft}

 \newcommand{\ActionFMNext}{\ButtonRight}

-

+
%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{Long \ButtonRec}
+
diff --git a/manual/platform/keymap-ondio.tex b/manual/platform/keymap-ondio.tex
index d2114ec6d4..dd0cf25061 100644
--- a/manual/platform/keymap-ondio.tex
+++ b/manual/platform/keymap-ondio.tex
@@ -81,3 +81,6 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{Long \ButtonLeft}
+
diff --git a/manual/platform/keymap-player.tex b/manual/platform/keymap-player.tex
index efd9da4002..651239b4d9 100644
--- a/manual/platform/keymap-player.tex
+++ b/manual/platform/keymap-player.tex
@@ -44,3 +44,6 @@
 %Button actions, Setting context
 \newcommand{\ActionSettingInc}{\ButtonRight}
 \newcommand{\ActionSettingDec}{\ButtonLeft}
+
+%Button actions, Bookmark screen context
+\newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay}
diff --git a/manual/platform/keymap-recorder.tex b/manual/platform/keymap-recorder.tex
index 0862c65aa3..ac194a4422 100644
--- a/manual/platform/keymap-recorder.tex
+++ b/manual/platform/keymap-recorder.tex
@@ -109,3 +109,4 @@
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
 
+\newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay}
\ No newline at end of file