diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-17 09:28:04 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-08-17 09:28:04 +0000 |
commit | 07d3db2dec77f37154f1283d45f11db038d698f8 (patch) | |
tree | 285aec596320683ab9952c6c4a8f0667623a966a /apps | |
parent | 5b71470185e7ef5fe9fcea25fbb1c59ca16e3f4e (diff) | |
download | rockbox-07d3db2dec77f37154f1283d45f11db038d698f8.tar.gz rockbox-07d3db2dec77f37154f1283d45f11db038d698f8.zip |
really fix the yes/no screen now, also id3 viewer shows the status bar
correctly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10630 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.c | 3 | ||||
-rw-r--r-- | apps/gui/yesno.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 2 | ||||
-rw-r--r-- | apps/screens.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/apps/action.c b/apps/action.c index f65736c874..94f27ce2cf 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -111,8 +111,7 @@ int get_action_worker(int context, int timeout, | |||
111 | { | 111 | { |
112 | ignore_until_release = false; | 112 | ignore_until_release = false; |
113 | } | 113 | } |
114 | /*last_button = BUTTON_NONE; this is done by action_signalscreenchange() */ | 114 | return ACTION_NONE; /* "safest" return value */ |
115 | return ACTION_UNKNOWN; /* "safest" return value */ | ||
116 | } | 115 | } |
117 | #if (BUTTON_REMOTE != 0) | 116 | #if (BUTTON_REMOTE != 0) |
118 | if (soft_unlock_action != ACTION_NONE) | 117 | if (soft_unlock_action != ACTION_NONE) |
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index 2c3d6f7e10..6cb6ddb9aa 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -80,7 +80,8 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message, | |||
80 | case ACTION_YESNO_ACCEPT: | 80 | case ACTION_YESNO_ACCEPT: |
81 | result=YESNO_YES; | 81 | result=YESNO_YES; |
82 | break; | 82 | break; |
83 | 83 | case ACTION_NONE: | |
84 | continue; | ||
84 | default: | 85 | default: |
85 | if(default_event_handler(button) == SYS_USB_CONNECTED) | 86 | if(default_event_handler(button) == SYS_USB_CONNECTED) |
86 | return(YESNO_USB); | 87 | return(YESNO_USB); |
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 1ca4316879..2a6cf038f1 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -84,7 +84,7 @@ const struct button_mapping button_context_wps[] = { | |||
84 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 84 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
85 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 85 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
86 | { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, | 86 | { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, |
87 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_ON }, | 87 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, |
88 | 88 | ||
89 | LAST_ITEM_IN_LIST | 89 | LAST_ITEM_IN_LIST |
90 | }; /* button_context_wps */ | 90 | }; /* button_context_wps */ |
diff --git a/apps/screens.c b/apps/screens.c index d65f6ed457..e2e254581a 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -1118,13 +1118,13 @@ bool browse_id3(void) | |||
1118 | gui_synclist_draw(&id3_lists); | 1118 | gui_synclist_draw(&id3_lists); |
1119 | action_signalscreenchange(); | 1119 | action_signalscreenchange(); |
1120 | while (true) { | 1120 | while (true) { |
1121 | gui_syncstatusbar_draw(&statusbars, false); | ||
1121 | key = get_action(CONTEXT_LIST,HZ/2); | 1122 | key = get_action(CONTEXT_LIST,HZ/2); |
1122 | if(key!=ACTION_NONE && key!=ACTION_UNKNOWN && !gui_synclist_do_button(&id3_lists, key)) | 1123 | if(key!=ACTION_NONE && key!=ACTION_UNKNOWN && !gui_synclist_do_button(&id3_lists, key)) |
1123 | { | 1124 | { |
1124 | action_signalscreenchange(); | 1125 | action_signalscreenchange(); |
1125 | return(default_event_handler(key) == SYS_USB_CONNECTED); | 1126 | return(default_event_handler(key) == SYS_USB_CONNECTED); |
1126 | } | 1127 | } |
1127 | gui_syncstatusbar_draw(&statusbars, false); | ||
1128 | } | 1128 | } |
1129 | } | 1129 | } |
1130 | 1130 | ||