Index: manual/platform/keymap-h100_h300.tex =================================================================== --- manual/platform/keymap-h100_h300.tex (revision 20003) +++ manual/platform/keymap-h100_h300.tex (working copy) @@ -105,3 +105,5 @@ \newcommand{\ActionFMPrev}{\ButtonLeft} \newcommand{\ActionFMNext}{\ButtonRight} +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{\ButtonRec} \ No newline at end of file Index: manual/platform/keymap-ondio.tex =================================================================== --- manual/platform/keymap-ondio.tex (revision 20003) +++ manual/platform/keymap-ondio.tex (working copy) @@ -81,3 +81,6 @@ \newcommand{\ActionFMPrev}{\ButtonLeft} \newcommand{\ActionFMNext}{\ButtonRight} +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{Long \ButtonLeft} + Index: manual/platform/keymap-gigabeatf.tex =================================================================== --- manual/platform/keymap-gigabeatf.tex (revision 20003) +++ manual/platform/keymap-gigabeatf.tex (working copy) @@ -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 Index: manual/platform/keymap-ipod1g2g.tex =================================================================== --- manual/platform/keymap-ipod1g2g.tex (revision 20003) +++ manual/platform/keymap-ipod1g2g.tex (working copy) @@ -77,3 +77,6 @@ \newcommand{\ActionPsNudgeRight}{\ButtonRight} \newcommand{\ActionPsReset}{\ButtonMenu} \newcommand{\ActionPsExit}{\ButtonSelect} + +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{Long \ButtonMenu} Index: manual/platform/keymap-ipod4g.tex =================================================================== --- manual/platform/keymap-ipod4g.tex (revision 20003) +++ manual/platform/keymap-ipod4g.tex (working copy) @@ -88,3 +88,6 @@ \newcommand{\ActionRecSettingsDec}{\ButtonLeft} \newcommand{\ActionRecPrev}{\ButtonScrollBack} \newcommand{\ActionRecNext}{\ButtonScrollFwd} + +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{Long \ButtonMenu} Index: manual/platform/keymap-player.tex =================================================================== --- manual/platform/keymap-player.tex (revision 20003) +++ manual/platform/keymap-player.tex (working copy) @@ -44,3 +44,6 @@ %Button actions, Setting context \newcommand{\ActionSettingInc}{\ButtonRight} \newcommand{\ActionSettingDec}{\ButtonLeft} + +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay} Index: manual/platform/keymap-c200.tex =================================================================== --- manual/platform/keymap-c200.tex (revision 20003) +++ manual/platform/keymap-c200.tex (working copy) @@ -108,3 +108,6 @@ \newcommand{\ActionFMPrev}{\ButtonLeft} \newcommand{\ActionFMNext}{\ButtonRight} +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{\ButtonRec} + Index: manual/platform/keymap-recorder.tex =================================================================== --- manual/platform/keymap-recorder.tex (revision 20003) +++ manual/platform/keymap-recorder.tex (working copy) @@ -109,3 +109,4 @@ \newcommand{\ActionFMPrev}{\ButtonLeft} \newcommand{\ActionFMNext}{\ButtonRight} +\newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay} \ No newline at end of file Index: manual/platform/keymap-e200.tex =================================================================== --- manual/platform/keymap-e200.tex (revision 20003) +++ manual/platform/keymap-e200.tex (working copy) @@ -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} + Index: manual/platform/keymap-mx5.tex =================================================================== --- manual/platform/keymap-mx5.tex (revision 20003) +++ manual/platform/keymap-mx5.tex (working copy) @@ -91,3 +91,5 @@ \newcommand{\ActionFMPrev}{\ButtonLeft} \newcommand{\ActionFMNext}{\ButtonRight} +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{Long \ButtonRec} \ No newline at end of file Index: manual/platform/keymap-ipod3g.tex =================================================================== --- manual/platform/keymap-ipod3g.tex (revision 20003) +++ manual/platform/keymap-ipod3g.tex (working copy) @@ -77,3 +77,6 @@ \newcommand{\ActionPsNudgeRight}{\ButtonRight} \newcommand{\ActionPsReset}{\ButtonMenu} \newcommand{\ActionPsExit}{\ButtonSelect} + +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{Long \ButtonMenu} Index: manual/platform/keymap-h10.tex =================================================================== --- manual/platform/keymap-h10.tex (revision 20003) +++ manual/platform/keymap-h10.tex (working copy) @@ -108,3 +108,6 @@ \newcommand{\ActionRecPrev}{\ButtonRew} \newcommand{\ActionRecNext}{\ButtonFF} +%Button actions, Bookmark screen context +\newcommand{\ActionBmDelete}{Long \ButtonRew} + Index: manual/configure_rockbox/bookmarking.tex =================================================================== --- manual/configure_rockbox/bookmarking.tex (revision 20003) +++ manual/configure_rockbox/bookmarking.tex (working copy) @@ -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.] + \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:\\* - When viewing any bookmark list, pressing the standard - context menu key (\ActionStdContext) will bring up the Bookmark Actions 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} Index: manual/main_menu/main.tex =================================================================== --- manual/main_menu/main.tex (revision 20003) +++ manual/main_menu/main.tex (working copy) @@ -16,60 +16,64 @@ 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.\\ + \ActionStdNext + & Selects the next option 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.\\ + \ActionStdPrev + & Selects the previous option 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} + \ActionStdOk & Selects the 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} + \ActionStdCancel & Exits menu or setting, or moves to parent menu\\ \end{btnmap} \end{table} -} -\opt{PLAYER_PAD}{ - \begin{table} + +\section {Recent Bookmarks} +\screenshot{main_menu/images/ss-list-bookmarks}% + {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. + +\begin{table} \begin{btnmap}{}{} + \ActionStdNext + & Selects the next bookmark.\\ % - \ButtonLeft & Selects previous option in the menu.\\ - & Inside an setting, decreases the value or chooses previous option \\ + \ActionStdPrev + & Selects the previous bookmark.\\ % - \ButtonRight & Selects next option in the menu.\\ - & Inside an setting increases the value or chooses next option \\ + \ActionStdOk + & Resumes from the selected bookmark.\\ % - \ButtonPlay & Selects item \\ + \ActionStdCancel + & Exits Recent Bookmark menu\\ % - \ButtonStop & Exit menu, setting or moves to parent menu.\\ + \nopt{GIGABEATS_PAD}{\ActionBmDelete} + & Deletes the currently selected bookmark\\ + % + \ActionStdContext + & Enters the context menu for the selected bookmark.\\ \end{btnmap} - \end{table} -} +\end{table} -\section {Recent Bookmarks} -\screenshot{main_menu/images/ss-list-bookmarks}% - {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} +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}).