diff options
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index d150aac148..ace17a2055 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -62,15 +62,19 @@ static void tagcache_update_with_splash(void) | |||
62 | MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL); | 62 | MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL); |
63 | #endif | 63 | #endif |
64 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); | 64 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); |
65 | MENUITEM_FUNCTION(tc_init, ID2P(LANG_TAGCACHE_FORCE_UPDATE), | 65 | MENUITEM_FUNCTION(tc_init, 0, ID2P(LANG_TAGCACHE_FORCE_UPDATE), |
66 | (int(*)(void))tagcache_rebuild_with_splash, NULL, Icon_NOICON); | 66 | (int(*)(void))tagcache_rebuild_with_splash, |
67 | MENUITEM_FUNCTION(tc_update, ID2P(LANG_TAGCACHE_UPDATE), | 67 | NULL, 0, NULL, Icon_NOICON); |
68 | (int(*)(void))tagcache_update_with_splash, NULL, Icon_NOICON); | 68 | MENUITEM_FUNCTION(tc_update, 0, ID2P(LANG_TAGCACHE_UPDATE), |
69 | (int(*)(void))tagcache_update_with_splash, | ||
70 | NULL, 0, NULL, Icon_NOICON); | ||
69 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); | 71 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); |
70 | MENUITEM_FUNCTION(tc_export, ID2P(LANG_TAGCACHE_EXPORT), | 72 | MENUITEM_FUNCTION(tc_export, 0, ID2P(LANG_TAGCACHE_EXPORT), |
71 | (int(*)(void))tagtree_export, NULL, Icon_NOICON); | 73 | (int(*)(void))tagtree_export, NULL, 0, |
72 | MENUITEM_FUNCTION(tc_import, ID2P(LANG_TAGCACHE_IMPORT), | 74 | NULL, Icon_NOICON); |
73 | (int(*)(void))tagtree_import, NULL, Icon_NOICON); | 75 | MENUITEM_FUNCTION(tc_import, 0, ID2P(LANG_TAGCACHE_IMPORT), |
76 | (int(*)(void))tagtree_import, NULL, 0, | ||
77 | NULL, Icon_NOICON); | ||
74 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, | 78 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, |
75 | #ifdef HAVE_TC_RAMCACHE | 79 | #ifdef HAVE_TC_RAMCACHE |
76 | &tagcache_ram, | 80 | &tagcache_ram, |
@@ -216,7 +220,8 @@ static int timedate_set(void) | |||
216 | return result; | 220 | return result; |
217 | } | 221 | } |
218 | 222 | ||
219 | MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL, Icon_NOICON); | 223 | MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_TIME), |
224 | timedate_set, NULL, 0, NULL, Icon_NOICON); | ||
220 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); | 225 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); |
221 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat); | 226 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat); |
222 | #endif | 227 | #endif |
@@ -225,8 +230,8 @@ MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeforma | |||
225 | MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | 230 | MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); |
226 | 231 | ||
227 | #ifdef HAVE_RTC_ALARM | 232 | #ifdef HAVE_RTC_ALARM |
228 | MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), | 233 | MENUITEM_FUNCTION(alarm_screen_call, 0, ID2P(LANG_ALARM_MOD_ALARM_MENU), |
229 | (menu_function)alarm_screen, NULL, Icon_NOICON); | 234 | (menu_function)alarm_screen, NULL, 0, NULL, Icon_NOICON); |
230 | #if CONFIG_TUNER || defined(HAVE_RECORDING) | 235 | #if CONFIG_TUNER || defined(HAVE_RECORDING) |
231 | 236 | ||
232 | #if CONFIG_TUNER && !defined(HAVE_RECORDING) | 237 | #if CONFIG_TUNER && !defined(HAVE_RECORDING) |
@@ -275,8 +280,8 @@ static int alarm_setting(void) | |||
275 | INT, items, i, NULL); | 280 | INT, items, i, NULL); |
276 | } | 281 | } |
277 | 282 | ||
278 | MENUITEM_FUNCTION(alarm_wake_up_screen, ID2P(LANG_ALARM_WAKEUP_SCREEN), | 283 | MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), |
279 | alarm_setting, alarm_callback, Icon_Menu_setting); | 284 | alarm_setting, NULL, 0, alarm_callback, Icon_Menu_setting); |
280 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ | 285 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ |
281 | #endif /* HAVE_RTC_ALARM */ | 286 | #endif /* HAVE_RTC_ALARM */ |
282 | 287 | ||
@@ -409,8 +414,8 @@ static int language_browse(void) | |||
409 | { | 414 | { |
410 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); | 415 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); |
411 | } | 416 | } |
412 | MENUITEM_FUNCTION(browse_langs, ID2P(LANG_LANGUAGE), language_browse, | 417 | MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse, |
413 | NULL, Icon_Language); | 418 | NULL, 0, NULL, Icon_Language); |
414 | 419 | ||
415 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | 420 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, |
416 | Icon_General_settings_menu, | 421 | Icon_General_settings_menu, |