devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

doh! those talk functions dont check the setting (which for some reason I thought they did).. shut the quickscreen up if talk is disabled

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17354 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-05-04 13:39:54 +00:00
parent a36c8f1db3
commit 1ef5a836f8
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
apps/gui/quickscreen.c
View file

@ -258,8 +258,9 @@ static bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button)
return false;
}
option_select_next_val((struct settings_list *)qs->items[item], false, true);
option_talk_value((struct settings_list *)qs->items[item],
option_value((struct settings_list *)qs->items[item]), false);
if (global_settings.talk_menu)
option_talk_value((struct settings_list *)qs->items[item],
option_value((struct settings_list *)qs->items[item]), false);
return true;
}
@ -282,17 +283,20 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter)
quickscreen_fix_viewports(qs, &screens[i], &vp[i]);
gui_quickscreen_draw(qs, &screens[i], &vp[i]);
}
talk_id(qs->items[QUICKSCREEN_LEFT]->lang_id, false);
option_talk_value(qs->items[QUICKSCREEN_LEFT],
option_value(qs->items[QUICKSCREEN_LEFT]), true);
talk_id(qs->items[QUICKSCREEN_RIGHT]->lang_id, true);
option_talk_value(qs->items[QUICKSCREEN_RIGHT],
option_value(qs->items[QUICKSCREEN_RIGHT]), true);
talk_id(qs->items[QUICKSCREEN_BOTTOM]->lang_id, true);
option_talk_value(qs->items[QUICKSCREEN_BOTTOM],
option_value(qs->items[QUICKSCREEN_BOTTOM]), true);
if (global_settings.talk_menu)
{
talk_id(qs->items[QUICKSCREEN_LEFT]->lang_id, false);
option_talk_value(qs->items[QUICKSCREEN_LEFT],
option_value(qs->items[QUICKSCREEN_LEFT]), true);
talk_id(qs->items[QUICKSCREEN_RIGHT]->lang_id, true);
option_talk_value(qs->items[QUICKSCREEN_RIGHT],
option_value(qs->items[QUICKSCREEN_RIGHT]), true);
talk_id(qs->items[QUICKSCREEN_BOTTOM]->lang_id, true);
option_talk_value(qs->items[QUICKSCREEN_BOTTOM],
option_value(qs->items[QUICKSCREEN_BOTTOM]), true);
}
while (true) {
button = get_action(CONTEXT_QUICKSCREEN,HZ/5);
if(default_event_handler(button) == SYS_USB_CONNECTED)