diff options
author | Christi Scarborough <christi@coraline.org> | 2005-07-04 09:24:31 +0000 |
---|---|---|
committer | Christi Scarborough <christi@coraline.org> | 2005-07-04 09:24:31 +0000 |
commit | d0ec0cec10c96c59beeda505e4c42f625109fd64 (patch) | |
tree | c18d7ccd514540e71ab43e77dbc993c4eae954e6 | |
parent | febd9750f1f89404a22a30be1313c1b4c4873f81 (diff) | |
download | rockbox-d0ec0cec10c96c59beeda505e4c42f625109fd64.tar.gz rockbox-d0ec0cec10c96c59beeda505e4c42f625109fd64.zip |
Move the 'manage settings' option onto the main menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7011 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/main_menu.c | 5 | ||||
-rw-r--r-- | apps/settings_menu.c | 3 | ||||
-rw-r--r-- | apps/settings_menu.h | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index 46a3e6f4a5..68d6699cd5 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -368,7 +368,7 @@ bool main_menu(void) | |||
368 | int i = 0; | 368 | int i = 0; |
369 | 369 | ||
370 | /* main menu */ | 370 | /* main menu */ |
371 | struct menu_item items[9]; | 371 | struct menu_item items[10]; |
372 | 372 | ||
373 | items[i].desc = ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS); | 373 | items[i].desc = ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS); |
374 | items[i++].function = bookmark_mrb_load; | 374 | items[i++].function = bookmark_mrb_load; |
@@ -379,6 +379,9 @@ bool main_menu(void) | |||
379 | items[i].desc = ID2P(LANG_GENERAL_SETTINGS); | 379 | items[i].desc = ID2P(LANG_GENERAL_SETTINGS); |
380 | items[i++].function = settings_menu; | 380 | items[i++].function = settings_menu; |
381 | 381 | ||
382 | items[i].desc = ID2P(LANG_MANAGE_MENU); | ||
383 | items[i++].function = manage_settings_menu; | ||
384 | |||
382 | #ifdef CONFIG_TUNER | 385 | #ifdef CONFIG_TUNER |
383 | if(radio_hardware_present()) { | 386 | if(radio_hardware_present()) { |
384 | items[i].desc = ID2P(LANG_FM_RADIO); | 387 | items[i].desc = ID2P(LANG_FM_RADIO); |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 3de8fa4b70..0889de7450 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1480,7 +1480,7 @@ static bool time_settings_menu(void) | |||
1480 | } | 1480 | } |
1481 | #endif | 1481 | #endif |
1482 | 1482 | ||
1483 | static bool manage_settings_menu(void) | 1483 | bool manage_settings_menu(void) |
1484 | { | 1484 | { |
1485 | int m; | 1485 | int m; |
1486 | bool result; | 1486 | bool result; |
@@ -1542,7 +1542,6 @@ static bool system_settings_menu(void) | |||
1542 | #ifdef HAVE_CHARGING | 1542 | #ifdef HAVE_CHARGING |
1543 | { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, | 1543 | { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, |
1544 | #endif | 1544 | #endif |
1545 | { ID2P(LANG_MANAGE_MENU), manage_settings_menu }, | ||
1546 | }; | 1545 | }; |
1547 | 1546 | ||
1548 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, | 1547 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
diff --git a/apps/settings_menu.h b/apps/settings_menu.h index 8ed8149022..619e17a894 100644 --- a/apps/settings_menu.h +++ b/apps/settings_menu.h | |||
@@ -22,5 +22,6 @@ | |||
22 | #include "menu.h" | 22 | #include "menu.h" |
23 | 23 | ||
24 | bool settings_menu(void); | 24 | bool settings_menu(void); |
25 | bool manage_settings_menu(void); | ||
25 | 26 | ||
26 | #endif | 27 | #endif |