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/plugins/imageviewer/imageviewer.c | 4 +-- apps/plugins/lib/playback_control.c | 14 ++++---- apps/plugins/text_viewer/tv_menu.c | 61 ++++++++++++++++------------------ 3 files changed, 38 insertions(+), 41 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index a8ef3efc97..91c0950035 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c @@ -236,9 +236,9 @@ static bool set_option_dithering(void) } MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE), - set_option_grayscale, NULL, NULL, Icon_NOICON); + set_option_grayscale, NULL, Icon_NOICON); MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING), - set_option_dithering, NULL, NULL, Icon_NOICON); + set_option_dithering, NULL, Icon_NOICON); MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON, &grayscale_item, &dithering_item); diff --git a/apps/plugins/lib/playback_control.c b/apps/plugins/lib/playback_control.c index 363033b1f2..a7f5b8baff 100644 --- a/apps/plugins/lib/playback_control.c +++ b/apps/plugins/lib/playback_control.c @@ -91,19 +91,19 @@ static bool repeat_mode(void) return false; } MENUITEM_FUNCTION(prevtrack_item, 0, ID2P(LANG_PREVTRACK), - prevtrack, NULL, NULL, Icon_NOICON); + prevtrack, NULL, Icon_NOICON); MENUITEM_FUNCTION(playpause_item, 0, ID2P(LANG_PLAYPAUSE), - play, NULL, NULL, Icon_NOICON); + play, NULL, Icon_NOICON); MENUITEM_FUNCTION(stop_item, 0, ID2P(LANG_STOP_PLAYBACK), - stop, NULL, NULL, Icon_NOICON); + stop, NULL, Icon_NOICON); MENUITEM_FUNCTION(nexttrack_item, 0, ID2P(LANG_NEXTTRACK), - nexttrack, NULL, NULL, Icon_NOICON); + nexttrack, NULL, Icon_NOICON); MENUITEM_FUNCTION(volume_item, 0, ID2P(LANG_CHANGE_VOLUME), - volume, NULL, NULL, Icon_NOICON); + volume, NULL, Icon_NOICON); MENUITEM_FUNCTION(shuffle_item, 0, ID2P(LANG_CHANGE_SHUFFLE_MODE), - shuffle, NULL, NULL, Icon_NOICON); + shuffle, NULL, Icon_NOICON); MENUITEM_FUNCTION(repeat_mode_item, 0, ID2P(LANG_CHANGE_REPEAT_MODE), - repeat_mode, NULL, NULL, Icon_NOICON); + repeat_mode, NULL, Icon_NOICON); MAKE_MENU(playback_control_menu, ID2P(LANG_PLAYBACK_CONTROL), NULL, Icon_NOICON, &prevtrack_item, &playpause_item, &stop_item, &nexttrack_item, &volume_item, &shuffle_item, &repeat_mode_item); diff --git a/apps/plugins/text_viewer/tv_menu.c b/apps/plugins/text_viewer/tv_menu.c index 53e0adaf67..3d22794f62 100644 --- a/apps/plugins/text_viewer/tv_menu.c +++ b/apps/plugins/text_viewer/tv_menu.c @@ -51,10 +51,9 @@ static bool tv_horizontal_scroll_mode_setting(void) } MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar", - tv_horizontal_scrollbar_setting, - NULL, NULL, Icon_NOICON); + tv_horizontal_scrollbar_setting, NULL, Icon_NOICON); MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode", - tv_horizontal_scroll_mode_setting, NULL, NULL, Icon_NOICON); + tv_horizontal_scroll_mode_setting, NULL, Icon_NOICON); MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, &horizontal_scrollbar_item, @@ -103,16 +102,14 @@ static bool tv_narrow_mode_setting(void) } MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar", - tv_vertical_scrollbar_setting, - NULL, NULL, Icon_NOICON); + tv_vertical_scrollbar_setting, NULL, Icon_NOICON); MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode", - tv_vertical_scroll_mode_setting, NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, - NULL, NULL, Icon_NOICON); + tv_vertical_scroll_mode_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, NULL, Icon_NOICON); MENUITEM_FUNCTION(autoscroll_speed_item, 0, "Auto-Scroll Speed", - tv_autoscroll_speed_setting, NULL, NULL, Icon_NOICON); + tv_autoscroll_speed_setting, NULL, Icon_NOICON); MENUITEM_FUNCTION(narrow_mode_item, 0, "Left/Right Key (Narrow mode)", - tv_narrow_mode_setting, NULL, NULL, Icon_NOICON); + tv_narrow_mode_setting, NULL, Icon_NOICON); MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON, &vertical_scrollbar_item, @@ -240,29 +237,29 @@ static bool tv_night_mode_setting(void) } #endif -MENUITEM_FUNCTION(encoding_item, 0, "Encoding", tv_encoding_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", tv_word_wrap_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", tv_line_mode_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", tv_windows_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(alignment_item, 0, "Alignment", tv_alignment_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(header_item, 0, "Show Header", tv_header_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(footer_item, 0, "Show Footer", tv_footer_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", tv_statusbar_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(font_item, 0, "Font", tv_font_setting, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", tv_indent_spaces_setting, - NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION(encoding_item, 0, "Encoding", + tv_encoding_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", + tv_word_wrap_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", + tv_line_mode_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", + tv_windows_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(alignment_item, 0, "Alignment", + tv_alignment_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(header_item, 0, "Show Header", + tv_header_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(footer_item, 0, "Show Footer", + tv_footer_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", + tv_statusbar_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(font_item, 0, "Font", + tv_font_setting, NULL, Icon_NOICON); +MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", + tv_indent_spaces_setting, NULL, Icon_NOICON); #ifdef HAVE_LCD_COLOR -MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", tv_night_mode_setting, - NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", + tv_night_mode_setting, NULL, Icon_NOICON); #endif MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON, -- cgit v1.2.3