summaryrefslogtreecommitdiffstats
path: root/apps/menus/settings_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r--apps/menus/settings_menu.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 8caa5fd8b0..690f9e62e4 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, NOICON);
+ (int(*)(void))tagcache_rebuild, NULL, Icon_NOICON);
MENUITEM_FUNCTION(tc_update, ID2P(LANG_TAGCACHE_UPDATE),
- (int(*)(void))tagcache_update, NULL, NOICON);
+ (int(*)(void))tagcache_update, NULL, Icon_NOICON);
MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL);
MENUITEM_FUNCTION(tc_export, ID2P(LANG_TAGCACHE_EXPORT),
- (int(*)(void))tagtree_export, NULL, NOICON);
+ (int(*)(void))tagtree_export, NULL, Icon_NOICON);
MENUITEM_FUNCTION(tc_import, ID2P(LANG_TAGCACHE_IMPORT),
- (int(*)(void))tagtree_import, NULL, NOICON);
-MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, NOICON,
+ (int(*)(void))tagtree_import, NULL, Icon_NOICON);
+MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON,
#ifdef HAVE_TC_RAMCACHE
&tagcache_ram,
#endif
@@ -91,7 +91,7 @@ static int fileview_callback(int action,const struct menu_item_ex *this_item)
return action;
}
-MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, bitmap_icons_6x8[Icon_file_view_menu],
+MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu,
&sort_case, &sort_dir, &sort_file,
&dirfilter, &browse_current, &show_path_in_browser);
/* FILE VIEW MENU */
@@ -121,7 +121,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, NOICON,
+MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
&battery_capacity,
#if BATTERY_TYPES_COUNT > 1
&battery_type,
@@ -160,7 +160,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, NOICON,
+MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON,
&disk_spindown,
#ifdef HAVE_DIRCACHE
&dircache,
@@ -200,9 +200,9 @@ static int timedate_set(void)
return result;
}
-MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL, NOICON);
+MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL, Icon_NOICON);
MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL);
-MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, NOICON, &time_set, &timeformat);
+MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat);
#endif
/* System menu */
@@ -210,13 +210,13 @@ MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL);
#ifdef HAVE_RTC_ALARM
MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU),
- (menu_function)alarm_screen, NULL, NOICON);
+ (menu_function)alarm_screen, NULL, Icon_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, NOICON,
+MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON,
&max_files_in_dir, &max_files_in_playlist);
#if CONFIG_CODEC == MAS3507D
@@ -242,7 +242,7 @@ MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL);
MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL);
MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
- 0, bitmap_icons_6x8[Icon_System_menu],
+ 0, Icon_System_menu,
&start_screen,
#ifndef SIMULATOR
&battery_menu,
@@ -294,7 +294,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],
+ Icon_Bookmark,
&autocreatebookmark, &autoloadbookmark, &usemrb);
/* BOOKMARK MENU */
/***********************************/
@@ -328,7 +328,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, bitmap_icons_6x8[Icon_Voice],
+MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, Icon_Voice,
&talk_menu, &talk_dir, &talk_file_item);
/* VOICE MENU */
/***********************************/
@@ -340,10 +340,10 @@ static int language_browse(void)
return (int)rockbox_browse(LANG_DIR, SHOW_LNG);
}
MENUITEM_FUNCTION(browse_langs, ID2P(LANG_LANGUAGE), language_browse,
- NULL, bitmap_icons_6x8[Icon_Language]);
+ NULL, Icon_Language);
MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0,
- bitmap_icons_6x8[Icon_General_settings_menu],
+ Icon_General_settings_menu,
&playback_menu_item, &playlist_settings, &file_menu,
#ifdef HAVE_TAGCACHE
&tagcache_menu,