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.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26848 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 23 insertions, 19 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 65b024a924..f98f24e788 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -126,8 +126,8 @@
     \opt{hotkey}{
     hotkey wps      & off, view playlist, show track info,
         pitchscreen, open with, delete  & N/A\\
-    hotkey tree     & off, open with, delete, insert,
-        insert shuffled                 & N/A\\
+    \nopt{touchscreen}{hotkey tree     & off, open with, delete, insert,
+        insert shuffled                 & N/A\\}
     }
     sort files      & alpha, oldest, newest, type & N/A\\
     sort dirs       & alpha, oldest, newest & N/A\\
diff --git a/manual/configure_rockbox/hotkey_settings.tex b/manual/configure_rockbox/hotkey_settings.tex
index b38d72471d..34432764d8 100755
--- a/manual/configure_rockbox/hotkey_settings.tex
+++ b/manual/configure_rockbox/hotkey_settings.tex
@@ -3,12 +3,13 @@
 \section{\label{ref:HotkeySettings}Hotkey}
 
   \begin{description}
-  \item[WPS Hotkey.]
-  \item[File Browser Hotkey.]
-    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}.
-
-  \end{description}
+  \item[WPS Hotkey.] \opt{touchscreen}{This options sets the hotkey function for
+                         the WPS screen (see \reference{ref:Hotkeys}). The 
+                         default is \setting{View Playlist}.}
+  \nopt{touchscreen}{\item[File Browser Hotkey.]}
+   \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}.}
 }
diff --git a/manual/platform/keymap-cowond2.tex b/manual/platform/keymap-cowond2.tex
index ebe3b8a2f7..53140c8fe0 100644
--- a/manual/platform/keymap-cowond2.tex
+++ b/manual/platform/keymap-cowond2.tex
@@ -42,6 +42,8 @@
 \newcommand{\ActionWpsAbSetAPrevDir}{\TouchActionWpsAbSetAPrevDir}
 \newcommand{\ActionWpsAbReset}{\TouchActionWpsAbReset}
 
+\newcommand{\ActionWpsHotkey}{\TouchBottomRight}
+
 %Button actions, tree context
 \newcommand{\ActionTreeWps}{\ButtonPlus{}+\ButtonMenu{} or \TouchActionTreeWps}
 \newcommand{\ActionTreeStop}{\ButtonMinus{}+\ButtonPower{} or \TouchActionTreeStop}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index b5d19cb844..286fc7ad23 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -107,7 +107,7 @@ the \setting{Show Files} setting to all.
         \ActionStdRec & Switch to the \setting{Recording Screen}.\\
       %
       }
-      \opt{hotkey}{
+      \nopt{cowond2}{\opt{hotkey}{
         \ActionTreeHotkey
             &
         \opt{HAVEREMOTEKEYMAP}{
@@ -115,7 +115,7 @@ the \setting{Show Files} setting to all.
         Activate the \setting{Hotkey} function
         (see \reference{ref:Hotkeys}).
             \\
-      }
+      }}
 \end{btnmap}
 
 \opt{RECORDER_PAD}{
diff --git a/manual/rockbox_interface/hotkeys.tex b/manual/rockbox_interface/hotkeys.tex
index 56dafa9589..ec12bd00ca 100644
--- a/manual/rockbox_interface/hotkeys.tex
+++ b/manual/rockbox_interface/hotkeys.tex
@@ -1,16 +1,17 @@
 % $Id$ %
 \opt{hotkey}{
     \section{\label{ref:Hotkeys}Hotkeys}
-    Hotkeys are shortcut keys for use in the \setting{File Browser}
-    and \setting{WPS} screens.  To use one, press \ActionWpsHotkey{}
-    within the \setting{File Browser} or \setting{WPS} screens.
-    The assigned function will launch with reference to the current
-    file or directory, if applicable.  Each screen has its own
-    assignment.  If there is no assignment for a given screen,
+    Hotkeys are shortcut keys for use in the \nopt{touchscreen}{\setting{File Browser}
+    and }\setting{WPS} screen.  To use one, press 
+    \nopt{touchscreen}{\ActionTreeHotkey{} within the \setting{File Browser} or}
+    \ActionWpsHotkey{} within the \setting{WPS}
+    screen.\nopt{touchscreen}{ The assigned function will launch with reference
+    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 default assignment for the File Browser hotkey is
-    \setting{Off}, but the WPS hotkey defaults to
+    The default assignment for the \nopt{touchscreen}{File Browser hotkey is
+    \setting{Off}, while the default for the }WPS hotkey is
     \setting{View Playlist}.
     
     The hotkey assignments are changed in the Hotkey menu (see