diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-10-06 11:47:41 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-10-06 11:47:41 +0000 |
| commit | 4443fcb558cffff69e6507d8cd5388e7345c0d73 (patch) | |
| tree | 01bd1d8a52fb5d1ea058a49e50fd23514f3997bc /apps/menus/main_menu.c | |
| parent | a819c7492c9f11dfa902fce3062394fa9492e892 (diff) | |
Accept FS#7864 - minor menu cleanup to move theme settings into a new themes menu. patch to update the manual would be welcome :p
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15003 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/main_menu.c')
| -rw-r--r-- | apps/menus/main_menu.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 822301fe52..2dd0899a3b 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -49,18 +49,7 @@ -struct browse_folder_info { - const char* dir; - int show_options; -}; -static struct browse_folder_info theme = {THEME_DIR, SHOW_CFG}; static struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; -int browse_folder(void *param) -{ - const struct browse_folder_info *info = - (const struct browse_folder_info*)param; - return rockbox_browse(info->dir, info->show_options); -} /***********************************/ /* MANAGE SETTINGS MENU */ @@ -454,8 +443,6 @@ MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_Questionmark, /***********************************/ /* MAIN MENU */ -MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_THEME), - browse_folder, (void*)&theme, NULL, Icon_Folder); #ifdef HAVE_LCD_CHARCELLS int mainmenu_callback(int action,const struct menu_item_ex *this_item) @@ -478,10 +465,11 @@ 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, - &settings_menu_item, &manage_settings, &browse_themes, + &settings_menu_item, &theme_menu, #ifdef HAVE_RECORDING &recording_settings, #endif + &manage_settings, ); /* MAIN MENU */ /***********************************/ |