diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-03 13:52:14 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-03 13:52:14 +0000 |
commit | 02a871780fdc7e5193028a2eb8b250f88a70074b (patch) | |
tree | 6f3fecd827bba873464ff4a8dfc6fab88f0ace44 /apps/menus/settings_menu.c | |
parent | 7ae5f12449bcb2ddaf8b578e06d91ddfaa69df72 (diff) | |
download | rockbox-02a871780fdc7e5193028a2eb8b250f88a70074b.tar.gz rockbox-02a871780fdc7e5193028a2eb8b250f88a70074b.zip |
Remove the need to double up the MENU macros in manu.h.
Icons are now used by their id which must be part of the icons_6x8 enum,
or Icon_NOICON for none
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12571 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 34 |
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); | |||
47 | #endif | 47 | #endif |
48 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); | 48 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); |
49 | MENUITEM_FUNCTION(tc_init, ID2P(LANG_TAGCACHE_FORCE_UPDATE), | 49 | MENUITEM_FUNCTION(tc_init, ID2P(LANG_TAGCACHE_FORCE_UPDATE), |
50 | (int(*)(void))tagcache_rebuild, NULL, NOICON); | 50 | (int(*)(void))tagcache_rebuild, NULL, Icon_NOICON); |
51 | MENUITEM_FUNCTION(tc_update, ID2P(LANG_TAGCACHE_UPDATE), | 51 | MENUITEM_FUNCTION(tc_update, ID2P(LANG_TAGCACHE_UPDATE), |
52 | (int(*)(void))tagcache_update, NULL, NOICON); | 52 | (int(*)(void))tagcache_update, NULL, Icon_NOICON); |
53 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); | 53 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); |
54 | MENUITEM_FUNCTION(tc_export, ID2P(LANG_TAGCACHE_EXPORT), | 54 | MENUITEM_FUNCTION(tc_export, ID2P(LANG_TAGCACHE_EXPORT), |
55 | (int(*)(void))tagtree_export, NULL, NOICON); | 55 | (int(*)(void))tagtree_export, NULL, Icon_NOICON); |
56 | MENUITEM_FUNCTION(tc_import, ID2P(LANG_TAGCACHE_IMPORT), | 56 | MENUITEM_FUNCTION(tc_import, ID2P(LANG_TAGCACHE_IMPORT), |
57 | (int(*)(void))tagtree_import, NULL, NOICON); | 57 | (int(*)(void))tagtree_import, NULL, Icon_NOICON); |
58 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, NOICON, | 58 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, |
59 | #ifdef HAVE_TC_RAMCACHE | 59 | #ifdef HAVE_TC_RAMCACHE |
60 | &tagcache_ram, | 60 | &tagcache_ram, |
61 | #endif | 61 | #endif |
@@ -91,7 +91,7 @@ static int fileview_callback(int action,const struct menu_item_ex *this_item) | |||
91 | return action; | 91 | return action; |
92 | } | 92 | } |
93 | 93 | ||
94 | MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, bitmap_icons_6x8[Icon_file_view_menu], | 94 | MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, |
95 | &sort_case, &sort_dir, &sort_file, | 95 | &sort_case, &sort_dir, &sort_file, |
96 | &dirfilter, &browse_current, &show_path_in_browser); | 96 | &dirfilter, &browse_current, &show_path_in_browser); |
97 | /* FILE VIEW MENU */ | 97 | /* FILE VIEW MENU */ |
@@ -121,7 +121,7 @@ static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | |||
121 | MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); | 121 | MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); |
122 | #endif | 122 | #endif |
123 | #endif | 123 | #endif |
124 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, NOICON, | 124 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, |
125 | &battery_capacity, | 125 | &battery_capacity, |
126 | #if BATTERY_TYPES_COUNT > 1 | 126 | #if BATTERY_TYPES_COUNT > 1 |
127 | &battery_type, | 127 | &battery_type, |
@@ -160,7 +160,7 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item) | |||
160 | } | 160 | } |
161 | MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); | 161 | MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); |
162 | #endif | 162 | #endif |
163 | MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, NOICON, | 163 | MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, |
164 | &disk_spindown, | 164 | &disk_spindown, |
165 | #ifdef HAVE_DIRCACHE | 165 | #ifdef HAVE_DIRCACHE |
166 | &dircache, | 166 | &dircache, |
@@ -200,9 +200,9 @@ static int timedate_set(void) | |||
200 | return result; | 200 | return result; |
201 | } | 201 | } |
202 | 202 | ||
203 | MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL, NOICON); | 203 | MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL, Icon_NOICON); |
204 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); | 204 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); |
205 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, NOICON, &time_set, &timeformat); | 205 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat); |
206 | #endif | 206 | #endif |
207 | 207 | ||
208 | /* System menu */ | 208 | /* System menu */ |
@@ -210,13 +210,13 @@ MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | |||
210 | 210 | ||
211 | #ifdef HAVE_RTC_ALARM | 211 | #ifdef HAVE_RTC_ALARM |
212 | MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), | 212 | MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), |
213 | (menu_function)alarm_screen, NULL, NOICON); | 213 | (menu_function)alarm_screen, NULL, Icon_NOICON); |
214 | #endif | 214 | #endif |
215 | 215 | ||
216 | /* Limits menu */ | 216 | /* Limits menu */ |
217 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); | 217 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); |
218 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); | 218 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); |
219 | MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, NOICON, | 219 | MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, |
220 | &max_files_in_dir, &max_files_in_playlist); | 220 | &max_files_in_dir, &max_files_in_playlist); |
221 | 221 | ||
222 | #if CONFIG_CODEC == MAS3507D | 222 | #if CONFIG_CODEC == MAS3507D |
@@ -242,7 +242,7 @@ MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); | |||
242 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | 242 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); |
243 | 243 | ||
244 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | 244 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), |
245 | 0, bitmap_icons_6x8[Icon_System_menu], | 245 | 0, Icon_System_menu, |
246 | &start_screen, | 246 | &start_screen, |
247 | #ifndef SIMULATOR | 247 | #ifndef SIMULATOR |
248 | &battery_menu, | 248 | &battery_menu, |
@@ -294,7 +294,7 @@ MENUITEM_SETTING(autocreatebookmark, | |||
294 | MENUITEM_SETTING(autoloadbookmark, &global_settings.autoloadbookmark, NULL); | 294 | MENUITEM_SETTING(autoloadbookmark, &global_settings.autoloadbookmark, NULL); |
295 | MENUITEM_SETTING(usemrb, &global_settings.usemrb, NULL); | 295 | MENUITEM_SETTING(usemrb, &global_settings.usemrb, NULL); |
296 | MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0, | 296 | MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0, |
297 | bitmap_icons_6x8[Icon_Bookmark], | 297 | Icon_Bookmark, |
298 | &autocreatebookmark, &autoloadbookmark, &usemrb); | 298 | &autocreatebookmark, &autoloadbookmark, &usemrb); |
299 | /* BOOKMARK MENU */ | 299 | /* BOOKMARK MENU */ |
300 | /***********************************/ | 300 | /***********************************/ |
@@ -328,7 +328,7 @@ static int talk_callback(int action,const struct menu_item_ex *this_item) | |||
328 | } | 328 | } |
329 | return action; | 329 | return action; |
330 | } | 330 | } |
331 | MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, bitmap_icons_6x8[Icon_Voice], | 331 | MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, Icon_Voice, |
332 | &talk_menu, &talk_dir, &talk_file_item); | 332 | &talk_menu, &talk_dir, &talk_file_item); |
333 | /* VOICE MENU */ | 333 | /* VOICE MENU */ |
334 | /***********************************/ | 334 | /***********************************/ |
@@ -340,10 +340,10 @@ static int language_browse(void) | |||
340 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); | 340 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); |
341 | } | 341 | } |
342 | MENUITEM_FUNCTION(browse_langs, ID2P(LANG_LANGUAGE), language_browse, | 342 | MENUITEM_FUNCTION(browse_langs, ID2P(LANG_LANGUAGE), language_browse, |
343 | NULL, bitmap_icons_6x8[Icon_Language]); | 343 | NULL, Icon_Language); |
344 | 344 | ||
345 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | 345 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, |
346 | bitmap_icons_6x8[Icon_General_settings_menu], | 346 | Icon_General_settings_menu, |
347 | &playback_menu_item, &playlist_settings, &file_menu, | 347 | &playback_menu_item, &playlist_settings, &file_menu, |
348 | #ifdef HAVE_TAGCACHE | 348 | #ifdef HAVE_TAGCACHE |
349 | &tagcache_menu, | 349 | &tagcache_menu, |