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-ondio.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-ondio.c')
-rw-r--r-- | apps/keymaps/keymap-ondio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index 57bdcc324a..141d23b5d1 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | /* CONTEXT_CUSTOM's used in this file... | 28 | /* CONTEXT_CUSTOM's used in this file... |
29 | 29 | ||
30 | CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions) | 30 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) |
31 | 31 | ||
32 | 32 | ||
33 | */ | 33 | */ |
@@ -95,7 +95,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { | |||
95 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 95 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
96 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 96 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
97 | 97 | ||
98 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1), | 98 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
99 | }; | 99 | }; |
100 | 100 | ||
101 | const struct button_mapping button_context_yesno[] = { | 101 | const struct button_mapping button_context_yesno[] = { |
@@ -106,7 +106,7 @@ const struct button_mapping button_context_yesno[] = { | |||
106 | 106 | ||
107 | struct button_mapping button_context_bmark[] = { | 107 | struct button_mapping button_context_bmark[] = { |
108 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 108 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
109 | { ACTION_BMARK_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 109 | { ACTION_BMS_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
110 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 110 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
111 | 111 | ||
112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), | 112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), |
@@ -160,8 +160,8 @@ const struct button_mapping* get_context_mapping( int context ) | |||
160 | case CONTEXT_TREE: | 160 | case CONTEXT_TREE: |
161 | if (global_settings.hold_lr_for_scroll_in_list) | 161 | if (global_settings.hold_lr_for_scroll_in_list) |
162 | return button_context_tree_scroll_lr; | 162 | return button_context_tree_scroll_lr; |
163 | /* else fall through to CUSTOM|1 */ | 163 | /* else fall through to CUSTOM|CONTEXT_TREE */ |
164 | case CONTEXT_CUSTOM|1: | 164 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
165 | return button_context_tree; | 165 | return button_context_tree; |
166 | case CONTEXT_RECSCREEN: | 166 | case CONTEXT_RECSCREEN: |
167 | return button_context_recscreen; | 167 | return button_context_recscreen; |