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

Remove the exit_value variable.. set the MENU_FUNC_CHECK_RETVAL fla and

Browse source 
return 1 if you want your funciton to quit the menus.
save settings after clearing the background so it persists


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12827 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-03-18 07:03:43 +00:00
parent b5e587c081
commit e54d8e1388
9 changed files with 75 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

26
apps/menus/main_menu.c
View file

@ -96,13 +96,13 @@ static int write_settings_file(void* param)
}
MENUITEM_FUNCTION(browse_configs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG),
browse_folder, (void*)&config, 0, NULL, Icon_NOICON);
browse_folder, (void*)&config, NULL, Icon_NOICON);
MENUITEM_FUNCTION(save_settings_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_SETTINGS),
write_settings_file, (void*)SETTINGS_SAVE_ALL, 0, NULL, Icon_NOICON);
write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(save_theme_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_THEME),
write_settings_file, (void*)SETTINGS_SAVE_THEME, 0, NULL, Icon_NOICON);
write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON);
MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET),
reset_settings, NULL, 0, NULL, Icon_NOICON);
reset_settings, NULL, NULL, Icon_NOICON);
MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config,
&browse_configs, &reset_settings_item,
@ -341,7 +341,7 @@ static bool show_info(void)
return false;
}
MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU),
(menu_function)show_info, NULL, 0, NULL, Icon_NOICON);
(menu_function)show_info, NULL, NULL, Icon_NOICON);
/* sleep Menu */
@ -374,22 +374,22 @@ static int sleep_timer(void)
}
MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer,
NULL, 0, NULL, Icon_Menu_setting); /* make it look like a
NULL, NULL, Icon_Menu_setting); /* make it look like a
setting to the user */
MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_VERSION),
(menu_function)show_credits, NULL, 0, NULL, Icon_NOICON);
(menu_function)show_credits, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME),
(menu_function)view_runtime, NULL, 0, NULL, Icon_NOICON);
(menu_function)view_runtime, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG),
(menu_function)debug_menu, NULL, 0, NULL, Icon_NOICON);
(menu_function)debug_menu, NULL, NULL, Icon_NOICON);
#ifdef SIMULATOR
MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB),
(menu_function)simulate_usb, NULL, 0, NULL, Icon_NOICON);
(menu_function)simulate_usb, NULL, NULL, Icon_NOICON);
#ifdef ROCKBOX_HAS_LOGF
MENUITEM_FUNCTION(logfdisplay_item, 0, "logf",
(int (*)(void)) logfdisplay, NULL, 0, NULL, Icon_NOICON);
(int (*)(void)) logfdisplay, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(logfdump_item, 0, "logfdump",
(int (*)(void)) logfdump, NULL, 0, NULL, Icon_NOICON);
(int (*)(void)) logfdump, NULL, NULL, Icon_NOICON);
#endif
#endif
@ -410,7 +410,7 @@ MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, Icon_Questionmark,
/* MAIN MENU */
MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_THEME),
browse_folder, (void*)&theme, 0, NULL, Icon_Folder);
browse_folder, (void*)&theme, NULL, Icon_Folder);
#ifdef HAVE_LCD_CHARCELLS
int mainmenu_callback(int action,const struct menu_item_ex *this_item)