diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/playback_control.c | 14 | ||||
-rw-r--r-- | apps/plugins/text_viewer/tv_menu.c | 61 |
3 files changed, 38 insertions, 41 deletions
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) | |||
236 | } | 236 | } |
237 | 237 | ||
238 | MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE), | 238 | MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE), |
239 | set_option_grayscale, NULL, NULL, Icon_NOICON); | 239 | set_option_grayscale, NULL, Icon_NOICON); |
240 | MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING), | 240 | MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING), |
241 | set_option_dithering, NULL, NULL, Icon_NOICON); | 241 | set_option_dithering, NULL, Icon_NOICON); |
242 | MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON, | 242 | MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON, |
243 | &grayscale_item, &dithering_item); | 243 | &grayscale_item, &dithering_item); |
244 | 244 | ||
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) | |||
91 | return false; | 91 | return false; |
92 | } | 92 | } |
93 | MENUITEM_FUNCTION(prevtrack_item, 0, ID2P(LANG_PREVTRACK), | 93 | MENUITEM_FUNCTION(prevtrack_item, 0, ID2P(LANG_PREVTRACK), |
94 | prevtrack, NULL, NULL, Icon_NOICON); | 94 | prevtrack, NULL, Icon_NOICON); |
95 | MENUITEM_FUNCTION(playpause_item, 0, ID2P(LANG_PLAYPAUSE), | 95 | MENUITEM_FUNCTION(playpause_item, 0, ID2P(LANG_PLAYPAUSE), |
96 | play, NULL, NULL, Icon_NOICON); | 96 | play, NULL, Icon_NOICON); |
97 | MENUITEM_FUNCTION(stop_item, 0, ID2P(LANG_STOP_PLAYBACK), | 97 | MENUITEM_FUNCTION(stop_item, 0, ID2P(LANG_STOP_PLAYBACK), |
98 | stop, NULL, NULL, Icon_NOICON); | 98 | stop, NULL, Icon_NOICON); |
99 | MENUITEM_FUNCTION(nexttrack_item, 0, ID2P(LANG_NEXTTRACK), | 99 | MENUITEM_FUNCTION(nexttrack_item, 0, ID2P(LANG_NEXTTRACK), |
100 | nexttrack, NULL, NULL, Icon_NOICON); | 100 | nexttrack, NULL, Icon_NOICON); |
101 | MENUITEM_FUNCTION(volume_item, 0, ID2P(LANG_CHANGE_VOLUME), | 101 | MENUITEM_FUNCTION(volume_item, 0, ID2P(LANG_CHANGE_VOLUME), |
102 | volume, NULL, NULL, Icon_NOICON); | 102 | volume, NULL, Icon_NOICON); |
103 | MENUITEM_FUNCTION(shuffle_item, 0, ID2P(LANG_CHANGE_SHUFFLE_MODE), | 103 | MENUITEM_FUNCTION(shuffle_item, 0, ID2P(LANG_CHANGE_SHUFFLE_MODE), |
104 | shuffle, NULL, NULL, Icon_NOICON); | 104 | shuffle, NULL, Icon_NOICON); |
105 | MENUITEM_FUNCTION(repeat_mode_item, 0, ID2P(LANG_CHANGE_REPEAT_MODE), | 105 | MENUITEM_FUNCTION(repeat_mode_item, 0, ID2P(LANG_CHANGE_REPEAT_MODE), |
106 | repeat_mode, NULL, NULL, Icon_NOICON); | 106 | repeat_mode, NULL, Icon_NOICON); |
107 | MAKE_MENU(playback_control_menu, ID2P(LANG_PLAYBACK_CONTROL), NULL, Icon_NOICON, | 107 | MAKE_MENU(playback_control_menu, ID2P(LANG_PLAYBACK_CONTROL), NULL, Icon_NOICON, |
108 | &prevtrack_item, &playpause_item, &stop_item, &nexttrack_item, | 108 | &prevtrack_item, &playpause_item, &stop_item, &nexttrack_item, |
109 | &volume_item, &shuffle_item, &repeat_mode_item); | 109 | &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) | |||
51 | } | 51 | } |
52 | 52 | ||
53 | MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar", | 53 | MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar", |
54 | tv_horizontal_scrollbar_setting, | 54 | tv_horizontal_scrollbar_setting, NULL, Icon_NOICON); |
55 | NULL, NULL, Icon_NOICON); | ||
56 | MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode", | 55 | MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode", |
57 | tv_horizontal_scroll_mode_setting, NULL, NULL, Icon_NOICON); | 56 | tv_horizontal_scroll_mode_setting, NULL, Icon_NOICON); |
58 | 57 | ||
59 | MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, | 58 | MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, |
60 | &horizontal_scrollbar_item, | 59 | &horizontal_scrollbar_item, |
@@ -103,16 +102,14 @@ static bool tv_narrow_mode_setting(void) | |||
103 | } | 102 | } |
104 | 103 | ||
105 | MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar", | 104 | MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar", |
106 | tv_vertical_scrollbar_setting, | 105 | tv_vertical_scrollbar_setting, NULL, Icon_NOICON); |
107 | NULL, NULL, Icon_NOICON); | ||
108 | MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode", | 106 | MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode", |
109 | tv_vertical_scroll_mode_setting, NULL, NULL, Icon_NOICON); | 107 | tv_vertical_scroll_mode_setting, NULL, Icon_NOICON); |
110 | MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, | 108 | MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, NULL, Icon_NOICON); |
111 | NULL, NULL, Icon_NOICON); | ||
112 | MENUITEM_FUNCTION(autoscroll_speed_item, 0, "Auto-Scroll Speed", | 109 | MENUITEM_FUNCTION(autoscroll_speed_item, 0, "Auto-Scroll Speed", |
113 | tv_autoscroll_speed_setting, NULL, NULL, Icon_NOICON); | 110 | tv_autoscroll_speed_setting, NULL, Icon_NOICON); |
114 | MENUITEM_FUNCTION(narrow_mode_item, 0, "Left/Right Key (Narrow mode)", | 111 | MENUITEM_FUNCTION(narrow_mode_item, 0, "Left/Right Key (Narrow mode)", |
115 | tv_narrow_mode_setting, NULL, NULL, Icon_NOICON); | 112 | tv_narrow_mode_setting, NULL, Icon_NOICON); |
116 | 113 | ||
117 | MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON, | 114 | MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON, |
118 | &vertical_scrollbar_item, | 115 | &vertical_scrollbar_item, |
@@ -240,29 +237,29 @@ static bool tv_night_mode_setting(void) | |||
240 | } | 237 | } |
241 | #endif | 238 | #endif |
242 | 239 | ||
243 | MENUITEM_FUNCTION(encoding_item, 0, "Encoding", tv_encoding_setting, | 240 | MENUITEM_FUNCTION(encoding_item, 0, "Encoding", |
244 | NULL, NULL, Icon_NOICON); | 241 | tv_encoding_setting, NULL, Icon_NOICON); |
245 | MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", tv_word_wrap_setting, | 242 | MENUITEM_FUNCTION(word_wrap_item, 0, "Word Wrap", |
246 | NULL, NULL, Icon_NOICON); | 243 | tv_word_wrap_setting, NULL, Icon_NOICON); |
247 | MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", tv_line_mode_setting, | 244 | MENUITEM_FUNCTION(line_mode_item, 0, "Line Mode", |
248 | NULL, NULL, Icon_NOICON); | 245 | tv_line_mode_setting, NULL, Icon_NOICON); |
249 | MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", tv_windows_setting, | 246 | MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", |
250 | NULL, NULL, Icon_NOICON); | 247 | tv_windows_setting, NULL, Icon_NOICON); |
251 | MENUITEM_FUNCTION(alignment_item, 0, "Alignment", tv_alignment_setting, | 248 | MENUITEM_FUNCTION(alignment_item, 0, "Alignment", |
252 | NULL, NULL, Icon_NOICON); | 249 | tv_alignment_setting, NULL, Icon_NOICON); |
253 | MENUITEM_FUNCTION(header_item, 0, "Show Header", tv_header_setting, | 250 | MENUITEM_FUNCTION(header_item, 0, "Show Header", |
254 | NULL, NULL, Icon_NOICON); | 251 | tv_header_setting, NULL, Icon_NOICON); |
255 | MENUITEM_FUNCTION(footer_item, 0, "Show Footer", tv_footer_setting, | 252 | MENUITEM_FUNCTION(footer_item, 0, "Show Footer", |
256 | NULL, NULL, Icon_NOICON); | 253 | tv_footer_setting, NULL, Icon_NOICON); |
257 | MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", tv_statusbar_setting, | 254 | MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", |
258 | NULL, NULL, Icon_NOICON); | 255 | tv_statusbar_setting, NULL, Icon_NOICON); |
259 | MENUITEM_FUNCTION(font_item, 0, "Font", tv_font_setting, | 256 | MENUITEM_FUNCTION(font_item, 0, "Font", |
260 | NULL, NULL, Icon_NOICON); | 257 | tv_font_setting, NULL, Icon_NOICON); |
261 | MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", tv_indent_spaces_setting, | 258 | MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", |
262 | NULL, NULL, Icon_NOICON); | 259 | tv_indent_spaces_setting, NULL, Icon_NOICON); |
263 | #ifdef HAVE_LCD_COLOR | 260 | #ifdef HAVE_LCD_COLOR |
264 | MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", tv_night_mode_setting, | 261 | MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", |
265 | NULL, NULL, Icon_NOICON); | 262 | tv_night_mode_setting, NULL, Icon_NOICON); |
266 | #endif | 263 | #endif |
267 | 264 | ||
268 | MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON, | 265 | MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON, |