From c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sat, 17 Dec 2022 03:27:21 -0500 Subject: menus remove reserved 'param' parameter -- missed the plugin menu -- Change-Id: Iac2c9b0b8212ab5f3ac2ef90e1ac2723d212f86c --- apps/menus/theme_menu.c | 56 +++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) (limited to 'apps/menus/theme_menu.c') diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index de81169c66..60a2a27ef4 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c @@ -62,7 +62,7 @@ static int clear_main_backdrop(void) return 0; } MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), - clear_main_backdrop, NULL, NULL, Icon_NOICON); + clear_main_backdrop, NULL, Icon_NOICON); #endif #ifdef HAVE_LCD_COLOR @@ -130,19 +130,19 @@ static int reset_color(void) return 0; } MENUITEM_FUNCTION_W_PARAM(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), - set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_BG, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), - set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_FG, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), - set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_LSS, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), - set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_LSE, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), - set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_LST, NULL, Icon_NOICON); MENUITEM_FUNCTION_W_PARAM(set_sep_col, 0, ID2P(LANG_LIST_SEPARATOR_COLOR), - set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); + set_color_func, (void*)COLOR_SEP, NULL, Icon_NOICON); MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), - reset_color, NULL, NULL, Icon_NOICON); + reset_color, NULL, Icon_NOICON); MAKE_MENU(lss_settings, ID2P(LANG_SELECTOR_COLOR_MENU), NULL, Icon_NOICON, @@ -323,32 +323,25 @@ int browse_folder(void *param) return rockbox_browse(&browse); } -MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, - ID2P(LANG_CUSTOM_FONT), - browse_folder, (void*)&fonts, NULL, Icon_Font); +MENUITEM_FUNCTION_W_PARAM(browse_fonts, 0, ID2P(LANG_CUSTOM_FONT), + browse_folder, (void*)&fonts, NULL, Icon_Font); -MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, - ID2P(LANG_BASE_SKIN), - browse_folder, (void*)&sbs, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_sbs, 0, ID2P(LANG_BASE_SKIN), + browse_folder, (void*)&sbs, NULL, Icon_Wps); #if CONFIG_TUNER -MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, - ID2P(LANG_RADIOSCREEN), - browse_folder, (void*)&fms, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_fms, 0, ID2P(LANG_RADIOSCREEN), + browse_folder, (void*)&fms, NULL, Icon_Wps); #endif -MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, - ID2P(LANG_WHILE_PLAYING), - browse_folder, (void*)&wps, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_wps, 0, ID2P(LANG_WHILE_PLAYING), + browse_folder, (void*)&wps, NULL, Icon_Wps); #ifdef HAVE_REMOTE_LCD -MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, - ID2P(LANG_REMOTE_WHILE_PLAYING), - browse_folder, (void*)&rwps, NULL, Icon_Wps); -MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, - ID2P(LANG_REMOTE_BASE_SKIN), - browse_folder, (void*)&rsbs, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_rwps, 0, ID2P(LANG_REMOTE_WHILE_PLAYING), + browse_folder, (void*)&rwps, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_rsbs, 0, ID2P(LANG_REMOTE_BASE_SKIN), + browse_folder, (void*)&rsbs, NULL, Icon_Wps); #if CONFIG_TUNER -MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, - ID2P(LANG_REMOTE_RADIOSCREEN), - browse_folder, (void*)&rfms, NULL, Icon_Wps); +MENUITEM_FUNCTION_W_PARAM(browse_rfms, 0, ID2P(LANG_REMOTE_RADIOSCREEN), + browse_folder, (void*)&rfms, NULL, Icon_Wps); #endif #endif @@ -373,9 +366,8 @@ static int showicons_callback(int action, } MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); -MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, - ID2P(LANG_CUSTOM_THEME), - browse_folder, (void*)&themes, NULL, Icon_Config); +MENUITEM_FUNCTION_W_PARAM(browse_themes, 0, ID2P(LANG_CUSTOM_THEME), + browse_folder, (void*)&themes, NULL, Icon_Config); MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); #if LCD_DEPTH > 1 MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); -- cgit v1.2.3