Replace COWON_D2_PAD with 'touchscreen' in manual button tables and text where appropriate - places where a touch area is meant and hence valid for all touchscreen devices. Makes the Onda VX777 manual build correctly.

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

manual/advanced_topics/main.tex

@@ -552,8 +552,7 @@ Example of a configuration file:
 \item [Browse .cfg Files]Opens the \setting{File Browser} in the
   \fname{/.rockbox} directory and displays all \fname{.cfg} (configuration)
   files. Selecting a \fname{.cfg} file will cause Rockbox to load the settings
-  contained in that file. Pressing \nopt{COWON_D2_PAD}{\ButtonLeft}
-  \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchTopLeft} will exit back to the
+  contained in that file. Pressing \ActionStdCancel will exit back to the
   \setting{Manage Settings} menu. See the \setting{Write .cfg files} option on
   the \setting{Manage Settings} menu for details of how to save and edit a 
   configuration file.

manual/plugins/goban.tex

@@ -54,30 +54,30 @@ these markers:
 
 \subsubsection{Controls}
     \begin{btnmap}
-        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,COWON_D2_PAD}
+        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,touchscreen}
              {\ButtonUp}%
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}%
         \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-        \opt{COWON_D2_PAD}{\TouchTopMiddle}
+        \opt{touchscreen}{\TouchTopMiddle}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
         Move cursor up
         \\
         
-        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,COWON_D2_PAD}
+        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,touchscreen}
              {\ButtonDown}%
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}%
         \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
-        \opt{COWON_D2_PAD}{\TouchBottomMiddle}
+        \opt{touchscreen}{\TouchBottomMiddle}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
         Move cursor down
         \\
             
-        \nopt{COWON_D2_PAD}{\ButtonLeft}
-        \opt{COWON_D2_PAD}{\TouchMidLeft}
+        \nopt{touchscreen}{\ButtonLeft}
+        \opt{touchscreen}{\TouchMidLeft}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
@@ -86,8 +86,8 @@ these markers:
             node in the game tree if in \emph{tree} navigation mode}
         \\
              
-        \nopt{COWON_D2_PAD}{\ButtonRight}
-        \opt{COWON_D2_PAD}{\TouchMidRight}
+        \nopt{touchscreen}{\ButtonRight}
+        \opt{touchscreen}{\TouchMidRight}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
@@ -103,12 +103,12 @@ these markers:
             \\
         }
         
-        \nopt{IRIVER_H10_PAD,COWON_D2_PAD,ONDIO_PAD,RECORDER_PAD,IAUDIO_M3_PAD%
-             ,PBELL_VIBE500_PAD}{%
+        \nopt{IRIVER_H10_PAD,ONDIO_PAD,RECORDER_PAD,IAUDIO_M3_PAD,PBELL_VIBE500_PAD%
+            ,touchscreen}{%
             \ButtonSelect}%
         \opt{IRIVER_H10_PAD,RECORDER_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}%
         \opt{ONDIO_PAD}{\ButtonMenu}
-        \opt{COWON_D2_PAD}{\TouchCenter}
+        \opt{touchscreen}{\TouchCenter}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
@@ -125,7 +125,7 @@ these markers:
             \opt{MROBE100_PAD}{\ButtonMenu}%
             \opt{IAUDIO_X5_PAD}{\ButtonPlay}%
             \opt{RECORDER_PAD}{\ButtonFOne}
-            \opt{COWON_D2_PAD}{\TouchBottomLeft}
+            \opt{touchscreen}{\TouchBottomLeft}
             \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonLeft}
                 &
             \opt{HAVEREMOTEKEYMAP}{
@@ -141,7 +141,7 @@ these markers:
             \opt{MROBE100_PAD}{\ButtonPlay}%
             \opt{IAUDIO_X5_PAD}{\ButtonRec}%
             \opt{RECORDER_PAD}{\ButtonFThree}
-            \opt{COWON_D2_PAD}{\TouchBottomRight}
+            \opt{touchscreen}{\TouchBottomRight}
             \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonRight}
                 &
             \opt{HAVEREMOTEKEYMAP}{
@@ -158,7 +158,7 @@ these markers:
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}%
         \opt{RECORDER_PAD}{\ButtonFTwo}%
         \opt{ONDIO_PAD}{Long \ButtonMenu}
-        \opt{COWON_D2_PAD}{\TouchTopLeft}
+        \opt{touchscreen}{\TouchTopLeft}
             &
         \opt{HAVEREMOTEKEYMAP}{
             &}
@@ -168,10 +168,10 @@ these markers:
 %        \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,ONDIO_PAD,RECORDER_PAD}{%
         \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
             ,IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
-            ,PBELL_VIBE500_PAD}{% 
-            \nopt{IRIVER_H10_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{Long \ButtonSelect}%
+            ,PBELL_VIBE500_PAD,touchscreen}{% 
+            \nopt{IRIVER_H10_PAD,touchscreen,PBELL_VIBE500_PAD}{Long \ButtonSelect}%
             \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
-            \opt{COWON_D2_PAD}{Long \TouchCenter}
+            \opt{touchscreen}{Long \TouchCenter}
             \opt{PBELL_VIBE500_PAD}{\ButtonOK}
                 &
             \opt{HAVEREMOTEKEYMAP}{
@@ -182,7 +182,7 @@ these markers:
         
         \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD,RECORDER_PAD,MROBE100_PAD%
             ,GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_CLIP_PAD%
-            ,PBELL_VIBE500_PAD}{%
+            ,PBELL_VIBE500_PAD,touchscreen}{%
             \opt{SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{%
                 \ButtonRec}%
             \opt{SANSA_FUZE_PAD,SANSA_CLIP_PAD}{\ButtonHome}%
@@ -190,7 +190,7 @@ these markers:
             \opt{MROBE100_PAD}{\ButtonPower}%
             \opt{GIGABEAT_PAD}{\ButtonA}%
             \opt{GIGABEAT_S_PAD}{\ButtonPlay}%
-            \opt{COWON_D2_PAD}{\TouchTopRight}
+            \opt{touchscreen}{\TouchTopRight}
             \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
                 &
             \opt{HAVEREMOTEKEYMAP}{

manual/plugins/pictureflow.tex

@@ -36,7 +36,8 @@ aware:
         % only scroll wheel and `strip' targets use the same action in album and track list
         \nopt{scrollwheel,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{%
             % currently the M3 does not use buttons of the main unit which has no display
-            \nopt{IAUDIO_M3_PAD,COWON_D2_PAD}{\ButtonLeft{} / \ButtonRight}
+            \nopt{IAUDIO_M3_PAD,touchscreen}{\ButtonLeft{} / \ButtonRight}
+            \opt{touchscreen}{\TouchMidLeft{} / \TouchMidRight}
                 &
             \opt{HAVEREMOTEKEYMAP}{
                 \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdPrev{} / \ActionRCStdNext}
@@ -56,12 +57,12 @@ aware:
         }
 
         \nopt{IAUDIO_M3_PAD}{%
-            \nopt{ONDIO_PAD,IRIVER_H10_PAD,RECORDER_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}
+            \nopt{ONDIO_PAD,IRIVER_H10_PAD,RECORDER_PAD,touchscreen,PBELL_VIBE500_PAD}
                  {\ButtonSelect}
             \opt{ONDIO_PAD}{\ButtonUp} 
             \opt{IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonRight} 
             \opt{RECORDER_PAD}{\ButtonOn} 
-            \opt{COWON_D2_PAD}{\TouchCenter}
+            \opt{touchscreen}{\TouchCenter}
         }
             &
         \opt{HAVEREMOTEKEYMAP}{
@@ -80,8 +81,10 @@ aware:
                 \\
         }
         
-        \nopt{IAUDIO_M3_PAD,COWON_D2_PAD}{\ButtonLeft}
-        \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
+        \nopt{IAUDIO_M3_PAD,touchscreen}{\ButtonLeft}
+        \opt{touchscreen}{
+            \opt{COWON_D2_PAD}{\ButtonPower{} or}
+            \TouchBottomRight}
             &
         \opt{HAVEREMOTEKEYMAP}{
             \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdCancel}
@@ -101,10 +104,13 @@ aware:
             \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
             \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD%
                 ,MROBE100_PAD}{\ButtonPower}
-            \opt{SANSA_C200_PAD,IRIVER_H10_PAD,COWON_D2_PAD}{Long \ButtonPower}
+            \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower}
             \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
             \opt{SANSA_FUZE_PAD}{Long \ButtonHome} 
             \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+            \opt{touchscreen}{
+                \opt{COWON_D2_PAD}{Long \ButtonPower{} or}
+                \TouchBottomRight{} (in album view)}
         }
             &
         \opt{HAVEREMOTEKEYMAP}{

manual/plugins/rockpaint.tex

@@ -115,13 +115,13 @@ if you select Exit, so any unsaved changes will be lost.}
         & Quits Rockpaint immediately.\\
     }
 
-    \nopt{COWON_D2_PAD}{\ButtonLeft{} / \ButtonRight{} /}
-    \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight{} /}
-    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IRIVER_H10_PAD,COWON_D2_PAD}
+    \nopt{touchscreen}{\ButtonLeft{} / \ButtonRight{} /}
+    \opt{touchscreen}{\TouchMidLeft{} / \TouchMidRight{} /}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IRIVER_H10_PAD,touchscreen}
         {\ButtonUp{} / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu{} / \ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\TouchTopMiddle{} / \TouchBottomMiddle}
+    \opt{touchscreen}{\TouchTopMiddle{} / \TouchBottomMiddle}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Moves the cursor around.\\
 
@@ -141,14 +141,14 @@ if you select Exit, so any unsaved changes will be lost.}
     \opt{GIGABEAT_PAD}{\ButtonA}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
     \opt{GIGABEAT_S_PAD}{\ButtonPlay}
-    \opt{COWON_D2_PAD}{\TouchBottomLeft}
+    \opt{touchscreen}{\TouchBottomLeft}
     \opt{PBELL_VIBE500_PAD}{\ButtonOK}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Displays the toolbar.\\
 
-    \nopt{IRIVER_H10_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonSelect}%
+    \nopt{IRIVER_H10_PAD,touchscreen,PBELL_VIBE500_PAD}{\ButtonSelect}%
     \opt{IRIVER_H10_PAD}{\ButtonFF}%
-    \opt{COWON_D2_PAD}{\TouchCenter}
+    \opt{touchscreen}{\TouchCenter}
     \opt{PBELL_VIBE500_PAD}{\ButtonPlay}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Toggles the brush and selects objects.\\

manual/plugins/text_viewer.tex

@@ -16,7 +16,8 @@ by using \emph{Open with} from the \emph{Context Menu}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \TouchTopMiddle}
+    \opt{COWON_D2_PAD}{\ButtonMinus{} / }%
+    \opt{touchscreen}{\TouchTopMiddle}
     \opt{PBELL_VIBE500_PAD}{\ButtonOK}
     \opt{HAVEREMOTEKEYMAP}{&
         \opt{IAUDIO_M3_PAD}{\ButtonRCUp}
@@ -30,7 +31,8 @@ by using \emph{Open with} from the \emph{Context Menu}
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} / \TouchBottomMiddle}
+    \opt{COWON_D2_PAD}{\ButtonPlus{} / }%
+    \opt{touchscreen}{\TouchBottomMiddle}
     \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
     \opt{HAVEREMOTEKEYMAP}{&
         \opt{IAUDIO_M3_PAD}{\ButtonRCDown}
@@ -39,8 +41,8 @@ by using \emph{Open with} from the \emph{Context Menu}
 
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonLeft}
-    \opt{COWON_D2_PAD}{\TouchMidLeft}
-    \nopt{PLAYER_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,IAUDIO_M3_PAD}{\ButtonLeft}
+    \opt{touchscreen}{\TouchMidLeft}
+    \nopt{PLAYER_PAD,GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD}{\ButtonLeft}
     \opt{HAVEREMOTEKEYMAP}{&
         \opt{IAUDIO_M3_PAD}{\ButtonRCLeft}
     }
@@ -49,8 +51,8 @@ by using \emph{Open with} from the \emph{Context Menu}
 
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight}
     \opt{GIGABEAT_S_PAD}{\ButtonPlay+\ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidRight}
-    \nopt{PLAYER_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,IAUDIO_M3_PAD}{\ButtonRight}
+    \opt{touchscreen}{\TouchMidRight}
+    \nopt{PLAYER_PAD,GIGABEAT_S_PAD,touchscreen,IAUDIO_M3_PAD}{\ButtonRight}
     \opt{HAVEREMOTEKEYMAP}{&
         \opt{IAUDIO_M3_PAD}{\ButtonRCRight}
     }
@@ -104,7 +106,7 @@ by using \emph{Open with} from the \emph{Context Menu}
     \opt{SANSA_CLIP_PAD}{\ButtonHome}
     \opt{SANSA_FUZE_PAD}{\ButtonDown+\ButtonSelect}
     \opt{MROBE100_PAD}{\ButtonDisplay}
-    \opt{COWON_D2_PAD}{\TouchCenter}
+    \opt{touchscreen}{\TouchCenter}
     \opt{HAVEREMOTEKEYMAP}{&
         \opt{IAUDIO_M3_PAD}{\ButtonRCMode}
     }
@@ -134,7 +136,8 @@ by using \emph{Open with} from the \emph{Context Menu}
     \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD}{\ButtonSelect}
     \opt{SANSA_FUZE_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{COWON_D2_PAD}{\ButtonMenu{} / \TouchTopRight}
+    \opt{COWON_D2_PAD}{\ButtonMenu{} / }%
+    \opt{touchscreen}{\TouchTopRight}
     \opt{HAVEREMOTEKEYMAP}{&
         \opt{IAUDIO_M3_PAD}{\ButtonRCPlay}
     }
@@ -147,7 +150,8 @@ by using \emph{Open with} from the \emph{Context Menu}
         ,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} / \TouchTopLeft}
+    \opt{COWON_D2_PAD}{\ButtonPower{} / }%
+    \opt{touchscreen}{\TouchTopLeft}
     \opt{IAUDIO_M3_PAD,PBELL_VIBE500_PAD}{\ButtonRec}
     \opt{HAVEREMOTEKEYMAP}{&
         \opt{IAUDIO_M3_PAD}{\ButtonRCRec}