diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2024-07-12 08:27:27 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-07-12 08:52:24 -0400 |
commit | fec9f69ac81b1d288735ed1e0c429afe3cc5d849 (patch) | |
tree | 6c060fa645bba3fbe6ee9f97063a6e03fe0063b5 | |
parent | f8e602ecfdc2fb7f97cb7e90b9899076ef60b97f (diff) | |
download | rockbox-fec9f69ac81b1d288735ed1e0c429afe3cc5d849.tar.gz rockbox-fec9f69ac81b1d288735ed1e0c429afe3cc5d849.zip |
agptekrocker: Fix manual build due to missing Quickscreen enter/exit
(Required adding a std quickscreen context keymap!)
Change-Id: Icd6bd656d826ea3be73b025242d2405f489e3eeb
-rw-r--r-- | apps/keymaps/keymap-agptekrocker.c | 5 | ||||
-rw-r--r-- | manual/platform/keymap-agptekrocker.tex | 4 | ||||
-rw-r--r-- | 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[] = { | |||
39 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 39 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
40 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 40 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
41 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 41 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
42 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
42 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 43 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
43 | { ACTION_STD_MENU, BUTTON_POWER, BUTTON_NONE }, | 44 | { ACTION_STD_MENU, BUTTON_POWER, BUTTON_NONE }, |
44 | 45 | ||
45 | /* ACTION_STD_QUICKSCREEN, | 46 | /* ACTION_STD_KEYLOCK |
46 | * ACTION_STD_KEYLOCK | ||
47 | * ACTION_STD_REC | 47 | * ACTION_STD_REC |
48 | * ACTION_STD_HOTKEY | 48 | * ACTION_STD_HOTKEY |
49 | 49 | ||
50 | * { ACTION_STD_QUICKSCREEN, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
51 | */ | 50 | */ |
52 | 51 | ||
53 | LAST_ITEM_IN_LIST | 52 | 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 @@ | |||
19 | \newcommand{\ActionStdContext}{Long \ButtonSelect{}} | 19 | \newcommand{\ActionStdContext}{Long \ButtonSelect{}} |
20 | \newcommand{\ActionStdMenu}{\ButtonPower{}} | 20 | \newcommand{\ActionStdMenu}{\ButtonPower{}} |
21 | \newcommand{\ActionStdUsbCharge}{\ButtonSelect{}} | 21 | \newcommand{\ActionStdUsbCharge}{\ButtonSelect{}} |
22 | \newcommand{\ActionStdQuickScreen}{Long \ButtonLeft{}} | ||
22 | 23 | ||
23 | %Button actions, wps context | 24 | %Button actions, wps context |
24 | \newcommand{\ActionWpsStop}{Long \ButtonSelect} | 25 | \newcommand{\ActionWpsStop}{Long \ButtonSelect} |
@@ -35,6 +36,9 @@ | |||
35 | \newcommand{\ActionWpsQuickScreen}{Long \ButtonDown} | 36 | \newcommand{\ActionWpsQuickScreen}{Long \ButtonDown} |
36 | \newcommand{\ActionWpsHotkey}{\ButtonVolUp{} and \ButtonVolDown{}} | 37 | \newcommand{\ActionWpsHotkey}{\ButtonVolUp{} and \ButtonVolDown{}} |
37 | 38 | ||
39 | %Button actions, quickscreen context | ||
40 | \newcommand{\ActionQuickScreenExit}{Long \ButtonSelect{}} | ||
41 | |||
38 | %Button actions, tree context | 42 | %Button actions, tree context |
39 | \newcommand{\ActionTreeWps}{Long \ButtonLeft} | 43 | \newcommand{\ActionTreeWps}{Long \ButtonLeft} |
40 | \newcommand{\ActionTreeStop}{Long \ButtonSelect} | 44 | \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 @@ | |||
2 | \chapter{Browsing and playing} | 2 | \chapter{Browsing and playing} |
3 | \section{\label{ref:file_browser}File Browser} | 3 | \section{\label{ref:file_browser}File Browser} |
4 | \screenshot{rockbox_interface/images/ss-file-browser}{The file browser}{} | 4 | \screenshot{rockbox_interface/images/ss-file-browser}{The file browser}{} |
5 | Rockbox lets you browse your music in either of two ways. The | 5 | Rockbox lets you browse your music in either of two ways. The |
6 | \setting{File Browser} lets you navigate through the files and directories on | 6 | \setting{File Browser} lets you navigate through the files and directories on |
7 | your \dap, entering directories and executing the default action on each file. | 7 | your \dap, entering directories and executing the default action on each file. |
8 | To help differentiate files, each file format is displayed with an icon. | 8 | To help differentiate files, each file format is displayed with an icon. |
9 | 9 | ||
10 | The \setting{Database Browser}, on the other hand, allows you to navigate | 10 | The \setting{Database Browser}, on the other hand, allows you to navigate |
11 | through the music on your player using categories like album, artist, genre, | 11 | through the music on your player using categories like album, artist, genre, |
12 | etc. | 12 | etc. |
13 | 13 | ||
@@ -35,7 +35,7 @@ the \setting{Show Files} setting to all. | |||
35 | \begin{btnmap} | 35 | \begin{btnmap} |
36 | \ActionStdPrev{}/\ActionStdNext{} | 36 | \ActionStdPrev{}/\ActionStdNext{} |
37 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev{}/\ActionRCStdNext{}} | 37 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev{}/\ActionRCStdNext{}} |
38 | & Go to previous/next item in list. If you are on the first/last | 38 | & Go to previous/next item in list. If you are on the first/last |
39 | entry, the cursor will wrap to the last/first entry.\\ | 39 | entry, the cursor will wrap to the last/first entry.\\ |
40 | % | 40 | % |
41 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD} | 41 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD} |
@@ -61,14 +61,14 @@ the \setting{Show Files} setting to all. | |||
61 | & Execute the default action on the selected file or enter a | 61 | & Execute the default action on the selected file or enter a |
62 | directory.\\ | 62 | directory.\\ |
63 | % | 63 | % |
64 | \ActionTreeWps | 64 | \ActionTreeWps |
65 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeWps} | 65 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeWps} |
66 | & If there is an audio file playing, return to the | 66 | & If there is an audio file playing, return to the |
67 | \setting{While Playing Screen} (WPS) without stopping playback.\\ | 67 | \setting{While Playing Screen} (WPS) without stopping playback.\\ |
68 | % | 68 | % |
69 | \nopt{player,SANSA_C200_PAD,erosqnative}% | 69 | \nopt{player,SANSA_C200_PAD,erosqnative}% |
70 | {% | 70 | {% |
71 | \ActionTreeStop | 71 | \ActionTreeStop |
72 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop} | 72 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop} |
73 | & Stop audio playback.\\% | 73 | & Stop audio playback.\\% |
74 | }% | 74 | }% |
@@ -108,16 +108,16 @@ the \setting{Show Files} setting to all. | |||
108 | \subsection{\label{ref:Contextmenu}\label{ref:PartIISectionFM}Context Menu} | 108 | \subsection{\label{ref:Contextmenu}\label{ref:PartIISectionFM}Context Menu} |
109 | \screenshot{rockbox_interface/images/ss-context-menu}{The Context Menu}{} | 109 | \screenshot{rockbox_interface/images/ss-context-menu}{The Context Menu}{} |
110 | 110 | ||
111 | The \setting{Context Menu} allows you to perform certain operations on files or | 111 | The \setting{Context Menu} allows you to perform certain operations on files or |
112 | directories. To access the \setting{Context Menu}, position the selector over a file | 112 | directories. To access the \setting{Context Menu}, position the selector over a file |
113 | or directory and access the context menu with \ActionStdContext{}.\\ | 113 | or directory and access the context menu with \ActionStdContext{}.\\ |
114 | 114 | ||
115 | \note{The \setting{Context Menu} is a context sensitive menu. If the | 115 | \note{The \setting{Context Menu} is a context sensitive menu. If the |
116 | \setting{Context Menu} is invoked on a file, it will display options available | 116 | \setting{Context Menu} is invoked on a file, it will display options available |
117 | for files. If the \setting{Context Menu} is invoked on a directory, | 117 | for files. If the \setting{Context Menu} is invoked on a directory, |
118 | it will display options for directories.\\} | 118 | it will display options for directories.\\} |
119 | 119 | ||
120 | The \setting{Context Menu} contains the following options (unless otherwise noted, | 120 | The \setting{Context Menu} contains the following options (unless otherwise noted, |
121 | each option pertains both to files and directories): | 121 | each option pertains both to files and directories): |
122 | 122 | ||
123 | \begin{description} | 123 | \begin{description} |
@@ -126,7 +126,7 @@ each option pertains both to files and directories): | |||
126 | \item [Playing Next...] | 126 | \item [Playing Next...] |
127 | Enters the \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}). | 127 | Enters the \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}). |
128 | \item [Add to Playlist...] | 128 | \item [Add to Playlist...] |
129 | Enters the \setting{Add to Playlist Submenu} (see | 129 | Enters the \setting{Add to Playlist Submenu} (see |
130 | \reference{ref:addtoplaylist_submenu}). | 130 | \reference{ref:addtoplaylist_submenu}). |
131 | \item [Rename.] | 131 | \item [Rename.] |
132 | This function lets the user modify the name of a file or directory. | 132 | 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): | |||
202 | 202 | ||
203 | \subsection{\label{sec:virtual_keyboard}Virtual Keyboard} | 203 | \subsection{\label{sec:virtual_keyboard}Virtual Keyboard} |
204 | \screenshot{rockbox_interface/images/ss-virtual-keyboard}{The virtual keyboard}{} | 204 | \screenshot{rockbox_interface/images/ss-virtual-keyboard}{The virtual keyboard}{} |
205 | This is the virtual keyboard that is used when entering text in Rockbox, for | 205 | This is the virtual keyboard that is used when entering text in Rockbox, for |
206 | example when renaming a file or creating a new directory. | 206 | example when renaming a file or creating a new directory. |
207 | The virtual keyboard can be easily changed by making a text file | 207 | The virtual keyboard can be easily changed by making a text file |
208 | with the required layout. More information on how to achieve this can be found | 208 | 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}. | |||
298 | \ActionKbdMorseSelect | 298 | \ActionKbdMorseSelect |
299 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdMorseSelect} | 299 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCKbdMorseSelect} |
300 | & Tap to select a character in Morse code input mode. \\ | 300 | & Tap to select a character in Morse code input mode. \\ |
301 | } | 301 | } |
302 | \end{btnmap} | 302 | \end{btnmap} |
303 | 303 | ||
304 | \input{rockbox_interface/tagcache.tex} | 304 | \input{rockbox_interface/tagcache.tex} |