FS#10552 - Cowon D2: pgup/pgdn on minus/plus buttons in text viewer

Author: Nemtsev Alexey

Changes that were not part of the original patch:

- Updated corresponding manual entry
- Added support for having both buttons and touchscreen mapping to the same action


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

1 files changed, 6 insertions, 4 deletions

diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 1836b45c2b..19012c75a5 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -15,7 +15,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
     \opt{GIGABEAT_S_PAD}{\ButtonPrev}
-    \opt{COWON_D2_PAD}{\TouchTopMiddle}
+    \opt{COWON_D2_PAD}{\ButtonMinus{} / \TouchTopMiddle}
   \opt{HAVEREMOTEKEYMAP}{& }
         & Scroll{}-up\\
 
@@ -26,7 +26,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_S_PAD}{\ButtonNext}
-    \opt{COWON_D2_PAD}{\TouchBottomMiddle}
+    \opt{COWON_D2_PAD}{\ButtonPlus{} / \TouchBottomMiddle}
   \opt{HAVEREMOTEKEYMAP}{& }
         & Scroll{}-down\\
 
@@ -95,11 +95,12 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{Long \ButtonMenu}
     \opt{PLAYER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-      ,MROBE100_PAD,COWOND_D2_PAD}{\ButtonMenu}
+      ,MROBE100_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonSelect}
     \opt{SANSA_FUZE_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{COWON_D2_PAD}{\ButtonMenu{} / \TouchTopRight}
   \opt{HAVEREMOTEKEYMAP}{& }
         & Enter menu\\
 
@@ -107,9 +108,10 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
     \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,COWON_D2_PAD}{\ButtonPower}
+        ,MROBE100_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
+    \opt{COWON_D2_PAD}{\ButtonPower{} / \TouchTopLeft}
   \opt{HAVEREMOTEKEYMAP}{&
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
   }