e200: Better keymap for time screen. Use left and right to switch fields, Menu to revert and fix the scrollwheel direction in button_context_settings.

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

2 files changed, 19 insertions, 10 deletions

diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index 8f07cb3..783d86f 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -85,10 +85,10 @@ static const struct button_mapping button_context_wps[]  = {
 
 static const struct button_mapping button_context_settings[] = {
     { ACTION_STD_CANCEL,        BUTTON_POWER,                     BUTTON_NONE },
-    { ACTION_SETTINGS_INC,      BUTTON_SCROLL_UP,                 BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,      BUTTON_SCROLL_DOWN,               BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_INC,      BUTTON_SCROLL_DOWN,               BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,      BUTTON_SCROLL_UP,                 BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
    
     { ACTION_STD_PREV,          BUTTON_LEFT,                      BUTTON_NONE },
     { ACTION_STD_PREVREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE },
@@ -177,6 +177,15 @@ static const struct button_mapping button_context_settings_right_is_inc[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_settings_right_is_inc */
 
+static const struct button_mapping button_context_settings_time[] = {
+    { ACTION_STD_PREV,        BUTTON_UP|BUTTON_REL,             BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,  BUTTON_UP|BUTTON_REPEAT,          BUTTON_NONE },
+    { ACTION_STD_NEXT,        BUTTON_DOWN|BUTTON_REL,           BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,  BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
+}; /* button_context_settings_time */
+
 static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_INC_SMALL,      BUTTON_SCROLL_DOWN,                 BUTTON_NONE },
     { ACTION_PS_INC_BIG,        BUTTON_SCROLL_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
@@ -250,9 +259,11 @@ const struct button_mapping* get_context_mapping(int context)
         case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
         case CONTEXT_SETTINGS_COLOURCHOOSER:
         case CONTEXT_SETTINGS_EQ:
-        case CONTEXT_SETTINGS_TIME:
             return button_context_settings_right_is_inc;
-            
+
+        case CONTEXT_SETTINGS_TIME:
+            return button_context_settings_time;
+
         case CONTEXT_YESNOSCREEN:
             return button_context_yesno;            
         case CONTEXT_BOOKMARKSCREEN:
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index d48d917..19e369c 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -4911,20 +4911,18 @@
   <source>
     *: "OFF = Revert"
     h100,h120,h300: "STOP = Revert"
-    ipod*: "MENU = Revert"
+    ipod*,e200: "MENU = Revert"
     x5: "RECORD = Revert"
     h10,h10_5gb: "PREV = Revert"
     gigabeatf: "POWER = Revert"
-    e200: "PREV = Revert"
   </source>
   <dest>
     *: "OFF = Revert"
     h100,h120,h300: "STOP = Revert"
-    ipod*: "MENU = Revert"
+    ipod*,e200: "MENU = Revert"
     x5: "RECORD = Revert"
     h10,h10_5gb: "PREV = Revert"
     gigabeatf: "POWER = Revert"
-    e200: "PREV = Revert"
   </dest>
   <voice>
     *: ""