summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristi Scarborough <christi@coraline.org>2005-07-04 09:24:31 +0000
committerChristi Scarborough <christi@coraline.org>2005-07-04 09:24:31 +0000
commitd0ec0cec10c96c59beeda505e4c42f625109fd64 (patch)
treec18d7ccd514540e71ab43e77dbc993c4eae954e6
parentfebd9750f1f89404a22a30be1313c1b4c4873f81 (diff)
downloadrockbox-d0ec0cec10c96c59beeda505e4c42f625109fd64.tar.gz
rockbox-d0ec0cec10c96c59beeda505e4c42f625109fd64.tar.bz2
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.c5
-rw-r--r--apps/settings_menu.c3
-rw-r--r--apps/settings_menu.h1
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)
int i = 0;
/* main menu */
- struct menu_item items[9];
+ struct menu_item items[10];
items[i].desc = ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS);
items[i++].function = bookmark_mrb_load;
@@ -379,6 +379,9 @@ bool main_menu(void)
items[i].desc = ID2P(LANG_GENERAL_SETTINGS);
items[i++].function = settings_menu;
+ items[i].desc = ID2P(LANG_MANAGE_MENU);
+ items[i++].function = manage_settings_menu;
+
#ifdef CONFIG_TUNER
if(radio_hardware_present()) {
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)
}
#endif
-static bool manage_settings_menu(void)
+bool manage_settings_menu(void)
{
int m;
bool result;
@@ -1542,7 +1542,6 @@ static bool system_settings_menu(void)
#ifdef HAVE_CHARGING
{ ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode },
#endif
- { ID2P(LANG_MANAGE_MENU), manage_settings_menu },
};
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 @@
#include "menu.h"
bool settings_menu(void);
+bool manage_settings_menu(void);
#endif