diff options
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r-- | apps/menus/main_menu.c | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index bd7b35dea2..b91b2f5553 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -95,13 +95,14 @@ static int write_settings_file(void* param) | |||
95 | return settings_save_config((intptr_t)param); | 95 | return settings_save_config((intptr_t)param); |
96 | } | 96 | } |
97 | 97 | ||
98 | MENUITEM_FUNCTION_WPARAM(browse_configs, ID2P(LANG_CUSTOM_CFG), | 98 | MENUITEM_FUNCTION(browse_configs, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_CFG), |
99 | browse_folder, (void*)&config, NULL, Icon_NOICON); | 99 | browse_folder, (void*)&config, 0, NULL, Icon_NOICON); |
100 | MENUITEM_FUNCTION_WPARAM(save_settings_item, ID2P(LANG_SAVE_SETTINGS), | 100 | MENUITEM_FUNCTION(save_settings_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_SETTINGS), |
101 | write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON); | 101 | write_settings_file, (void*)SETTINGS_SAVE_ALL, 0, NULL, Icon_NOICON); |
102 | MENUITEM_FUNCTION_WPARAM(save_theme_item, ID2P(LANG_SAVE_THEME), | 102 | MENUITEM_FUNCTION(save_theme_item, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_THEME), |
103 | write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON); | 103 | write_settings_file, (void*)SETTINGS_SAVE_THEME, 0, NULL, Icon_NOICON); |
104 | MENUITEM_FUNCTION(reset_settings_item,ID2P(LANG_RESET),reset_settings, NULL, Icon_NOICON); | 104 | MENUITEM_FUNCTION(reset_settings_item, 0, ID2P(LANG_RESET), |
105 | reset_settings, NULL, 0, NULL, Icon_NOICON); | ||
105 | 106 | ||
106 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, | 107 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, |
107 | &browse_configs, &reset_settings_item, | 108 | &browse_configs, &reset_settings_item, |
@@ -339,8 +340,8 @@ static bool show_info(void) | |||
339 | action_signalscreenchange(); | 340 | action_signalscreenchange(); |
340 | return false; | 341 | return false; |
341 | } | 342 | } |
342 | MENUITEM_FUNCTION(show_info_item, ID2P(LANG_INFO_MENU), | 343 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU), |
343 | (menu_function)show_info, NULL, Icon_NOICON); | 344 | (menu_function)show_info, NULL, 0, NULL, Icon_NOICON); |
344 | 345 | ||
345 | 346 | ||
346 | /* sleep Menu */ | 347 | /* sleep Menu */ |
@@ -372,21 +373,23 @@ static int sleep_timer(void) | |||
372 | &sleep_timer_set, -5, 300, 0, sleep_timer_formatter); | 373 | &sleep_timer_set, -5, 300, 0, sleep_timer_formatter); |
373 | } | 374 | } |
374 | 375 | ||
375 | MENUITEM_FUNCTION(sleep_timer_call, ID2P(LANG_SLEEP_TIMER), sleep_timer, | 376 | MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer, |
376 | NULL, Icon_Menu_setting); /* make it look like a | 377 | NULL, 0, NULL, Icon_Menu_setting); /* make it look like a |
377 | setting to the user */ | 378 | setting to the user */ |
378 | MENUITEM_FUNCTION(show_credits_item, ID2P(LANG_VERSION), | 379 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_VERSION), |
379 | (menu_function)show_credits, NULL, Icon_NOICON); | 380 | (menu_function)show_credits, NULL, 0, NULL, Icon_NOICON); |
380 | MENUITEM_FUNCTION(show_runtime_item, ID2P(LANG_RUNNING_TIME), | 381 | MENUITEM_FUNCTION(show_runtime_item, 0, ID2P(LANG_RUNNING_TIME), |
381 | (menu_function)view_runtime, NULL, Icon_NOICON); | 382 | (menu_function)view_runtime, NULL, 0, NULL, Icon_NOICON); |
382 | MENUITEM_FUNCTION(debug_menu_item, ID2P(LANG_DEBUG), | 383 | MENUITEM_FUNCTION(debug_menu_item, 0, ID2P(LANG_DEBUG), |
383 | (menu_function)debug_menu, NULL, Icon_NOICON); | 384 | (menu_function)debug_menu, NULL, 0, NULL, Icon_NOICON); |
384 | #ifdef SIMULATOR | 385 | #ifdef SIMULATOR |
385 | MENUITEM_FUNCTION(simulate_usb_item, ID2P(LANG_USB), | 386 | MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB), |
386 | (menu_function)simulate_usb, NULL, Icon_NOICON); | 387 | (menu_function)simulate_usb, NULL, 0, NULL, Icon_NOICON); |
387 | #ifdef ROCKBOX_HAS_LOGF | 388 | #ifdef ROCKBOX_HAS_LOGF |
388 | MENUITEM_FUNCTION(logfdisplay_item, "logf",(int (*)(void)) logfdisplay, NULL, Icon_NOICON); | 389 | MENUITEM_FUNCTION(logfdisplay_item, 0, "logf", |
389 | MENUITEM_FUNCTION(logfdump_item, "logfdump",(int (*)(void)) logfdump, NULL, Icon_NOICON); | 390 | (int (*)(void)) logfdisplay, NULL, 0, NULL, Icon_NOICON); |
391 | MENUITEM_FUNCTION(logfdump_item, 0, "logfdump", | ||
392 | (int (*)(void)) logfdump, NULL, 0, NULL, Icon_NOICON); | ||
390 | #endif | 393 | #endif |
391 | #endif | 394 | #endif |
392 | 395 | ||
@@ -406,8 +409,8 @@ MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, Icon_Questionmark, | |||
406 | /***********************************/ | 409 | /***********************************/ |
407 | /* MAIN MENU */ | 410 | /* MAIN MENU */ |
408 | 411 | ||
409 | MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME), | 412 | MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_THEME), |
410 | browse_folder, (void*)&theme, NULL, Icon_Folder); | 413 | browse_folder, (void*)&theme, 0, NULL, Icon_Folder); |
411 | 414 | ||
412 | #ifdef HAVE_LCD_CHARCELLS | 415 | #ifdef HAVE_LCD_CHARCELLS |
413 | int mainmenu_callback(int action,const struct menu_item_ex *this_item) | 416 | int mainmenu_callback(int action,const struct menu_item_ex *this_item) |