summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-10-17 18:57:34 +0000
committerThomas Martitz <kugel@rockbox.org>2011-10-17 18:57:34 +0000
commite44af440c50e2d87fcb57a91a8036e108a3b7362 (patch)
treed9a1a8a4780d7c2368c086bfb2cb2fcb740a2cc7
parenta13e9644b5915215a0617d2c8b279886949f136b (diff)
downloadrockbox-e44af440c50e2d87fcb57a91a8036e108a3b7362.tar.gz
rockbox-e44af440c50e2d87fcb57a91a8036e108a3b7362.zip
Move Time & Date menu from System to settings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30776 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/menus/main_menu.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index e88317aeab..394ee7c343 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -441,14 +441,8 @@ MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG),
441 (menu_function)debug_menu, NULL, NULL, Icon_NOICON); 441 (menu_function)debug_menu, NULL, NULL, Icon_NOICON);
442 442
443MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, 443MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu,
444#if CONFIG_RTC 444 &show_info_item, &show_credits_item,
445 &timedate_item, 445 &show_runtime_item, &debug_menu_item);
446#endif
447 &show_info_item, &show_credits_item, &show_runtime_item,
448#if CONFIG_RTC == 0
449 &sleep_timer_call,
450#endif
451 &debug_menu_item);
452/* INFO MENU */ 446/* INFO MENU */
453/***********************************/ 447/***********************************/
454 448
@@ -482,6 +476,11 @@ MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback,
482#ifdef HAVE_RECORDING 476#ifdef HAVE_RECORDING
483 &recording_settings, 477 &recording_settings,
484#endif 478#endif
479#if CONFIG_RTC
480 &timedate_item,
481#else
482 &sleep_timer_call,
483#endif
485 &manage_settings, 484 &manage_settings,
486 ); 485 );
487/* MAIN MENU */ 486/* MAIN MENU */