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

Accept FS#7313 - make the menus talk more often

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13679 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-06-21 12:32:10 +00:00
parent 3585ee7a3f
commit 0baad43a93
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/menu.c
View file

@ -391,6 +391,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
int stack_top = 0; int stack_top = 0;
bool in_stringlist, done = false; bool in_stringlist, done = false;
menu_callback_type menu_callback = NULL; menu_callback_type menu_callback = NULL;
bool talk_item = false;
if (start_menu == NULL) if (start_menu == NULL)
menu = &main_menu_; menu = &main_menu_;
else menu = start_menu; else menu = start_menu;
@ -413,6 +414,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
while (!done) while (!done)
{ {
talk_item = false;
gui_syncstatusbar_draw(&statusbars, true); gui_syncstatusbar_draw(&statusbars, true);
action = get_action(CONTEXT_MAINMENU,HZ); action = get_action(CONTEXT_MAINMENU,HZ);
/* HZ so the status bar redraws corectly */ /* HZ so the status bar redraws corectly */
@ -436,7 +438,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
if (gui_synclist_do_button(&lists,action,LIST_WRAP_UNLESS_HELD)) if (gui_synclist_do_button(&lists,action,LIST_WRAP_UNLESS_HELD))
{ {
talk_menu_item(menu, &lists); talk_item = true;
} }
else if (action == ACTION_TREE_WPS) else if (action == ACTION_TREE_WPS)
{ {
@ -477,9 +479,9 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
done = true; done = true;
init_menu_lists(menu, &lists, init_menu_lists(menu, &lists,
menu_stack_selected_item[stack_top], false); menu_stack_selected_item[stack_top], false);
talk_menu_item(menu, &lists);
/* new menu, so reload the callback */ /* new menu, so reload the callback */
get_menu_callback(menu, &menu_callback); get_menu_callback(menu, &menu_callback);
talk_item = true;
} }
else if (menu != &root_menu_) else if (menu != &root_menu_)
{ {
@ -519,12 +521,13 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
stack_top++; stack_top++;
init_menu_lists(temp, &lists, 0, true); init_menu_lists(temp, &lists, 0, true);
menu = temp; menu = temp;
talk_menu_item(menu, &lists); talk_item = true;
} }
break; break;
case MT_FUNCTION_CALL: case MT_FUNCTION_CALL:
{ {
int return_value; int return_value;
talk_item = true;
action_signalscreenchange(); action_signalscreenchange();
if (temp->flags&MENU_FUNC_USEPARAM) if (temp->flags&MENU_FUNC_USEPARAM)
return_value = temp->function->function_w_param( return_value = temp->function->function_w_param(
@ -546,6 +549,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
{ {
if (do_setting_from_menu(temp)) if (do_setting_from_menu(temp))
init_menu_lists(menu, &lists, 0, true); init_menu_lists(menu, &lists, 0, true);
talk_item = true;
break; break;
} }
case MT_RETURN_ID: case MT_RETURN_ID:
@ -562,6 +566,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
stack_top++; stack_top++;
menu = temp; menu = temp;
init_menu_lists(menu,&lists,0,false); init_menu_lists(menu,&lists,0,false);
talk_item = true;
in_stringlist = true; in_stringlist = true;
} }
break; break;
@ -596,6 +601,8 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
ret = MENU_ATTACHED_USB; ret = MENU_ATTACHED_USB;
done = true; done = true;
} }
if (talk_item && !done)
talk_menu_item(menu, &lists);
} }
action_signalscreenchange(); action_signalscreenchange();
if (start_selected) if (start_selected)