Convert WPS keymap to use the new action macros, added dirskip for iriver H100/300

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

1 files changed, 28 insertions, 54 deletions

diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index ecb9a4a63a..e2e59baba9 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -57,78 +57,52 @@ your WPS (While Playing Screen).
 
 \begin{table}
   \begin{btnmap}{}{}
-      \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp/\ButtonDown}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-      \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight/\ButtonLeft} 
-      & Volume up/down \\
+      \ActionWpsVolUp/\ActionWpsVolDown & Volume up/down.\\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
-      & Go to beginning of track, or if pressed while in the first seconds of a track,
-        go to previous track. \\
+      \ActionWpsSkipPrev & Go to beginning of track, or if pressed while in the
+        first seconds of a track, go to previous track.\\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonLeft}
-      & Rewind in track \\
+      \ActionWpsSeekBack & Rewind in track.\\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight}
-      & Go to next track. \\
+      \ActionWpsSkipNext & Go to next track.\\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,ONDIO_PAD,RECORDER_PAD,PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonRight}
-      & Fast forward in track. \\
+      \ActionWpsSeekFwd & Fast forward in track.\\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-      \opt{ONDIO_PAD}{Hold \ButtonOff}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,RECORDER_PAD,PLAYER_PAD}{\ButtonPlay}
-      & Toggle play/pause \\
+      \ActionWpsPlay & Toggle play/pause.\\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-      \opt{ONDIO_PAD}{\ButtonMenu}
-      \opt{RECORDER_PAD,PLAYER_PAD}{\ButtonOn}
-      & Return to the \setting{File Browser} \\
+      \ActionWpsStop & Stop playback.\\
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonSelect}
-      \opt{ONDIO_PAD}{Hold \ButtonMenu}
-      \opt{RECORDER_PAD,PLAYER_PAD}{Hold \ButtonOn}
-      \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
-      & Enter the \setting{WPS Context Menu} \\
+      \ActionWpsBrowse & Return to the \setting{File Browser}.\\
       %
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
-      \opt{RECORDER_PAD}{Hold \ButtonOn}
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonUp{} / \ButtonDown}
-      & Show pitch setting screen \\}
+      \nopt{PLAYER_PAD}{\ActionWpsContext & Enter the \setting{WPS Context Menu}.\\}%
       %
-      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-      \opt{ONDIO_PAD}{Hold \ButtonOff}
-      \opt{IAUDIO_X5_PAD}{Please add correct keys}
-      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonPlay}
-      \opt{PLAYER_PAD}{\ButtonStop}
-      & Stop playback \\
+      \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD}{%
+        \ActionWpsPitchScreen & Show pitch setting screen.\\}%
       %
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-      \opt{RECORDER_PAD}{\ButtonFOne}
-      \opt{PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-      \opt{ONDIO_PAD}{Hold \ButtonMenu\ then \ButtonMenu\ again}
-      \opt{IAUDIO_X5_PAD}{\ButtonRec}
-      & Go to Main menu \\
+      \nopt{ONDIO_PAD}{\ActionWpsMenu}%
+      \opt{ONDIO_PAD}{Hold \ButtonMenu\ then \ButtonMenu\ again}%
+      & Go to Main menu.\\
       %
       %These actions need definitions for the other targets
       \opt{RECORDER_PAD}{
-        \ButtonFTwo & Toggles Play/browse quick menu \\
-        \ButtonFThree & Toggles Display quick menu \\
-        \ButtonFOne+\ButtonDown & Key lock on/off \\
-        \ButtonFOne+\ButtonPlay & Mute on/off \\
+        \ButtonFTwo & Toggles Play/browse quick menu.\\
+        \ButtonFThree & Toggles Display quick menu.\\
+        \ButtonFOne+\ButtonDown & Key lock on/off.\\
+        \ButtonFOne+\ButtonPlay & Mute on/off.\\
       }
       \opt{PLAYER_PAD}{
-        \ButtonMenu+\ButtonStop & Key lock on/off \\
-        \ButtonMenu+\ButtonPlay & Mute on/off \\
+        \ButtonMenu+\ButtonStop & Key lock on/off.\\
+        \ButtonMenu+\ButtonPlay & Mute on/off.\\
       }
       \opt{ONDIO_PAD}{
-        Hold \ButtonMenu+\ButtonDown & Key lock on/off\\
+        Hold \ButtonMenu+\ButtonDown & Key lock on/off.\\
       }
-      \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
-        \opt{PLAYER_PAD}{\ButtonMenu+\ButtonOn}
-        \opt{RECORDER_PAD}{\ButtonFOne+\ButtonOn}
-        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonMode}
-        & Enter \setting{ID3 Viewer} \\
+      \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD}{
+        \ActionWpsIdThreeScreen & Enter \setting{ID3 Viewer}.\\
+      }
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{
+        \ActionWpsAbSetBNextDir & Skip to the next directory.\\
+        \ActionWpsAbSetAPrevDir & Skip to the previous directory.\\
       }
     \end{btnmap}
 \end{table}