diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/quickscreen.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 36f3d82217..a2770a3586 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -258,8 +258,9 @@ static bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button) | |||
258 | return false; | 258 | return false; |
259 | } | 259 | } |
260 | option_select_next_val((struct settings_list *)qs->items[item], false, true); | 260 | option_select_next_val((struct settings_list *)qs->items[item], false, true); |
261 | option_talk_value((struct settings_list *)qs->items[item], | 261 | if (global_settings.talk_menu) |
262 | option_value((struct settings_list *)qs->items[item]), false); | 262 | option_talk_value((struct settings_list *)qs->items[item], |
263 | option_value((struct settings_list *)qs->items[item]), false); | ||
263 | return true; | 264 | return true; |
264 | } | 265 | } |
265 | 266 | ||
@@ -282,17 +283,20 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter) | |||
282 | quickscreen_fix_viewports(qs, &screens[i], &vp[i]); | 283 | quickscreen_fix_viewports(qs, &screens[i], &vp[i]); |
283 | gui_quickscreen_draw(qs, &screens[i], &vp[i]); | 284 | gui_quickscreen_draw(qs, &screens[i], &vp[i]); |
284 | } | 285 | } |
285 | talk_id(qs->items[QUICKSCREEN_LEFT]->lang_id, false); | 286 | if (global_settings.talk_menu) |
286 | option_talk_value(qs->items[QUICKSCREEN_LEFT], | 287 | { |
287 | option_value(qs->items[QUICKSCREEN_LEFT]), true); | 288 | talk_id(qs->items[QUICKSCREEN_LEFT]->lang_id, false); |
288 | 289 | option_talk_value(qs->items[QUICKSCREEN_LEFT], | |
289 | talk_id(qs->items[QUICKSCREEN_RIGHT]->lang_id, true); | 290 | option_value(qs->items[QUICKSCREEN_LEFT]), true); |
290 | option_talk_value(qs->items[QUICKSCREEN_RIGHT], | 291 | |
291 | option_value(qs->items[QUICKSCREEN_RIGHT]), true); | 292 | talk_id(qs->items[QUICKSCREEN_RIGHT]->lang_id, true); |
292 | 293 | option_talk_value(qs->items[QUICKSCREEN_RIGHT], | |
293 | talk_id(qs->items[QUICKSCREEN_BOTTOM]->lang_id, true); | 294 | option_value(qs->items[QUICKSCREEN_RIGHT]), true); |
294 | option_talk_value(qs->items[QUICKSCREEN_BOTTOM], | 295 | |
295 | option_value(qs->items[QUICKSCREEN_BOTTOM]), true); | 296 | talk_id(qs->items[QUICKSCREEN_BOTTOM]->lang_id, true); |
297 | option_talk_value(qs->items[QUICKSCREEN_BOTTOM], | ||
298 | option_value(qs->items[QUICKSCREEN_BOTTOM]), true); | ||
299 | } | ||
296 | while (true) { | 300 | while (true) { |
297 | button = get_action(CONTEXT_QUICKSCREEN,HZ/5); | 301 | button = get_action(CONTEXT_QUICKSCREEN,HZ/5); |
298 | if(default_event_handler(button) == SYS_USB_CONNECTED) | 302 | if(default_event_handler(button) == SYS_USB_CONNECTED) |