FS#7158 - Bookmark selection as a list.

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

11 files changed, 19 insertions, 42 deletions

diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c
index e451d708cf..552fc2a4d8 100644
--- a/apps/keymaps/keymap-av300.c
+++ b/apps/keymaps/keymap-av300.c
@@ -198,10 +198,8 @@ static const struct button_mapping button_context_keyboard[]  = {
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,    BUTTON_SELECT|BUTTON_ON,   BUTTON_SELECT },
     { ACTION_BMS_DELETE,    BUTTON_SELECT|BUTTON_ON,   BUTTON_ON },
-    { ACTION_BMS_EXIT,      BUTTON_OFF,                BUTTON_NONE },
-    { ACTION_BMS_SELECT,    BUTTON_SELECT|BUTTON_REL,  BUTTON_SELECT },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
     
 }; /* button_context_settings_bmark */
 
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index c946b5feca..280837bbfd 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -219,10 +219,8 @@ static const struct button_mapping button_context_keyboard[]  = {
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,       BUTTON_UP,         BUTTON_NONE },
-    { ACTION_BMS_SELECT,       BUTTON_SELECT,     BUTTON_NONE },
-    { ACTION_BMS_EXIT,         BUTTON_POWER,      BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
 /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index c2e6a537b0..465d16a85e 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -192,27 +192,25 @@ static const struct button_mapping button_context_yesno[]  = {
 static const struct button_mapping button_context_colorchooser[]  = {
     { ACTION_STD_OK,            BUTTON_A|BUTTON_REL,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_colorchooser */
 
 static const struct button_mapping button_context_eq[]  = {
     { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_eq */
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,       BUTTON_A, BUTTON_NONE },
-    { ACTION_BMS_SELECT,       BUTTON_SELECT,            BUTTON_NONE },
-    { ACTION_BMS_EXIT,         BUTTON_POWER,    BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+}; /* button_context_bmark */
 
 static const struct button_mapping button_context_time[]  = {
     { ACTION_STD_CANCEL,       BUTTON_POWER,  BUTTON_NONE },
     { ACTION_STD_OK,           BUTTON_A,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_time */
 
 static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_QS_DOWNINV,    BUTTON_UP,                      BUTTON_NONE },
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index 1a3c81b989..7eb6b8dceb 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -296,9 +296,7 @@ static const struct button_mapping button_context_keyboard[]  = {
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,       BUTTON_REW,       BUTTON_NONE },
-    { ACTION_BMS_SELECT,       BUTTON_RIGHT,     BUTTON_NONE },
-    { ACTION_BMS_EXIT,         BUTTON_LEFT,      BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
 const struct button_mapping button_context_recscreen[]  = {
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index bbec420846..144b788323 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -174,7 +174,7 @@ static const struct button_mapping button_context_yesno[]  = {
 static const struct button_mapping button_context_colorchooser[]  = {
     { ACTION_STD_OK,            BUTTON_ON|BUTTON_REL,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_settings_colorchooser */
 
 static const struct button_mapping button_context_eq[]  = {
     { ACTION_STD_OK,                BUTTON_SELECT|BUTTON_REL,               BUTTON_NONE },
@@ -186,13 +186,11 @@ static const struct button_mapping button_context_eq[]  = {
     { ACTION_SETTINGS_DECBIGSTEP,   BUTTON_LEFT|BUTTON_REL,                 BUTTON_ON|BUTTON_LEFT },
     { ACTION_SETTINGS_DECBIGSTEP,   BUTTON_ON|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
-}; /* button_context_settings_bmark */
+}; /* button_context_settings_context_eq */
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,       BUTTON_REC,      BUTTON_NONE },
-    { ACTION_BMS_SELECT,       BUTTON_SELECT,   BUTTON_NONE },
-    { ACTION_BMS_EXIT,         BUTTON_OFF,      BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_settings_bmark */
 
 static const struct button_mapping button_context_time[]  = {
@@ -493,11 +491,9 @@ static const struct button_mapping button_context_yesno_h100remote[]  = {
 static const struct button_mapping *button_context_yesno_h300lcdremote =
                 button_context_yesno_h100remote;
 
-static const struct button_mapping button_context_bmark_h100remote[]  = {
+static const struct button_mapping button_context_bmark_h100remote[] = {
     { ACTION_BMS_DELETE,      BUTTON_RC_REC,    BUTTON_NONE },
-    { ACTION_BMS_SELECT,      BUTTON_RC_MENU,     BUTTON_NONE },
-    {  ACTION_BMS_EXIT,       BUTTON_RC_STOP,    BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_settings_bmark */
 
 static const struct button_mapping *button_context_bmark_h300lcdremote =
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c
index 93de23b372..64c8908d0d 100644
--- a/apps/keymaps/keymap-ifp7xx.c
+++ b/apps/keymaps/keymap-ifp7xx.c
@@ -102,8 +102,7 @@ static const struct button_mapping button_context_yesno[]  = {
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,      BUTTON_MODE,     BUTTON_NONE },
-    { ACTION_STD_OK,            BUTTON_SELECT,   BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_settings_bmark */
 
 static const struct button_mapping button_context_quickscreen[]  = {
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 4e0fc1b862..b05db02aae 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -117,9 +117,7 @@ static const struct button_mapping button_context_yesno[]  = {
 
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,          BUTTON_MENU|BUTTON_REPEAT,       BUTTON_MENU },
-    { ACTION_BMS_SELECT,       BUTTON_SELECT,   BUTTON_NONE },
-    { ACTION_BMS_EXIT,         BUTTON_PLAY,      BUTTON_NONE },
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_settings_bmark */
 
 static const struct button_mapping button_context_quickscreen[]  = {
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 506444e094..10a27ca9c1 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -113,10 +113,8 @@ static const struct button_mapping button_context_yesno[] = {
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_NONE,              BUTTON_LEFT,                 BUTTON_NONE },
     { ACTION_BMS_DELETE,      BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_LEFT },
-    { ACTION_BMS_EXIT,        BUTTON_LEFT|BUTTON_REL,      BUTTON_LEFT },
-    { ACTION_BMS_SELECT,       BUTTON_RIGHT,   BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_settings_bmark */
 
 static const struct button_mapping button_context_pitchscreen[]  = {
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 1c0536d242..1062a23dd3 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -88,10 +88,8 @@ static const struct button_mapping button_context_yesno[]  = {
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_PLAY },
     { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_ON },
-    { ACTION_BMS_EXIT,        BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_BMS_SELECT,       BUTTON_PLAY|BUTTON_REL,   BUTTON_PLAY },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_settings_bmark */
 
 /*****************************************************************************
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 3dd8bbdd87..73fdbf0696 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -199,10 +199,8 @@ static const struct button_mapping button_context_keyboard[]  = {
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_PLAY },
     { ACTION_BMS_DELETE,      BUTTON_PLAY|BUTTON_ON,   BUTTON_ON },
-    { ACTION_BMS_EXIT,      BUTTON_OFF,                 BUTTON_NONE },
-    { ACTION_BMS_SELECT,       BUTTON_PLAY|BUTTON_REL,   BUTTON_PLAY },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
     
 }; /* button_context_settings_bmark */
 
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index b637e1ddd1..e5857512f0 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -76,10 +76,8 @@ static const struct button_mapping remote_button_context_standard[]  = {
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
     { ACTION_BMS_DELETE,       BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
-    { ACTION_BMS_SELECT,       BUTTON_SELECT,            BUTTON_NONE },
-    { ACTION_BMS_EXIT,         BUTTON_REC|BUTTON_REL,    BUTTON_REC },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_settings_bmark */
 
 /** FM Radio Screen **/