From fec9f69ac81b1d288735ed1e0c429afe3cc5d849 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 12 Jul 2024 08:27:27 -0400 Subject: agptekrocker: Fix manual build due to missing Quickscreen enter/exit (Required adding a std quickscreen context keymap!) Change-Id: Icd6bd656d826ea3be73b025242d2405f489e3eeb --- apps/keymaps/keymap-agptekrocker.c | 5 ++-- manual/platform/keymap-agptekrocker.tex | 4 +++ manual/rockbox_interface/browsing_and_playing.tex | 32 +++++++++++------------ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c index 5ca834ab51..018d9dcd61 100644 --- a/apps/keymaps/keymap-agptekrocker.c +++ b/apps/keymaps/keymap-agptekrocker.c @@ -39,15 +39,14 @@ static const struct button_mapping button_context_standard[] = { { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, + { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_STD_MENU, BUTTON_POWER, BUTTON_NONE }, -/* ACTION_STD_QUICKSCREEN, - * ACTION_STD_KEYLOCK +/* ACTION_STD_KEYLOCK * ACTION_STD_REC * ACTION_STD_HOTKEY - * { ACTION_STD_QUICKSCREEN, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, */ LAST_ITEM_IN_LIST diff --git a/manual/platform/keymap-agptekrocker.tex b/manual/platform/keymap-agptekrocker.tex index 949ee73e69..295f32147c 100644 --- a/manual/platform/keymap-agptekrocker.tex +++ b/manual/platform/keymap-agptekrocker.tex @@ -19,6 +19,7 @@ \newcommand{\ActionStdContext}{Long \ButtonSelect{}} \newcommand{\ActionStdMenu}{\ButtonPower{}} \newcommand{\ActionStdUsbCharge}{\ButtonSelect{}} +\newcommand{\ActionStdQuickScreen}{Long \ButtonLeft{}} %Button actions, wps context \newcommand{\ActionWpsStop}{Long \ButtonSelect} @@ -35,6 +36,9 @@ \newcommand{\ActionWpsQuickScreen}{Long \ButtonDown} \newcommand{\ActionWpsHotkey}{\ButtonVolUp{} and \ButtonVolDown{}} +%Button actions, quickscreen context +\newcommand{\ActionQuickScreenExit}{Long \ButtonSelect{}} + %Button actions, tree context \newcommand{\ActionTreeWps}{Long \ButtonLeft} \newcommand{\ActionTreeStop}{Long \ButtonSelect} diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex index baf377634c..4f1bee6bce 100644 --- a/manual/rockbox_interface/browsing_and_playing.tex +++ b/manual/rockbox_interface/browsing_and_playing.tex @@ -2,12 +2,12 @@ \chapter{Browsing and playing} \section{\label{ref:file_browser}File Browser} \screenshot{rockbox_interface/images/ss-file-browser}{The file browser}{} -Rockbox lets you browse your music in either of two ways. The -\setting{File Browser} lets you navigate through the files and directories on +Rockbox lets you browse your music in either of two ways. The +\setting{File Browser} lets you navigate through the files and directories on your \dap, entering directories and executing the default action on each file. -To help differentiate files, each file format is displayed with an icon. +To help differentiate files, each file format is displayed with an icon. -The \setting{Database Browser}, on the other hand, allows you to navigate +The \setting{Database Browser}, on the other hand, allows you to navigate through the music on your player using categories like album, artist, genre, etc. @@ -35,7 +35,7 @@ the \setting{Show Files} setting to all. \begin{btnmap} \ActionStdPrev{}/\ActionStdNext{} \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev{}/\ActionRCStdNext{}} - & Go to previous/next item in list. If you are on the first/last + & Go to previous/next item in list. If you are on the first/last entry, the cursor will wrap to the last/first entry.\\ % \opt{IRIVER_H100_PAD,IRIVER_H300_PAD} @@ -61,14 +61,14 @@ the \setting{Show Files} setting to all. & Execute the default action on the selected file or enter a directory.\\ % - \ActionTreeWps + \ActionTreeWps \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeWps} & If there is an audio file playing, return to the \setting{While Playing Screen} (WPS) without stopping playback.\\ % \nopt{player,SANSA_C200_PAD,erosqnative}% {% - \ActionTreeStop + \ActionTreeStop \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop} & Stop audio playback.\\% }% @@ -108,16 +108,16 @@ the \setting{Show Files} setting to all. \subsection{\label{ref:Contextmenu}\label{ref:PartIISectionFM}Context Menu} \screenshot{rockbox_interface/images/ss-context-menu}{The Context Menu}{} -The \setting{Context Menu} allows you to perform certain operations on files or -directories. To access the \setting{Context Menu}, position the selector over a file +The \setting{Context Menu} allows you to perform certain operations on files or +directories. To access the \setting{Context Menu}, position the selector over a file or directory and access the context menu with \ActionStdContext{}.\\ -\note{The \setting{Context Menu} is a context sensitive menu. If the -\setting{Context Menu} is invoked on a file, it will display options available -for files. If the \setting{Context Menu} is invoked on a directory, +\note{The \setting{Context Menu} is a context sensitive menu. If the +\setting{Context Menu} is invoked on a file, it will display options available +for files. If the \setting{Context Menu} is invoked on a directory, it will display options for directories.\\} -The \setting{Context Menu} contains the following options (unless otherwise noted, +The \setting{Context Menu} contains the following options (unless otherwise noted, each option pertains both to files and directories): \begin{description} @@ -126,7 +126,7 @@ each option pertains both to files and directories): \item [Playing Next...] Enters the \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}). \item [Add to Playlist...] - Enters the \setting{Add to Playlist Submenu} (see + Enters the \setting{Add to Playlist Submenu} (see \reference{ref:addtoplaylist_submenu}). \item [Rename.] This function lets the user modify the name of a file or directory. @@ -202,7 +202,7 @@ each option pertains both to files and directories): \subsection{\label{sec:virtual_keyboard}Virtual Keyboard} \screenshot{rockbox_interface/images/ss-virtual-keyboard}{The virtual keyboard}{} -This is the virtual keyboard that is used when entering text in Rockbox, for +This is the virtual keyboard that is used when entering text in Rockbox, for example when renaming a file or creating a new directory. The virtual keyboard can be easily changed by making a text file with the required layout. More information on how to achieve this can be found @@ -298,7 +298,7 @@ on the Rockbox website at \wikilink{LoadableKeyboardLayouts}. \ActionKbdMorseSelect \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdMorseSelect} & Tap to select a character in Morse code input mode. \\ - } + } \end{btnmap} \input{rockbox_interface/tagcache.tex} -- cgit v1.2.3