4 files changed, 85 insertions, 58 deletions

diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index 95e0a240e9..422a13463d 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -8,37 +8,48 @@ available maths functions on the right hand side.
 
 \begin{table}
 \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {Direction keys}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollFwd,
-        \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollUp, \ButtonScrollDown}
+    \ButtonLeft{} / \ButtonRight{} /
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
+    \opt{SANSA_E200_PAD}{/}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
     & Move around the keypad\\
+    %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
-    & Press a button on the keypad\\
-    \opt{RECORDER_PAD}{\ButtonFOne & Delete last entered digit or clear after
-        calculation\\}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec & Delete
-        last entered digit or clear after calculation\\}
-    \opt{IRIVER_H10_PAD}{\ButtonRew & Delete last entered digit or clear after calculation\\}
-    \opt{GIGABEAT_PAD}{\ButtonA & Delete last entered digit or clear after calculation\\}
-    \opt{MROBE100_PAD}{\ButtonDisplay & Delete last entered digit or clear after calculation\\}
+    & Select a button\\
     %
+    \nopt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{
+        \opt{RECORDER_PAD}{\ButtonFOne}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
+            ,SANSA_C200_PAD}{\ButtonRec}
+        \opt{IRIVER_H10_PAD}{\ButtonRew}
+        \opt{GIGABEAT_PAD}{\ButtonA}
+        \opt{MROBE100_PAD}{\ButtonDisplay}
+        & Delete last entered digit or clear after calculation\\
+        %
+    }
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
+        \opt{RECORDER_PAD}{\ButtonFTwo}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+        & Cycle through the 4 basic operators\\
+        %
+    }
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
     \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     & Calculate\\
+    %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index e1e3559dac..77539292b4 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -11,27 +11,28 @@ greyscale library}.
 \opt{MASCODEC}{
 \note{This plugin will cause playback to stop.}
 }
+
 \begin{table}
 \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
+        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp\ / \ButtonDown}%
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}%
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} %
         / \ButtonLeft\ / \ButtonRight
     & Move around in zoomed in image\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
+        ,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
     \opt{GIGABEAT_PAD}{\ButtonVolUp}
-    \opt{MROBE100_PAD}{\ButtonMenu}
     & Zoom in\\
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{Long \ButtonSelect}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
     \opt{GIGABEAT_PAD}{\ButtonVolDown}
     \opt{MROBE100_PAD}{\ButtonPlay}
@@ -44,6 +45,7 @@ greyscale library}.
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
     \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
+    \opt{SANSA_C200_PAD}{\ButtonVolUp}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonRight}
     & Next jpeg in directory\\
@@ -54,13 +56,17 @@ greyscale library}.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonScrollBack}
+    \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
     \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft}
     & Previous jpeg in directory\\
+    \opt{SANSA_E200_PAD,SANSA_C200_PAD}{%currently only defined for the sansa pads
+        \ButtonRec
+        & Toggle slide show mode\\
+    }
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPower}
-    \opt{SANSA_E200_PAD}{\ButtonRec}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower}
     \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     & Show menu\\
 \end{btnmap}
diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex
index 96a08982a7..e4340febdf 100644
--- a/manual/plugins/mpegplayer.tex
+++ b/manual/plugins/mpegplayer.tex
@@ -13,11 +13,12 @@ option and choose \setting{mpegplayer}.
     \ActionWpsPlay & Pause/Resume\\
     \ActionWpsStop & Stop\\
     \ActionWpsVolUp{} / \ActionWpsVolDown & Adjust volume up / down\\
-    \opt{IRIVER_H300_PAD}{\ButtonMode}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{SANSA_E200_PAD}{\ButtonSelect}
+    \opt{SANSA_C200_PAD}{\ButtonDown}
     & Open the MPEG Player menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index 72020364e9..b2afe9d5ff 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -4,33 +4,42 @@
 A simple stopwatch program with support for saving times.
 
 \begin{table}
-\begin{btnmap}{}{}
-\opt{PLAYER_PAD}{\ButtonMenu}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-& Quit Plugin \\
-\opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-\opt{ONDIO_PAD}{\ButtonRight}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
-\opt{SANSA_E200_PAD}{\ButtonLeft}
-& Start / stop \\
-\opt{PLAYER_PAD}{\ButtonStop}
-\opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonLeft}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonDown}
-\opt{IRIVER_H10_PAD}{\ButtonRew}
-\opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec}
-& Reset timer (only when timer is stopped)\\
-\opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-\opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight} 
-\opt{IRIVER_H10_PAD}{\ButtonFF}
-\opt{IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
-& Take lap time \\
-\opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft/\ButtonRight}
-\opt{RECORDER_PAD,ONDIO_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp/\ButtonDown}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-\opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
-& Scroll through lap times \\
-\end{btnmap}
+    \begin{btnmap}{}{}
+    \opt{PLAYER_PAD}{\ButtonMenu}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
+        ,MROBE100_PAD}{\ButtonPower}
+    & Quit Plugin \\
+    %
+    \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD,IPOD_4G_PAD%
+        ,IPOD_3G_PAD}{\ButtonSelect}
+    & Start / stop \\
+    %
+    \opt{PLAYER_PAD}{\ButtonStop}
+    \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD%
+        ,SANSA_C200_PAD}{\ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonDown}
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
+    \opt{GIGABEAT_PAD}{\ButtonA}
+    \opt{MROBE100_PAD}{\ButtonDisplay}
+    & Reset timer (only when timer is stopped)\\
+    %
+    \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{ONDIO_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight}
+    \opt{IRIVER_H10_PAD}{\ButtonFF}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
+    & Take lap time \\
+    %
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft{} / \ButtonRight}
+    \opt{RECORDER_PAD,ONDIO_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
+        ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp{} / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd{} / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
+    & Scroll through lap times \\
+    \end{btnmap}
 \end{table}