len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move the 'manage settings' option onto the main menu

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7011 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Christi Scarborough 2005-07-04 09:24:31 +00:00
parent febd9750f1
commit d0ec0cec10
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/main_menu.c
View file

@ -368,7 +368,7 @@ bool main_menu(void)
int i = 0; int i = 0;
/* main menu */ /* main menu */
struct menu_item items[9]; struct menu_item items[10];
items[i].desc = ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS); items[i].desc = ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS);
items[i++].function = bookmark_mrb_load; items[i++].function = bookmark_mrb_load;
@ -379,6 +379,9 @@ bool main_menu(void)
items[i].desc = ID2P(LANG_GENERAL_SETTINGS); items[i].desc = ID2P(LANG_GENERAL_SETTINGS);
items[i++].function = settings_menu; items[i++].function = settings_menu;
items[i].desc = ID2P(LANG_MANAGE_MENU);
items[i++].function = manage_settings_menu;
#ifdef CONFIG_TUNER #ifdef CONFIG_TUNER
if(radio_hardware_present()) { if(radio_hardware_present()) {
items[i].desc = ID2P(LANG_FM_RADIO); items[i].desc = ID2P(LANG_FM_RADIO);

3
apps/settings_menu.c
View file

@ -1480,7 +1480,7 @@ static bool time_settings_menu(void)
} }
#endif #endif
static bool manage_settings_menu(void) bool manage_settings_menu(void)
{ {
int m; int m;
bool result; bool result;
@ -1542,7 +1542,6 @@ static bool system_settings_menu(void)
#ifdef HAVE_CHARGING #ifdef HAVE_CHARGING
{ ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode },
#endif #endif
{ ID2P(LANG_MANAGE_MENU), manage_settings_menu },
}; };
m=menu_init( items, sizeof(items) / sizeof(*items), NULL, m=menu_init( items, sizeof(items) / sizeof(*items), NULL,

1
apps/settings_menu.h
View file

@ -22,5 +22,6 @@
#include "menu.h" #include "menu.h"
bool settings_menu(void); bool settings_menu(void);
bool manage_settings_menu(void);
#endif #endif