summaryrefslogtreecommitdiff
path: root/apps/menus
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2008-10-13 15:11:11 +0000
committerNils Wallménius <nils@rockbox.org>2008-10-13 15:11:11 +0000
commit5aa0665b5b5522f7867e0ba26ab14e30712f9829 (patch)
treeca40e0772bed96d656e84ca306219291e885814f /apps/menus
parent4b7ebdc6f272e2fcfb5f2805ea91c19757d9aca9 (diff)
Move 'Playback Settings' up from 'General Settings' to 'Settings' (FS#9472 by William Poetra Yoga Hadisoeseno but without the menu rearrangement) also closes FS#9154. Update manual to reflect the menu change, Playback Settings is now its own chapter. As a bonus that makes it a bit easier to find stuff in the toc.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18799 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
-rw-r--r--apps/menus/main_menu.c1
-rw-r--r--apps/menus/settings_menu.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 3995eafd24..77322c6ef4 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -549,6 +549,7 @@ static int mainmenu_callback(int action,const struct menu_item_ex *this_item)
MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback,
Icon_Submenu_Entered,
&sound_settings,
+ &playback_settings,
&settings_menu_item, &theme_menu,
#ifdef HAVE_RECORDING
&recording_settings,
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 48ab316a87..60fc9c0cc0 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -499,7 +499,7 @@ MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse,
MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0,
Icon_General_settings_menu,
- &playback_settings, &playlist_settings, &file_menu,
+ &playlist_settings, &file_menu,
#ifdef HAVE_TAGCACHE
&tagcache_menu,
#endif