From 5599d6806d12d22b724d7967717edae07db3e08f Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 14 Feb 2007 06:58:30 +0000 Subject: 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 --- apps/menus/display_menu.c | 3 ++- apps/menus/main_menu.c | 17 +++++++++-------- apps/menus/playback_menu.c | 9 +++++---- apps/menus/playlist_menu.c | 9 +++++---- apps/menus/recording_menu.c | 7 ++++--- apps/menus/settings_menu.c | 37 +++++++++++++++++++++---------------- apps/menus/sound_menu.c | 8 ++++---- 7 files changed, 50 insertions(+), 40 deletions(-) (limited to 'apps/menus') diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index f44561338d..adb24395fa 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -29,4 +29,5 @@ #include "settings_menu.h" bool display_settings_menu(void); /* from ../settings_menu.c */ -MENUITEM_FUNCTION(display_menu,ID2P(LANG_DISPLAY),(menu_function)display_settings_menu,NULL); +MENUITEM_FUNCTION(display_menu,ID2P(LANG_DISPLAY), + (menu_function)display_settings_menu,NULL, bitmap_icons_6x8[Icon_Display_menu]); 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 diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 74a64831dd..7c0f75198d 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c @@ -60,7 +60,7 @@ MENUITEM_SETTING(resume, &global_settings.resume, NULL); MENUITEM_SETTING(ff_rewind_accel, &global_settings.ff_rewind_accel, NULL); MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); -MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, +MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, NOICON, &ff_rewind_min_step, &ff_rewind_accel); #if CONFIG_CODEC == SWCODEC int buffermargin_callback(int action,const struct menu_item_ex *this_item) @@ -95,7 +95,7 @@ MENUITEM_SETTING(crossfade_fade_out_duration, &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); MENUITEM_SETTING(crossfade_fade_out_mixmode, &global_settings.crossfade_fade_out_mixmode,NULL); -MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, +MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, NOICON, &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, &crossfade_fade_out_delay, &crossfade_fade_out_duration, &crossfade_fade_out_mixmode); @@ -117,7 +117,7 @@ MENUITEM_SETTING(replaygain, &global_settings.replaygain ,replaygain_callback); MENUITEM_SETTING(replaygain_noclip, &global_settings.replaygain_noclip ,replaygain_callback); MENUITEM_SETTING(replaygain_type, &global_settings.replaygain_type ,replaygain_callback); MENUITEM_SETTING(replaygain_preamp, &global_settings.replaygain_preamp ,replaygain_callback); -MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, +MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, NOICON, &replaygain,&replaygain_noclip, &replaygain_type,&replaygain_preamp); @@ -150,11 +150,12 @@ MENUITEM_SETTING(audioscrobbler, &global_settings.audioscrobbler, audioscrobbler MENUITEM_SETTING(unplug_mode, &global_settings.unplug_mode, NULL); MENUITEM_SETTING(unplug_rw, &global_settings.unplug_rw, NULL); MENUITEM_SETTING(unplug_autoresume, &global_settings.unplug_autoresume, NULL); -MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, +MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, NOICON, &unplug_mode, &unplug_rw, &unplug_autoresume); #endif MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, + bitmap_icons_6x8[Icon_Playback_menu], &shuffle_item, &repeat_mode, &play_selected, &resume, &ff_rewind_settings_menu, &buffer_margin, &fade_on_stop, &party_mode, diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index d9e6f780f7..f179265279 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c @@ -63,17 +63,18 @@ int save_playlist_screen(struct playlist_info* playlist) return 0; } MENUITEM_FUNCTION(create_playlist_item, ID2P(LANG_CREATE_PLAYLIST), - (int(*)(void))create_playlist, NULL); + (int(*)(void))create_playlist, NULL, NOICON); MENUITEM_FUNCTION(view_playlist, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), - (int(*)(void))playlist_viewer, NULL); + (int(*)(void))playlist_viewer, NULL, NOICON); MENUITEM_FUNCTION_WPARAM(save_playlist, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), - (int(*)(void*))save_playlist_screen, NULL, NULL); + (int(*)(void*))save_playlist_screen, NULL, NULL, NOICON); MENUITEM_FUNCTION(catalog, ID2P(LANG_CATALOG), - (int(*)(void))catalog_view_playlists, NULL); + (int(*)(void))catalog_view_playlists, NULL, NOICON); MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); MAKE_MENU(playlist_menu_item, ID2P(LANG_PLAYLIST_MENU), NULL, + bitmap_icons_6x8[Icon_Playlist], &create_playlist_item, &view_playlist, &save_playlist, &catalog, &recursive_dir_insert, &warn_on_erase); diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 84a3bc5402..0b4ba52715 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c @@ -30,12 +30,13 @@ #ifdef HAVE_RECORDING MENUITEM_FUNCTION(rec_menu_recording_screen_item, ID2P(LANG_RECORDING_MENU), - (menu_function)recording_screen, NULL); + (menu_function)recording_screen, NULL, NOICON); /* TEMP */ bool recording_menu(bool no_source); /* from apps/sound_menu.h */ MENUITEM_FUNCTION_WPARAM(recording_settings, ID2P(LANG_RECORDING_SETTINGS), - (int (*)(void*))recording_menu,0, NULL); + (int (*)(void*))recording_menu,0, NULL, NOICON); -MAKE_MENU(recording_settings_menu,ID2P(LANG_RECORDING),0, +MAKE_MENU(recording_settings_menu,ID2P(LANG_RECORDING), + 0, bitmap_icons_6x8[Icon_Recording], &rec_menu_recording_screen_item, &recording_settings); #endif diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index df39dc20ad..9743907344 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -47,15 +47,15 @@ MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL); #endif MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); MENUITEM_FUNCTION(tc_init, ID2P(LANG_TAGCACHE_FORCE_UPDATE), - (int(*)(void))tagcache_rebuild, NULL); + (int(*)(void))tagcache_rebuild, NULL, NOICON); MENUITEM_FUNCTION(tc_update, ID2P(LANG_TAGCACHE_UPDATE), - (int(*)(void))tagcache_update, NULL); + (int(*)(void))tagcache_update, NULL, NOICON); MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); MENUITEM_FUNCTION(tc_export, ID2P(LANG_TAGCACHE_EXPORT), - (int(*)(void))tagtree_export, NULL); + (int(*)(void))tagtree_export, NULL, NOICON); MENUITEM_FUNCTION(tc_import, ID2P(LANG_TAGCACHE_IMPORT), - (int(*)(void))tagtree_import, NULL); -MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, + (int(*)(void))tagtree_import, NULL, NOICON); +MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, NOICON, #ifdef HAVE_TC_RAMCACHE &tagcache_ram, #endif @@ -92,7 +92,8 @@ static int fileview_callback(int action,const struct menu_item_ex *this_item) return action; } -MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, &sort_case, &sort_dir, &sort_file, +MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, NOICON, + &sort_case, &sort_dir, &sort_file, &dirfilter, &browse_current, &show_icons, &show_path_in_browser, #ifdef HAVE_TAGCACHE &tagcache_menu @@ -125,7 +126,7 @@ static int usbcharging_callback(int action,const struct menu_item_ex *this_item) MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); #endif #endif -MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, +MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, NOICON, &battery_capacity, #if BATTERY_TYPES_COUNT > 1 &battery_type, @@ -164,7 +165,7 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item) } MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); #endif -MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, +MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, NOICON, &disk_spindown, #ifdef HAVE_DIRCACHE &dircache, @@ -204,9 +205,9 @@ static int timedate_set(void) return result; } -MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL); +MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL, NOICON); MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); -MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, &time_set, &timeformat); +MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, NOICON, &time_set, &timeformat); #endif /* System menu */ @@ -241,16 +242,16 @@ static int sleep_timer(void) &sleep_timer_set, 5, 0, 300, sleep_timer_formatter); } -MENUITEM_FUNCTION(sleep_timer_call, ID2P(LANG_SLEEP_TIMER), sleep_timer, NULL); +MENUITEM_FUNCTION(sleep_timer_call, ID2P(LANG_SLEEP_TIMER), sleep_timer, NULL, NOICON); #ifdef HAVE_ALARM_MOD MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), - (menu_function)alarm_screen, NULL); + (menu_function)alarm_screen, NULL, NOICON); #endif /* Limits menu */ MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); -MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, +MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, NOICON, &max_files_in_dir, &max_files_in_playlist); #if CONFIG_CODEC == MAS3507D @@ -274,7 +275,8 @@ MENUITEM_SETTING(line_in, &global_settings.line_in, linein_callback); MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); #endif -MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), 0, +MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), + 0, bitmap_icons_6x8[Icon_System_menu], #ifndef SIMULATOR &battery_menu, #endif @@ -326,6 +328,7 @@ MENUITEM_SETTING(autocreatebookmark, MENUITEM_SETTING(autoloadbookmark, &global_settings.autoloadbookmark, NULL); MENUITEM_SETTING(usemrb, &global_settings.usemrb, NULL); MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0, + bitmap_icons_6x8[Icon_Bookmark], &autocreatebookmark, &autoloadbookmark, &usemrb); /* BOOKMARK MENU */ /***********************************/ @@ -359,7 +362,7 @@ static int talk_callback(int action,const struct menu_item_ex *this_item) } return action; } -MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, +MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, bitmap_icons_6x8[Icon_Voice], &talk_menu, &talk_dir, &talk_file_item); /* VOICE MENU */ /***********************************/ @@ -370,9 +373,11 @@ static int language_browse(void) { return (int)rockbox_browse(LANG_DIR, SHOW_LNG); } -MENUITEM_FUNCTION(browse_langs, ID2P(LANG_LANGUAGE), language_browse, NULL); +MENUITEM_FUNCTION(browse_langs, ID2P(LANG_LANGUAGE), language_browse, + NULL, bitmap_icons_6x8[Icon_Language]); MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, + bitmap_icons_6x8[Icon_General_settings_menu], &playback_menu_item, &file_menu, &display_menu, &system_menu, &bookmark_settings_menu, &browse_langs, &voice_settings_menu ); /* SETTINGS MENU */ diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c index 8366981742..a8e86a7eed 100644 --- a/apps/menus/sound_menu.c +++ b/apps/menus/sound_menu.c @@ -75,17 +75,17 @@ MENUITEM_SETTING(stereo_width, &global_settings.stereo_width, soundmenu_callback &global_settings.crossfeed_hf_attenuation, soundmenu_callback); MENUITEM_SETTING(crossfeed_hf_cutoff, &global_settings.crossfeed_hf_cutoff, soundmenu_callback); - MAKE_MENU(crossfeed_menu,ID2P(LANG_CROSSFEED),soundmenu_callback, + MAKE_MENU(crossfeed_menu,ID2P(LANG_CROSSFEED),soundmenu_callback, NOICON, &crossfeed, &crossfeed_direct_gain, &crossfeed_cross_gain, &crossfeed_hf_attenuation, &crossfeed_hf_cutoff); MENUITEM_FUNCTION(equalizer_menu, ID2P(LANG_EQUALIZER), - (int(*)(void))eq_menu, NULL); + (int(*)(void))eq_menu, NULL, NOICON); MENUITEM_SETTING(dithering_enabled, &global_settings.dithering_enabled, soundmenu_callback); #ifdef HAVE_WM8758 MENUITEM_FUNCTION(hw_equalizer_menu, ID2P(LANG_EQUALIZER_HARDWARE), - (int(*)(void))eq_hw_menu, NULL); + (int(*)(void))eq_hw_menu, NULL, NOICON); #endif #endif @@ -102,7 +102,7 @@ MENUITEM_SETTING(stereo_width, &global_settings.stereo_width, soundmenu_callback -MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, +MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, bitmap_icons_6x8[Icon_Audio], &volume, #ifndef HAVE_TLV320 &bass,&treble, -- cgit v1.2.3