len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add WPS hotkey for the D2, and make the tree hotkey only valid for non-touchscreen targets. This will have to be revisited if we gain touchscreen targets with tree hotkey capabilities.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26848 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Alex Parker 2010-06-14 20:15:56 +00:00
parent cf985f0381
commit 7a72a291cb
5 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
manual/appendix/config_file_options.tex
View file

@ -126,8 +126,8 @@
\opt{hotkey}{ \opt{hotkey}{
hotkey wps & off, view playlist, show track info, hotkey wps & off, view playlist, show track info,
pitchscreen, open with, delete & N/A\\ pitchscreen, open with, delete & N/A\\
hotkey tree & off, open with, delete, insert, \nopt{touchscreen}{hotkey tree & off, open with, delete, insert,
insert shuffled & N/A\\ insert shuffled & N/A\\}
} }
sort files & alpha, oldest, newest, type & N/A\\ sort files & alpha, oldest, newest, type & N/A\\
sort dirs & alpha, oldest, newest & N/A\\ sort dirs & alpha, oldest, newest & N/A\\

15
manual/configure_rockbox/hotkey_settings.tex
View file

@ -3,12 +3,13 @@
\section{\label{ref:HotkeySettings}Hotkey} \section{\label{ref:HotkeySettings}Hotkey}
\begin{description} \begin{description}
\item[WPS Hotkey.] \item[WPS Hotkey.] \opt{touchscreen}{This options sets the hotkey function for
\item[File Browser Hotkey.] the WPS screen (see \reference{ref:Hotkeys}). The
These options set the hotkey function for their respective screens default is \setting{View Playlist}.}
(see \reference{ref:Hotkeys}). The default for the WPS screen is \nopt{touchscreen}{\item[File Browser Hotkey.]}
\setting{View Playlist}. The File Browser default is \setting{Off}. \end{description}
\end{description}
\nopt{touchscreen}{These options set the hotkey function for their respective
screens (see \reference{ref:Hotkeys}). The default for the WPS screen is
\setting{View Playlist}. The File Browser default is \setting{Off}.}
} }

2
manual/platform/keymap-cowond2.tex
View file

@ -42,6 +42,8 @@
\newcommand{\ActionWpsAbSetAPrevDir}{\TouchActionWpsAbSetAPrevDir} \newcommand{\ActionWpsAbSetAPrevDir}{\TouchActionWpsAbSetAPrevDir}
\newcommand{\ActionWpsAbReset}{\TouchActionWpsAbReset} \newcommand{\ActionWpsAbReset}{\TouchActionWpsAbReset}
\newcommand{\ActionWpsHotkey}{\TouchBottomRight}
%Button actions, tree context %Button actions, tree context
\newcommand{\ActionTreeWps}{\ButtonPlus{}+\ButtonMenu{} or \TouchActionTreeWps} \newcommand{\ActionTreeWps}{\ButtonPlus{}+\ButtonMenu{} or \TouchActionTreeWps}
\newcommand{\ActionTreeStop}{\ButtonMinus{}+\ButtonPower{} or \TouchActionTreeStop} \newcommand{\ActionTreeStop}{\ButtonMinus{}+\ButtonPower{} or \TouchActionTreeStop}

4
manual/rockbox_interface/browsing_and_playing.tex
View file

@ -107,7 +107,7 @@ the \setting{Show Files} setting to all.
\ActionStdRec & Switch to the \setting{Recording Screen}.\\ \ActionStdRec & Switch to the \setting{Recording Screen}.\\
% %
} }
\opt{hotkey}{ \nopt{cowond2}{\opt{hotkey}{
\ActionTreeHotkey \ActionTreeHotkey
& &
\opt{HAVEREMOTEKEYMAP}{ \opt{HAVEREMOTEKEYMAP}{
@ -115,7 +115,7 @@ the \setting{Show Files} setting to all.
Activate the \setting{Hotkey} function Activate the \setting{Hotkey} function
(see \reference{ref:Hotkeys}). (see \reference{ref:Hotkeys}).
\\ \\
} }}
\end{btnmap} \end{btnmap}
\opt{RECORDER_PAD}{ \opt{RECORDER_PAD}{

17
manual/rockbox_interface/hotkeys.tex
View file

@ -1,16 +1,17 @@
% $Id$ % % $Id$ %
\opt{hotkey}{ \opt{hotkey}{
\section{\label{ref:Hotkeys}Hotkeys} \section{\label{ref:Hotkeys}Hotkeys}
Hotkeys are shortcut keys for use in the \setting{File Browser} Hotkeys are shortcut keys for use in the \nopt{touchscreen}{\setting{File Browser}
and \setting{WPS} screens. To use one, press \ActionWpsHotkey{} and }\setting{WPS} screen. To use one, press
within the \setting{File Browser} or \setting{WPS} screens. \nopt{touchscreen}{\ActionTreeHotkey{} within the \setting{File Browser} or}
The assigned function will launch with reference to the current \ActionWpsHotkey{} within the \setting{WPS}
file or directory, if applicable. Each screen has its own screen.\nopt{touchscreen}{ The assigned function will launch with reference
assignment. If there is no assignment for a given screen, to the current file or directory, if applicable. Each screen has its own
assignment.} If there is no assignment for a given screen,
the hotkey is ignored. the hotkey is ignored.
The default assignment for the File Browser hotkey is The default assignment for the \nopt{touchscreen}{File Browser hotkey is
\setting{Off}, but the WPS hotkey defaults to \setting{Off}, while the default for the }WPS hotkey is
\setting{View Playlist}. \setting{View Playlist}.
The hotkey assignments are changed in the Hotkey menu (see The hotkey assignments are changed in the Hotkey menu (see