summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2012-02-24 18:04:21 -0500
committerMichael Giacomelli <giac2000@hotmail.com>2012-02-25 15:20:54 -0500
commit6b66b882ecf74a36ba7abf8e3003d052ce8a807b (patch)
tree93d220b371526e459a93f16808d4c34ceebe3fd0
parentb5cd5ce8a136e49b6c8b9d541a5b4928709a8956 (diff)
downloadrockbox-6b66b882ecf74a36ba7abf8e3003d052ce8a807b.tar.gz
rockbox-6b66b882ecf74a36ba7abf8e3003d052ce8a807b.zip
Commit FS#12288 - Sansa Clip+: "Home" in the main menu to WPS/Radio.
Author: Akio Idehara Change the keymap for all Sandisk Clip series players so that pressing home in the main menu will return to the last viewed of either the WPS or the radio screen. Change-Id: Id890bf3593a9e6313304c9f7bb3ceb9a36ea6f33
-rwxr-xr-xapps/keymaps/keymap-clip.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index ba5b8de6f6..83e1b4b86a 100755
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -165,6 +165,12 @@ static const struct button_mapping button_context_listtree_scroll_with_combo[]
165 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 165 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
166}; /* button_context_listtree_scroll_with_combo */ 166}; /* button_context_listtree_scroll_with_combo */
167 167
168static const struct button_mapping button_context_mainmenu[] = {
169 { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
170
171 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE),
172}; /* button_context_mainmenu */
173
168static const struct button_mapping button_context_yesno[] = { 174static const struct button_mapping button_context_yesno[] = {
169 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, 175 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
170 176
@@ -399,11 +405,12 @@ const struct button_mapping* get_context_mapping(int context)
399 case CONTEXT_LIST: 405 case CONTEXT_LIST:
400 return button_context_list; 406 return button_context_list;
401 case CONTEXT_TREE: 407 case CONTEXT_TREE:
402 case CONTEXT_MAINMENU:
403 if (global_settings.hold_lr_for_scroll_in_list) 408 if (global_settings.hold_lr_for_scroll_in_list)
404 return button_context_listtree_scroll_without_combo; 409 return button_context_listtree_scroll_without_combo;
405 else 410 else
406 return button_context_listtree_scroll_with_combo; 411 return button_context_listtree_scroll_with_combo;
412 case CONTEXT_MAINMENU:
413 return button_context_mainmenu;
407 case CONTEXT_CUSTOM|CONTEXT_TREE: 414 case CONTEXT_CUSTOM|CONTEXT_TREE:
408 return button_context_tree; 415 return button_context_tree;
409 416