summaryrefslogtreecommitdiff
path: root/apps/keymaps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-07-15 10:30:11 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-07-15 10:30:11 +0000
commit3d73b8eb16b216637646aede5e81cc01886603e5 (patch)
tree1c566f07706dc3fd2aaab838ce597e392ae0143d /apps/keymaps
parentf22dd5195632a4d34f7b9b23f4fdad386477b265 (diff)
downloadrockbox-3d73b8eb16b216637646aede5e81cc01886603e5.tar.gz
rockbox-3d73b8eb16b216637646aede5e81cc01886603e5.zip
Use the multi-screen api in the usb and time screens
usb screen forces the status bar to display (fixes FS#700) time screen is now usable on the lcd remotes (need keymaps for the m5/x5) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13903 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps')
-rw-r--r--apps/keymaps/keymap-h1x0_h3x0.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 144b788323..0f5911aac7 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -710,6 +710,14 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = {
710}; 710};
711 711
712 712
713static const struct button_mapping button_context_time_remote[] = {
714 { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE },
715 { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE },
716 { ACTION_SETTINGS_INC, BUTTON_RC_BITRATE, BUTTON_NONE },
717 { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE, BUTTON_NONE },
718 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
719}; /* button_context_settings_bmark */
720
713/* the actual used tables */ 721/* the actual used tables */
714static const struct button_mapping 722static const struct button_mapping
715 *remote_btn_ctxt_std = 0, 723 *remote_btn_ctxt_std = 0,
@@ -878,7 +886,9 @@ static const struct button_mapping* get_context_mapping_remote(int context)
878 return remote_btn_ctxt_listtree_scroll_w_cmb; 886 return remote_btn_ctxt_listtree_scroll_w_cmb;
879 case CONTEXT_CUSTOM|CONTEXT_TREE: 887 case CONTEXT_CUSTOM|CONTEXT_TREE:
880 return remote_btn_ctxt_tree; 888 return remote_btn_ctxt_tree;
881 889 case CONTEXT_SETTINGS_TIME:
890 return remote_btn_ctxt_settingsgrph;
891
882 case CONTEXT_SETTINGS: 892 case CONTEXT_SETTINGS:
883 return remote_btn_ctxt_settings; 893 return remote_btn_ctxt_settings;
884 894