diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-09-11 12:53:46 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-09-11 12:53:46 +0000 |
commit | 7343863a2163a00a14725eb9420e7fda5707fef4 (patch) | |
tree | fb5c337477ba74aa7ba7fb9af2bbb7c4777cd2fc /apps | |
parent | c4379c533c0da1544f88ba766521a20a2f67ae14 (diff) | |
download | rockbox-7343863a2163a00a14725eb9420e7fda5707fef4.tar.gz rockbox-7343863a2163a00a14725eb9420e7fda5707fef4.zip |
dont use power to go up a level in menus on x5 (blame jhMikeS) take 2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10930 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-x5.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index a980cfaad2..05985fedb1 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -84,11 +84,13 @@ const struct button_mapping button_context_settings[] = { | |||
84 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 84 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
85 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 85 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
86 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 86 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
87 | { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, | ||
88 | 87 | ||
89 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 88 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
90 | }; | 89 | }; |
91 | 90 | const struct button_mapping button_context_menu[] = { | |
91 | { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, | ||
92 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
93 | }; | ||
92 | const struct button_mapping button_context_tree[] = { | 94 | const struct button_mapping button_context_tree[] = { |
93 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, | 95 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, |
94 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 96 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
@@ -297,8 +299,10 @@ const struct button_mapping* get_context_mapping( int context ) | |||
297 | case CONTEXT_KEYBOARD: | 299 | case CONTEXT_KEYBOARD: |
298 | return button_context_keyboard; | 300 | return button_context_keyboard; |
299 | 301 | ||
300 | case CONTEXT_LIST: | ||
301 | case CONTEXT_MAINMENU: | 302 | case CONTEXT_MAINMENU: |
303 | return button_context_menu; | ||
304 | |||
305 | case CONTEXT_LIST: | ||
302 | default: | 306 | default: |
303 | return button_context_standard; | 307 | return button_context_standard; |
304 | } | 308 | } |