Introducing the root menu!

Blind users: get a new voice file as there are lots of lang changes and new strings.
FS#6630 or RootMenu on the wiki for more info. complaints to /dev/null :)



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

9 files changed, 80 insertions, 10 deletions

diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index a990e9c..932613d 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -48,6 +48,12 @@ static const struct button_mapping button_context_standard[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
 
+static const struct button_mapping button_context_menu[]  = {
+    { ACTION_MENU_WPS,        BUTTON_UP,       BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_menu */
+
 static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,     BUTTON_UP|BUTTON_REL,        BUTTON_UP },
     { ACTION_WPS_STOP,     BUTTON_UP|BUTTON_REPEAT,     BUTTON_UP },
@@ -228,8 +234,9 @@ const struct button_mapping* get_context_mapping(int context)
     switch (context)
     {
         case CONTEXT_STD:
-        case CONTEXT_MAINMENU:
             return button_context_standard;
+        case CONTEXT_MAINMENU:
+            return button_context_menu;
             
         case CONTEXT_WPS:
             return button_context_wps;
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 3f4f8b6..1917714 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -116,6 +116,15 @@ static const struct button_mapping button_context_tree[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
 
+static const struct button_mapping button_context_menu[]  = {
+    { ACTION_MENU_WPS,    BUTTON_POWER|BUTTON_REL,    BUTTON_POWER },
+    { ACTION_MENU_STOP,   BUTTON_A,                   BUTTON_NONE },
+    { ACTION_MENU_STOP,   BUTTON_A|BUTTON_REL,        BUTTON_A },
+    { ACTION_MENU_STOP,   BUTTON_A|BUTTON_REPEAT,     BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_tree */
+
 static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
     { ACTION_NONE,              BUTTON_POWER,                              BUTTON_NONE },
     { ACTION_TREE_PGLEFT,       BUTTON_POWER|BUTTON_LEFT,                  BUTTON_POWER },
@@ -259,8 +268,9 @@ const struct button_mapping* get_context_mapping(int context)
     switch (context)
     {
         case CONTEXT_STD:
-        case CONTEXT_MAINMENU:
             return button_context_standard;
+        case CONTEXT_MAINMENU:
+            return button_context_menu;
         case CONTEXT_WPS:
             return button_context_wps;
 
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index 904b8c0..c0e5614 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -62,6 +62,12 @@ static const struct button_mapping remote_button_context_standard[]  = {
     LAST_ITEM_IN_LIST
 }; /* remote_button_context_standard */
 
+static const struct button_mapping button_context_menu[]  = {
+    { ACTION_MENU_WPS,        BUTTON_PLAY,       BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_menu */
+
 static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,     BUTTON_PLAY|BUTTON_REL,   BUTTON_PLAY },
     { ACTION_WPS_STOP,     BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY },
@@ -351,8 +357,9 @@ const struct button_mapping* get_context_mapping(int context)
     switch (context)
     {
         case CONTEXT_STD:
-        case CONTEXT_MAINMENU:
             return button_context_standard;
+        case CONTEXT_MAINMENU:
+            return button_context_menu;
             
         case CONTEXT_WPS:
             return button_context_wps;
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index b379081..7997270 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -65,6 +65,12 @@ static const struct button_mapping button_context_standard[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
 
+static const struct button_mapping button_context_menu[]  = {
+    { ACTION_MENU_WPS,            BUTTON_ON,       BUTTON_NONE },
+    { ACTION_MENU_STOP,           BUTTON_OFF,       BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_menu */
 
 static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,          BUTTON_ON|BUTTON_REL,           BUTTON_ON },
@@ -715,10 +721,18 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 };
 
+static const struct button_mapping button_context_menu_remote[] = {
+    { ACTION_MENU_STOP,     BUTTON_RC_STOP,         BUTTON_NONE },
+    { ACTION_MENU_WPS,      BUTTON_RC_ON,         BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+};
+
 /* the actual used tables */
 static const struct button_mapping 
         *remote_btn_ctxt_std = 0, 
         *remote_btn_ctxt_wps = 0,
+        *remote_btn_ctxt_menu = button_context_menu_remote,
         *remote_btn_ctxt_list = 0,
         *remote_btn_ctxt_tree = 0,
         *remote_btn_ctxt_listtree_scroll_w_cmb = 0,
@@ -866,8 +880,9 @@ static const struct button_mapping* get_context_mapping_remote(int context)
     switch (context)
     {
         case CONTEXT_STD:
-        case CONTEXT_MAINMENU:
             return remote_btn_ctxt_std;
+        case CONTEXT_MAINMENU:
+            return remote_btn_ctxt_menu;
         case CONTEXT_WPS: /* common for all remotes */
             return button_context_wps_remotescommon;
 
@@ -914,8 +929,9 @@ const struct button_mapping* get_context_mapping(int context)
     switch (context)
     {
         case CONTEXT_STD:
-        case CONTEXT_MAINMENU:
             return button_context_standard;
+        case CONTEXT_MAINMENU:
+            return button_context_menu;
         case CONTEXT_WPS:
             return button_context_wps;
             
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 94dd943..8b08f0c 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -60,6 +60,12 @@ static const struct button_mapping button_context_tree[]  = {
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_tree */
+static const struct button_mapping button_context_menu[]  = {
+    { ACTION_MENU_WPS,          BUTTON_PLAY|BUTTON_REL,      BUTTON_PLAY },
+    { ACTION_MENU_STOP,         BUTTON_PLAY|BUTTON_REPEAT,   BUTTON_PLAY },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_menu */
 
 static const struct button_mapping button_context_tree_scroll_lr[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
@@ -191,8 +197,9 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_tree;
             
         case CONTEXT_LIST:
-        case CONTEXT_MAINMENU:
             return button_context_standard;
+        case CONTEXT_MAINMENU:
+            return button_context_menu;
             
         case CONTEXT_SETTINGS_EQ:
         case CONTEXT_SETTINGS_COLOURCHOOSER:
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 401742b..17b7fe4 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -83,10 +83,17 @@ static const struct button_mapping button_context_settings[] = {
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,    BUTTON_MENU|BUTTON_REL,       BUTTON_MENU },
     { ACTION_TREE_STOP,   BUTTON_OFF,                   BUTTON_NONE },
+    { ACTION_STD_CANCEL,  BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_listtree */
 
+static const struct button_mapping button_context_menu[]  = {
+    { ACTION_MENU_WPS,    BUTTON_MENU|BUTTON_REL,       BUTTON_MENU },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_menu */
+
 static const struct button_mapping button_context_tree_scroll_lr[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
@@ -211,8 +218,9 @@ const struct button_mapping* get_context_mapping( int context )
         case CONTEXT_FM:
             return button_context_radio;
 #endif
-        case CONTEXT_LIST:
         case CONTEXT_MAINMENU:
+            return button_context_menu;
+        case CONTEXT_LIST:
         default:
             return button_context_standard;
     }
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 82508b5..80cdedf 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -78,6 +78,12 @@ static const struct button_mapping button_context_tree[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_listtree */
 
+static const struct button_mapping button_context_menu[]  = {
+    { ACTION_MENU_WPS,      BUTTON_ON,     BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_menu */
+
 static const struct button_mapping button_context_yesno[]  = {
     { ACTION_YESNO_ACCEPT,  BUTTON_PLAY,   BUTTON_NONE },
 
@@ -153,9 +159,10 @@ const struct button_mapping* get_context_mapping( int context )
             return button_context_tree;
         case CONTEXT_BOOKMARKSCREEN:
             return button_context_bmark;
+        case CONTEXT_MAINMENU:
+            return button_context_menu;
         case CONTEXT_STD:
         case CONTEXT_LIST:
-        case CONTEXT_MAINMENU:
         default:
             return button_context_standard;
     }
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 0296a87..fc781af 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -112,6 +112,13 @@ static const struct button_mapping button_context_tree[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_listtree */
 
+static const struct button_mapping button_context_menu[]  = {
+    { ACTION_MENU_WPS,              BUTTON_ON|BUTTON_REL,                   BUTTON_ON },
+    { ACTION_MENU_STOP,             BUTTON_OFF,                             BUTTON_NONE },
+    { ACTION_NONE,                  BUTTON_ON,                              BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_listtree */
+
 static const struct button_mapping button_context_tree_scroll_lr[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
@@ -299,9 +306,10 @@ const struct button_mapping* get_context_mapping( int context )
         case CONTEXT_FM:
             return button_context_radio;
 
+        case CONTEXT_MAINMENU:
+            return button_context_menu;
         case CONTEXT_STD:
         case CONTEXT_LIST:
-        case CONTEXT_MAINMENU:
         default:
             return button_context_standard;
     }
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 82cfd27..06e6b25 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -117,7 +117,7 @@ static const struct button_mapping button_context_keyboard[]  = {
 /* Main Menu Context Menu **/
 static const struct button_mapping button_context_mainmenu[] = {
     { ACTION_NONE,     BUTTON_POWER,                  BUTTON_NONE },
-
+    { ACTION_MENU_WPS, BUTTON_PLAY,                   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_mainmenu */