diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-21 07:03:15 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-21 07:03:15 +0000 |
commit | d12f81ddd4a0cdd76d08540b70068b3cb2c985ed (patch) | |
tree | b821bfb025155f3c631920333549543622db3548 /apps/keymaps/keymap-x5.c | |
parent | c8e69dfb71d936b4bc5e18f6246ac126c629f772 (diff) | |
download | rockbox-d12f81ddd4a0cdd76d08540b70068b3cb2c985ed.tar.gz rockbox-d12f81ddd4a0cdd76d08540b70068b3cb2c985ed.zip |
fixed the settings action context, time/eq/colour chooser/dbug screens
should all work correctly again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10670 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-x5.c')
-rw-r--r-- | apps/keymaps/keymap-x5.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index 3752b35f9c..e92baf4dbe 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | /* CONTEXT_CUSTOM's used in this file... | 30 | /* CONTEXT_CUSTOM's used in this file... |
31 | 31 | ||
32 | CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions) | 32 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) |
33 | 33 | ||
34 | 34 | ||
35 | */ | 35 | */ |
@@ -104,7 +104,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { | |||
104 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 104 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
105 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 105 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
106 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 106 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
107 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), | 107 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
108 | }; | 108 | }; |
109 | 109 | ||
110 | const struct button_mapping button_context_yesno[] = { | 110 | const struct button_mapping button_context_yesno[] = { |
@@ -126,7 +126,7 @@ const struct button_mapping button_context_quickscreen[] = { | |||
126 | LAST_ITEM_IN_LIST | 126 | LAST_ITEM_IN_LIST |
127 | }; /* button_context_quickscreen */ | 127 | }; /* button_context_quickscreen */ |
128 | 128 | ||
129 | const struct button_mapping button_context_settingsgraphical[] = { | 129 | const struct button_mapping button_context_settings_r_is_inc[] = { |
130 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 130 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
131 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 131 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
132 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 132 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
@@ -246,8 +246,10 @@ const struct button_mapping* get_context_mapping( int context ) | |||
246 | case CONTEXT_WPS: | 246 | case CONTEXT_WPS: |
247 | return button_context_wps; | 247 | return button_context_wps; |
248 | 248 | ||
249 | case CONTEXT_SETTINGSGRAPHICAL: | 249 | case CONTEXT_SETTINGS_EQ: |
250 | return button_context_settingsgraphical; | 250 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
251 | case CONTEXT_SETTINGS_TIME: | ||
252 | return button_context_settings_r_is_inc; | ||
251 | 253 | ||
252 | case CONTEXT_SETTINGS: | 254 | case CONTEXT_SETTINGS: |
253 | return button_context_settings; | 255 | return button_context_settings; |
@@ -259,7 +261,8 @@ const struct button_mapping* get_context_mapping( int context ) | |||
259 | if (global_settings.hold_lr_for_scroll_in_list) | 261 | if (global_settings.hold_lr_for_scroll_in_list) |
260 | return button_context_tree_scroll_lr; | 262 | return button_context_tree_scroll_lr; |
261 | /* else fall through to CUSTOM|1 */ | 263 | /* else fall through to CUSTOM|1 */ |
262 | case CONTEXT_CUSTOM|1: | 264 | case CONTEXT_CUSTOM|CONTEXT_TREE |
265 | : | ||
263 | return button_context_tree; | 266 | return button_context_tree; |
264 | case CONTEXT_QUICKSCREEN: | 267 | case CONTEXT_QUICKSCREEN: |
265 | return button_context_quickscreen; | 268 | return button_context_quickscreen; |