Cowon D2: Revise some keymaps

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

2 files changed, 28 insertions, 24 deletions

diff --git a/manual/platform/keymap-cowond2.tex b/manual/platform/keymap-cowond2.tex
index 1069568..cc8edb8 100644
--- a/manual/platform/keymap-cowond2.tex
+++ b/manual/platform/keymap-cowond2.tex
@@ -14,18 +14,18 @@
 \newcommand{\ActionStdCancel}{\ButtonPower{} or \TouchActionStdCancel}
 \newcommand{\ActionStdContext}{Long \ButtonMenu{} or \TouchActionStdContext}
 \newcommand{\ActionStdQuickScreen}{\TouchActionStdQuickScreen}
-\newcommand{\ActionQuickScreenExit}{\TouchActionQuickScreenExit}
+\newcommand{\ActionQuickScreenExit}{\ButtonPower{} or \ButtonMenu{} or \TouchActionQuickScreenExit}
 \newcommand{\ActionStdMenu}{\TouchActionStdMenu}
-\newcommand{\ActionStdOk}{\TouchActionStdOk}
-\newcommand{\ActionStdRec}{\TouchActionStdRec}
-\newcommand{\ActionStdUsbCharge}{\TouchActionStdUsbCharge}
+\newcommand{\ActionStdOk}{\ButtonMenu{} or \TouchActionStdOk}
+%\newcommand{\ActionStdRec}{\TouchActionStdRec}
+%\newcommand{\ActionStdUsbCharge}{\TouchActionStdUsbCharge}
 
 %Button actions, wps context
 \newcommand{\ActionWpsPlay}{\TouchActionWpsPlay}
 \newcommand{\ActionWpsSkipNext}{\TouchActionWpsSkipNext}
+\newcommand{\ActionWpsSeekFwd}{\TouchActionWpsSeekFwd}
 \newcommand{\ActionWpsSkipPrev}{\TouchActionWpsSkipPrev}
 \newcommand{\ActionWpsSeekBack}{\TouchActionWpsSeekBack}
-\newcommand{\ActionWpsSeekFwd}{\TouchActionWpsSeekFwd}
 
 \newcommand{\ActionWpsStop}{\TouchActionWpsStop}
 \newcommand{\ActionWpsVolDown}{\ButtonMinus{} or \TouchActionWpsVolDown}
@@ -43,17 +43,17 @@
 \newcommand{\ActionWpsAbReset}{\TouchActionWpsAbReset}
 
 %Button actions, tree context
-\newcommand{\ActionTreeWps}{\ButtonPlus}
-\newcommand{\ActionTreeStop}{}
-\newcommand{\ActionTreeEnter}{}
-\newcommand{\ActionTreeParentDirectory}{}
+\newcommand{\ActionTreeWps}{\ButtonPlus{}+\ButtonMenu{} or \TouchActionTreeWps}
+\newcommand{\ActionTreeStop}{\ButtonMinus{}+\ButtonPower{} or \TouchActionTreeStop}
+\newcommand{\ActionTreeEnter}{\ButtonMenu{} or \TouchActionTreeEnter}
+\newcommand{\ActionTreeParentDirectory}{\TouchActionTreeParentDirectory}
 
 %Button actions, YesNo context
-\newcommand{\ActionYesNoAccept}{\ButtonMenu}
+\newcommand{\ActionYesNoAccept}{\ButtonMenu{} or \TouchActionYesNoAccept}
 
 %Button actions, Setting context
-\newcommand{\ActionSettingInc}{\ButtonPlus}
-\newcommand{\ActionSettingDec}{\ButtonMinus}
+\newcommand{\ActionSettingInc}{\TouchActionSettingInc{} or \ButtonPlus}
+\newcommand{\ActionSettingDec}{\TouchActionSettingDec{} or \ButtonMinus}
 
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\TouchActionKbdLeft}
@@ -78,12 +78,14 @@
 \newcommand{\ActionPsNudgeRight}{\TouchActionPsNudgeRight}
 \newcommand{\ActionPsReset}{\TouchActionPsReset}
 \newcommand{\ActionPsExit}{\ButtonPower{} or \TouchActionPsExit}
+\newcommand{\ActionPsSlower}{\TouchActionPsSlower}
+\newcommand{\ActionPsFaster}{\TouchActionPsFaster}
 
 %Button actions, FM radio context
 \newcommand{\ActionFMPreset}{Long \ButtonMenu{} or \TouchActionFMPreset}
 \newcommand{\ActionFMMenu}{\ButtonMenu{} or \TouchActionFMMenu}
 \newcommand{\ActionFMMode}{\TouchActionFMMode}
-\newcommand{\ActionFMStop}{\ButtonPower}
+\newcommand{\ActionFMStop}{\TouchActionFMStop{} or \ButtonPower}
 \newcommand{\ActionFMExit}{\TouchActionFMExit}
 \newcommand{\ActionFMPlay}{\TouchActionFMPlay}
 \newcommand{\ActionFMSettingsInc}{\ActionSettingInc}
diff --git a/manual/platform/keymap-touchscreen.tex b/manual/platform/keymap-touchscreen.tex
index b107538..332febb 100644
--- a/manual/platform/keymap-touchscreen.tex
+++ b/manual/platform/keymap-touchscreen.tex
@@ -17,8 +17,8 @@
 \newcommand{\TouchActionStdNextRepeat}{Long \TouchBottomMiddle}
 \newcommand{\TouchActionStdCancel}{\TouchMidLeft}
 \newcommand{\TouchActionStdContext}{Long \TouchCenter{} or Long \TouchMidRight}
-\newcommand{\TouchActionStdQuickScreen}{Long \TouchTopLeft}
-\newcommand{\TouchActionQuickScreenExit}{}
+\newcommand{\TouchActionStdQuickScreen}{\TouchBottomLeft}
+\newcommand{\TouchActionQuickScreenExit}{\TouchActionStdQuickScreen{} or \TouchCenter}
 \newcommand{\TouchActionStdMenu}{\TouchTopLeft}
 \newcommand{\TouchActionStdOk}{\TouchCenter{} or \TouchMidRight}
 \newcommand{\TouchActionStdRec}{}
@@ -35,7 +35,7 @@
 \newcommand{\TouchActionWpsVolDown}{\TouchBottomMiddle}
 \newcommand{\TouchActionWpsVolUp}{\TouchTopMiddle}
 
-\newcommand{\TouchActionWpsQuickScreen}{Long \TouchTopLeft}
+\newcommand{\TouchActionWpsQuickScreen}{\TouchBottomLeft}
 \newcommand{\TouchActionWpsMenu}{\TouchTopLeft}
 \newcommand{\TouchActionWpsContext}{Long \TouchCenter}
 \newcommand{\TouchActionWpsBrowse}{\TouchCenter}
@@ -48,9 +48,9 @@
 
 %Button actions, tree context
 \newcommand{\TouchActionTreeWps}{\TouchTopRight}
-\newcommand{\TouchActionTreeStop}{}
-\newcommand{\TouchActionTreeEnter}{}
-\newcommand{\TouchActionTreeParentDirectory}{}
+\newcommand{\TouchActionTreeStop}{\TouchBottomRight}
+\newcommand{\TouchActionTreeEnter}{\TouchCenter{} or \TouchMidRight}
+\newcommand{\TouchActionTreeParentDirectory}{\TouchMidLeft}
 
 %Button actions, YesNo context
 \newcommand{\TouchActionYesNoAccept}{\TouchTopRight}
@@ -82,6 +82,8 @@
 \newcommand{\TouchActionPsNudgeRight}{\TouchMidRight}
 \newcommand{\TouchActionPsReset}{\TouchCenter}
 \newcommand{\TouchActionPsExit}{\TouchTopLeft}
+\newcommand{\TouchActionPsSlower}{Long \TouchMidLeft}
+\newcommand{\TouchActionPsFaster}{Long \TouchMidRight}
 
 %Button actions, Recording screen context
 \newcommand{\TouchActionRecPause}{}
@@ -100,11 +102,11 @@
 \newcommand{\TouchActionFMStop}{\TouchBottomRight}
 \newcommand{\TouchActionFMExit}{\TouchTopLeft}
 \newcommand{\TouchActionFMPlay}{\TouchTopRight}
-\newcommand{\TouchActionFMSettingsInc}{}
-\newcommand{\TouchActionFMSettingsDec}{}
-\newcommand{\TouchActionFMPrev}{\TouchActionRecSettingsInc}
-\newcommand{\TouchActionFMNext}{\TouchActionRecSettingsDec}
+\newcommand{\TouchActionFMSettingsInc}{\TouchActionSettingInc}
+\newcommand{\TouchActionFMSettingsDec}{\TouchActionSettingDec}
+\newcommand{\TouchActionFMPrev}{\TouchMidLeft}
+\newcommand{\TouchActionFMNext}{\TouchMidRight}
 
 %Button actions, Bookmark screen context
-\newcommand{\TouchActionBmDelete}{\TouchBottomLeft}
+\newcommand{\TouchActionBmDelete}{\TouchBottomRight}