summaryrefslogtreecommitdiffstats
path: root/apps/menus/main_menu.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-02-14 06:58:30 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-02-14 06:58:30 +0000
commit5599d6806d12d22b724d7967717edae07db3e08f (patch)
treeaccbaab8ecb8b3d7078daeb2df1d76a4b0ab67df /apps/menus/main_menu.c
parent7df87126f0ff5fea2554928db3d8ab7af06c6737 (diff)
downloadrockbox-5599d6806d12d22b724d7967717edae07db3e08f.tar.gz
rockbox-5599d6806d12d22b724d7967717edae07db3e08f.zip
Icons in the menus. Thanks midkay for them.
Any menus which dont yet show them are not converted to the new system. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12300 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r--apps/menus/main_menu.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index da9d47e767..886711853b 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -58,23 +58,24 @@ static int browse_folder(void *param)
return rockbox_browse(info->dir, info->show_options);
}
MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME),
- browse_folder, (void*)&theme, NULL);
+ browse_folder, (void*)&theme, NULL, bitmap_icons_6x8[Icon_Folder]);
MENUITEM_FUNCTION_WPARAM(browse_plugins, ID2P(LANG_PLUGINS),
- browse_folder, (void*)&rocks, NULL);
+ browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]);
#ifdef CONFIG_TUNER
MENUITEM_FUNCTION(load_radio_screen, ID2P(LANG_FM_RADIO),
- (menu_function)radio_screen, dynamicitem_callback);
+ (menu_function)radio_screen, dynamicitem_callback,
+ bitmap_icons_6x8[Icon_Radio_screen]);
#endif
#include "settings_menu.h"
MENUITEM_FUNCTION(manage_settings_menu_item, ID2P(LANG_MANAGE_MENU),
- (menu_function)manage_settings_menu, NULL);
+ (menu_function)manage_settings_menu, NULL, bitmap_icons_6x8[Icon_Config]);
bool info_menu(void); /* from apps/main_menu.c TEMP*/
MENUITEM_FUNCTION(info_menu_item, ID2P(LANG_INFO),
- (menu_function)info_menu, NULL);
+ (menu_function)info_menu, NULL, bitmap_icons_6x8[Icon_Questionmark]);
MENUITEM_FUNCTION(mrb_bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS),
- (menu_function)bookmark_mrb_load, NULL);
+ (menu_function)bookmark_mrb_load, NULL, bitmap_icons_6x8[Icon_Bookmark]);
#ifdef HAVE_LCD_CHARCELLS
static int do_shutdown(void)
@@ -82,12 +83,12 @@ static int do_shutdown(void)
sys_poweroff();
return 0;
}
-MENUITEM_FUNCTION(do_shutdown_item, ID2P(LANG_SHUTDOWN), do_shutdown, NULL);
+MENUITEM_FUNCTION(do_shutdown_item, ID2P(LANG_SHUTDOWN), do_shutdown, NULL, NOICON);
#endif
/* NOTE: This title will be translatable once we decide what to call this menu
when the root menu comes in... hopefully in the next few days */
-MAKE_MENU(main_menu_, "Rockbox Main Menu", NULL,
+MAKE_MENU(main_menu_, "Rockbox Main Menu", NULL, bitmap_icons_6x8[Icon_Submenu_Entered],
&mrb_bookmarks, &sound_settings,
&settings_menu_item, &manage_settings_menu_item, &browse_themes,
#ifdef CONFIG_TUNER