diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-09 02:02:51 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-09 02:02:51 +0000 |
commit | 1ad76ff25be3f86b9467fc6f4171dbf6895b419c (patch) | |
tree | e679a66806c1a89343a29324dd2a6bc860d4a86d /manual | |
parent | 8d3553489f1dd44b9dd3b7493489e9ec03f387be (diff) | |
download | rockbox-1ad76ff25be3f86b9467fc6f4171dbf6895b419c.tar.gz rockbox-1ad76ff25be3f86b9467fc6f4171dbf6895b419c.zip |
FS#11250: Hotkey setting method changed to menu item vs button pres in context menu. Manuals updated to match.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25905 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual')
-rw-r--r-- | manual/appendix/config_file_options.tex | 6 | ||||
-rwxr-xr-x | manual/configure_rockbox/hotkey_settings.tex | 13 | ||||
-rw-r--r-- | manual/rockbox_interface/browsing_and_playing.tex | 10 | ||||
-rw-r--r-- | manual/rockbox_interface/hotkeys.tex | 32 | ||||
-rw-r--r-- | manual/rockbox_interface/wps.tex | 12 | ||||
-rw-r--r-- | manual/working_with_playlists/main.tex | 1 |
6 files changed, 29 insertions, 45 deletions
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex index 2c5136d3b8..0dd2f83568 100644 --- a/manual/appendix/config_file_options.tex +++ b/manual/appendix/config_file_options.tex | |||
@@ -123,6 +123,12 @@ | |||
123 | talk filetype & off, on & N/A\\ | 123 | talk filetype & off, on & N/A\\ |
124 | talk menu & off, on & N/A\\ | 124 | talk menu & off, on & N/A\\ |
125 | Announce Battery Level & off, on & N/A\\ | 125 | Announce Battery Level & off, on & N/A\\ |
126 | \opt{hotkey}{ | ||
127 | hotkey wps & off, view playlist, show track info, | ||
128 | pitchscreen, open with, delete & N/A\\ | ||
129 | hotkey tree & off, open with, delete, insert | ||
130 | & N/A\\ | ||
131 | } | ||
126 | sort files & alpha, oldest, newest, type & N/A\\ | 132 | sort files & alpha, oldest, newest, type & N/A\\ |
127 | sort dirs & alpha, oldest, newest & N/A\\ | 133 | sort dirs & alpha, oldest, newest & N/A\\ |
128 | sort interpret number & digits, numbers & N/A\\ | 134 | sort interpret number & digits, numbers & N/A\\ |
diff --git a/manual/configure_rockbox/hotkey_settings.tex b/manual/configure_rockbox/hotkey_settings.tex index eac606716f..b38d72471d 100755 --- a/manual/configure_rockbox/hotkey_settings.tex +++ b/manual/configure_rockbox/hotkey_settings.tex | |||
@@ -3,14 +3,11 @@ | |||
3 | \section{\label{ref:HotkeySettings}Hotkey} | 3 | \section{\label{ref:HotkeySettings}Hotkey} |
4 | 4 | ||
5 | \begin{description} | 5 | \begin{description} |
6 | \item[View Hotkey Settings.] | 6 | \item[WPS Hotkey.] |
7 | This option brings up a screen listing the current assignment associated | 7 | \item[File Browser Hotkey.] |
8 | with each hotkey. | 8 | These options set the hotkey function for their respective screens |
9 | 9 | (see \reference{ref:Hotkeys}). The default for the WPS screen is | |
10 | \item[Reset Settings.] | 10 | \setting{View Playlist}. The File Browser default is \setting{Off}. |
11 | This option sets all hotkeys to their default assignments. The default | ||
12 | for the WPS screen is View Playlist. The File Browser hotkey has no | ||
13 | default assignment. | ||
14 | 11 | ||
15 | \end{description} | 12 | \end{description} |
16 | 13 | ||
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex index e7bbc5c585..c087036a6b 100644 --- a/manual/rockbox_interface/browsing_and_playing.tex +++ b/manual/rockbox_interface/browsing_and_playing.tex | |||
@@ -137,11 +137,6 @@ or directory and access the context menu with \ActionStdContext{}.\\ | |||
137 | for files. If the \setting{Context Menu} is invoked on a directory, | 137 | for files. If the \setting{Context Menu} is invoked on a directory, |
138 | it will display options for directories.\\} | 138 | it will display options for directories.\\} |
139 | 139 | ||
140 | \opt{hotkey}{ | ||
141 | Some of these options can be set to the \setting{Hotkey} (see \reference{ref:Hotkeys}) | ||
142 | for that context by pressing \ActionWpsHotkey.\\ | ||
143 | } | ||
144 | |||
145 | The \setting{Context Menu} contains the following options (unless otherwise noted, | 140 | The \setting{Context Menu} contains the following options (unless otherwise noted, |
146 | each option pertains both to files and directories): | 141 | each option pertains both to files and directories): |
147 | 142 | ||
@@ -167,11 +162,10 @@ each option pertains both to files and directories): | |||
167 | not to directories. Rockbox will ask for confirmation before deleting a file. | 162 | not to directories. Rockbox will ask for confirmation before deleting a file. |
168 | Press \ActionYesNoAccept{} | 163 | Press \ActionYesNoAccept{} |
169 | to confirm deletion or any other key to cancel. | 164 | to confirm deletion or any other key to cancel. |
170 | \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).} | ||
171 | \item [Delete Directory.] | 165 | \item [Delete Directory.] |
172 | Deletes the currently selected directory and all of the files and subdirectories | 166 | Deletes the currently selected directory and all of the files and subdirectories |
173 | it may contain. Deleted directories cannot be recovered. Use this feature with | 167 | it may contain. Deleted directories cannot be recovered. Use this feature with |
174 | caution! \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).} | 168 | caution! |
175 | \opt{lcd_non-mono}{ | 169 | \opt{lcd_non-mono}{ |
176 | \item [Set As Backdrop.] | 170 | \item [Set As Backdrop.] |
177 | Set the selected \fname{bmp} file as background image. The bitmaps need to meet the | 171 | Set the selected \fname{bmp} file as background image. The bitmaps need to meet the |
@@ -185,7 +179,7 @@ each option pertains both to files and directories): | |||
185 | For example, this function can be used to view a text file | 179 | For example, this function can be used to view a text file |
186 | even if the file has a non-standard extension (i.e., the file has an extension | 180 | even if the file has a non-standard extension (i.e., the file has an extension |
187 | of something other than \fname{.txt}). See \reference{ref:Viewersplugins} | 181 | of something other than \fname{.txt}). See \reference{ref:Viewersplugins} |
188 | for more details on viewers. \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).} | 182 | for more details on viewers. |
189 | \item [Create Directory.] | 183 | \item [Create Directory.] |
190 | Create a new directory in the current directory on the disk. | 184 | Create a new directory in the current directory on the disk. |
191 | \item [Properties.] | 185 | \item [Properties.] |
diff --git a/manual/rockbox_interface/hotkeys.tex b/manual/rockbox_interface/hotkeys.tex index b1d1f23f0d..56dafa9589 100644 --- a/manual/rockbox_interface/hotkeys.tex +++ b/manual/rockbox_interface/hotkeys.tex | |||
@@ -1,26 +1,18 @@ | |||
1 | % $Id$ % | 1 | % $Id$ % |
2 | \opt{hotkey}{ | 2 | \opt{hotkey}{ |
3 | \section{\label{ref:Hotkeys}Hotkeys} | 3 | \section{\label{ref:Hotkeys}Hotkeys} |
4 | Hotkeys are user-assignable shortcut keys to functions within the | 4 | Hotkeys are shortcut keys for use in the \setting{File Browser} |
5 | \setting{File Browser} and \setting{WPS} context menus. To use one, | 5 | and \setting{WPS} screens. To use one, press \ActionWpsHotkey{} |
6 | press \ActionWpsHotkey{} within the \setting{File Browser} or | 6 | within the \setting{File Browser} or \setting{WPS} screens. |
7 | \setting{WPS} screens. The assigned function will launch with | 7 | The assigned function will launch with reference to the current |
8 | reference to the current file or directory, if applicable. Each | 8 | file or directory, if applicable. Each screen has its own |
9 | screen has its own assignment. If there is no assignment for | 9 | assignment. If there is no assignment for a given screen, |
10 | a given screen, the message ``No Hotkey Set'' appears briefly. | 10 | the hotkey is ignored. |
11 | 11 | ||
12 | There is no default assignment for the File Browser hotkey, but the WPS | 12 | The default assignment for the File Browser hotkey is |
13 | hotkey defaults to ``View Playlist''. | 13 | \setting{Off}, but the WPS hotkey defaults to |
14 | \setting{View Playlist}. | ||
14 | 15 | ||
15 | To change the assignment of a hotkey, go into the associated | 16 | The hotkey assignments are changed in the Hotkey menu (see |
16 | context menu from the File Browser or WPS screen by pressing | 17 | \reference{ref:HotkeySettings}) under \setting{General Settings}. |
17 | \ActionWpsContext, then highlighting the function you wish to assign. | ||
18 | Press the hotkey (\ActionWpsHotkey) and if the function you've chosen | ||
19 | is assignable a confirmation dialog screen will appear. Press | ||
20 | \ActionYesNoAccept{} to confirm the assignment or anything else to reject | ||
21 | it. If accepted, you'll see a short message confirming your choice. | ||
22 | |||
23 | You can view the current assignments and reset to the default assignments | ||
24 | from the Hotkey menu under \setting{General Settings}. See | ||
25 | \reference{ref:HotkeySettings} for details. | ||
26 | } | 18 | } |
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex index 4f4e5cc626..824370b0ab 100644 --- a/manual/rockbox_interface/wps.tex +++ b/manual/rockbox_interface/wps.tex | |||
@@ -209,9 +209,7 @@ your WPS (While Playing Screen). | |||
209 | } | 209 | } |
210 | \subsection{\label{sec:contextmenu}The WPS Context Menu} | 210 | \subsection{\label{sec:contextmenu}The WPS Context Menu} |
211 | Like the context menu for the \setting{File Browser}, the \setting{WPS Context Menu} | 211 | Like the context menu for the \setting{File Browser}, the \setting{WPS Context Menu} |
212 | allows you quick access to some often used functions. \opt{hotkey}{ | 212 | allows you quick access to some often used functions. |
213 | Some of these options can be set to the \setting{Hotkey} (see \reference{ref:Hotkeys}) | ||
214 | for that context by pressing \ActionWpsHotkey.} | ||
215 | 213 | ||
216 | \subsubsection{Playlist} | 214 | \subsubsection{Playlist} |
217 | The \setting{Playlist} submenu allows you to view, save, search and | 215 | The \setting{Playlist} submenu allows you to view, save, search and |
@@ -268,8 +266,7 @@ This allows you to create a bookmark in the currently-playing track. | |||
268 | This screen is accessible from the WPS screen, and provides a detailed view of | 266 | This screen is accessible from the WPS screen, and provides a detailed view of |
269 | all the identity information about the current track. This info is known as | 267 | all the identity information about the current track. This info is known as |
270 | meta data and is stored in audio file formats to keep information on artist, | 268 | meta data and is stored in audio file formats to keep information on artist, |
271 | album etc. \opt{hotkey}{\setting{Hotkey}able from the \setting{WPS Context | 269 | album etc. To access this screen, % |
272 | Menu} (see \reference{ref:Hotkeys}).} To access this screen, % | ||
273 | \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,% | 270 | \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,% |
274 | SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{ | 271 | SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{ |
275 | press \ActionWpsIdThreeScreen. }% | 272 | press \ActionWpsIdThreeScreen. }% |
@@ -283,20 +280,19 @@ Menu} (see \reference{ref:Hotkeys}).} To access this screen, % | |||
283 | \subsubsection{Open With...} | 280 | \subsubsection{Open With...} |
284 | This \setting{Open With} function is the same as the \setting{Open With} | 281 | This \setting{Open With} function is the same as the \setting{Open With} |
285 | function in the file browser's \setting{Context Menu}. | 282 | function in the file browser's \setting{Context Menu}. |
286 | \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).} | ||
287 | 283 | ||
288 | \subsubsection{Delete} | 284 | \subsubsection{Delete} |
289 | Delete the currently playing file. The file will be deleted but the playback | 285 | Delete the currently playing file. The file will be deleted but the playback |
290 | of the file will not stop immediately. Instead, the part of the file that | 286 | of the file will not stop immediately. Instead, the part of the file that |
291 | has already been buffered (i.e. read into the \daps\ memory) will be played. | 287 | has already been buffered (i.e. read into the \daps\ memory) will be played. |
292 | This may even be the whole track. \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).} | 288 | This may even be the whole track. |
293 | 289 | ||
294 | \opt{pitchscreen}{ | 290 | \opt{pitchscreen}{ |
295 | \subsubsection{\label{sec:pitchscreen}Pitch} | 291 | \subsubsection{\label{sec:pitchscreen}Pitch} |
296 | 292 | ||
297 | The \setting{Pitch Screen} allows you to change the rate of playback | 293 | The \setting{Pitch Screen} allows you to change the rate of playback |
298 | (i.e. the playback speed and at the same time the pitch) of your | 294 | (i.e. the playback speed and at the same time the pitch) of your |
299 | \dap. \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).} The rate value can be adjusted | 295 | \dap. The rate value can be adjusted |
300 | between 50\% and 200\%. 50\% means half the normal playback speed and a | 296 | between 50\% and 200\%. 50\% means half the normal playback speed and a |
301 | pitch that is an octave lower than the normal pitch. 200\% means double | 297 | pitch that is an octave lower than the normal pitch. 200\% means double |
302 | playback speed and a pitch that is an octave higher than the normal pitch. | 298 | playback speed and a pitch that is an octave higher than the normal pitch. |
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex index a45eb47b96..311aa86071 100644 --- a/manual/working_with_playlists/main.tex +++ b/manual/working_with_playlists/main.tex | |||
@@ -93,7 +93,6 @@ options: | |||
93 | \setting{Insert}, new tracks will be added immediately after the current | 93 | \setting{Insert}, new tracks will be added immediately after the current |
94 | playing track. If playback is stopped a new dynamic playlist will get | 94 | playing track. If playback is stopped a new dynamic playlist will get |
95 | created with the selected tracks. | 95 | created with the selected tracks. |
96 | \opt{hotkey}{\setting{Hotkey}able (see \reference{ref:Hotkeys}).} | ||
97 | 96 | ||
98 | \item [Insert Next.] Add track(s) immediately after current playing | 97 | \item [Insert Next.] Add track(s) immediately after current playing |
99 | track, no matter what else has been inserted. | 98 | track, no matter what else has been inserted. |