Updated solitaire keytable to the recent changes, added a 'show menu' row and cleaned up (the mess caused by me before)

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

1 files changed, 29 insertions, 41 deletions

diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 667ca10cdf..0dbb72c925 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -13,66 +13,54 @@ For the full set of rules to the game, and other facinating information
 visit\\
 \url{http://www.solitairecentral.com/rules/klondike.html}
 
-\nopt{ondio}{
 \begin{table}
   \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
-      {\ButtonLeft, \ButtonRight, \ButtonUp, \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft, \ButtonRight, \ButtonMenu, \ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonLeft/\ButtonRight/\ButtonScrollUp/\ButtonScrollDown}
+    \ButtonLeft/\ButtonRight/\\
+    \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{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
       & Move Cursor around.\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
+    \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{IRIVER_H10_PAD}{\ButtonPlay}
       & Select cards, move cards, reveal hidden cards...\\
     %
-    \opt{RECORDER_PAD}{\ButtonFTwo}
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{ONDIO_PAD}{Hold \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonPlay}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IRIVER_H10_PAD}{Hold \ButtonLeft}
       & If a card was selected -- unselect it, else\\
       & Draw 3 new cards from the remains stack\\
     %
-    \opt{RECORDER_PAD}{\ButtonPlay}
+    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
+    \opt{ONDIO_PAD}{Hold \ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonLeft}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonLeft}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonLeft}
-    \opt{IRIVER_H10_PAD}{\ButtonFF+\ButtonLeft}
+    \opt{IAUDIO_X5_PAD}{Hold \ButtonPlay}
+    \opt{IRIVER_H10_PAD}{\ButtonFF}
       & Put the card from the top of the remains stack on top of the cursor\\
     %
-    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{RECORDER_PAD}{\ButtonFTwo}
+    \opt{ONDIO_PAD}{Hold \ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonSelect}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonRight}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonUp}
-    \opt{IRIVER_H10_PAD}{\ButtonFF+\ButtonScrollUp}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
+    \opt{IRIVER_H10_PAD}{\ButtonRew}
       & Put the card under the cursor on one of the 4 final colour stacks.\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{IRIVER_H10_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft + \ButtonRight}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonDown}
-    \opt{IRIVER_H10_PAD}{\ButtonFF+\ButtonScrollDown}
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
       & Put the card on top of the remains stack on one of the final colour stacks.\\
+    %
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H300_PAD,IRIVER_H100_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPower}
+      & Show menu\\
    \end{btnmap}
-  \end{table}
-}
-
-\opt{ondio}{
-\begin{table}
-  \begin{btnmap}{}{}
-  \ButtonLeft, \ButtonRight & Move cursor between colums.\\
-   %
-  \ButtonUp, \ButtonDown & Move cursor in a column of open cards.\\
-  \ButtonMenu & Toggle select/unselect card.\\
-   %
-   Hold \ButtonMenu & Draw 3 new cards from the remains stack.\\
-   %
-   Hold \ButtonLeft & Put the card from the top of the remains stack on top of the cursor.\\
-   %
-   Hold \ButtonRight & Put the card under the cursor on one of the 4 final colour stacks.\\
-   %
-   Hold \ButtonUp & Put the card on top of the remains stack on one of the final colour stacks.\\
-  \end{btnmap}
- \end{table}
-}
\ No newline at end of file
+  \end{table}
\ No newline at end of file