diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/plugins/text_viewer/tv_menu.c | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'apps/plugins/text_viewer/tv_menu.c')
-rw-r--r-- | apps/plugins/text_viewer/tv_menu.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/apps/plugins/text_viewer/tv_menu.c b/apps/plugins/text_viewer/tv_menu.c index 01fb052151..53e0adaf67 100644 --- a/apps/plugins/text_viewer/tv_menu.c +++ b/apps/plugins/text_viewer/tv_menu.c | |||
@@ -34,12 +34,10 @@ static struct tv_preferences new_prefs; | |||
34 | /* horizontal scroll settings menu */ | 34 | /* horizontal scroll settings menu */ |
35 | /* */ | 35 | /* */ |
36 | 36 | ||
37 | #ifdef HAVE_LCD_BITMAP | ||
38 | static bool tv_horizontal_scrollbar_setting(void) | 37 | static bool tv_horizontal_scrollbar_setting(void) |
39 | { | 38 | { |
40 | return rb->set_bool("Horizontal Scrollbar", &new_prefs.horizontal_scrollbar); | 39 | return rb->set_bool("Horizontal Scrollbar", &new_prefs.horizontal_scrollbar); |
41 | } | 40 | } |
42 | #endif | ||
43 | 41 | ||
44 | static bool tv_horizontal_scroll_mode_setting(void) | 42 | static bool tv_horizontal_scroll_mode_setting(void) |
45 | { | 43 | { |
@@ -52,30 +50,24 @@ static bool tv_horizontal_scroll_mode_setting(void) | |||
52 | names, 2, NULL); | 50 | names, 2, NULL); |
53 | } | 51 | } |
54 | 52 | ||
55 | #ifdef HAVE_LCD_BITMAP | ||
56 | MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar", | 53 | MENUITEM_FUNCTION(horizontal_scrollbar_item, 0, "Scrollbar", |
57 | tv_horizontal_scrollbar_setting, | 54 | tv_horizontal_scrollbar_setting, |
58 | NULL, NULL, Icon_NOICON); | 55 | NULL, NULL, Icon_NOICON); |
59 | #endif | ||
60 | MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode", | 56 | MENUITEM_FUNCTION(horizontal_scroll_mode_item, 0, "Scroll Mode", |
61 | tv_horizontal_scroll_mode_setting, NULL, NULL, Icon_NOICON); | 57 | tv_horizontal_scroll_mode_setting, NULL, NULL, Icon_NOICON); |
62 | 58 | ||
63 | MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, | 59 | MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, |
64 | #ifdef HAVE_LCD_BITMAP | ||
65 | &horizontal_scrollbar_item, | 60 | &horizontal_scrollbar_item, |
66 | #endif | ||
67 | &horizontal_scroll_mode_item); | 61 | &horizontal_scroll_mode_item); |
68 | 62 | ||
69 | /* */ | 63 | /* */ |
70 | /* vertical scroll settings menu */ | 64 | /* vertical scroll settings menu */ |
71 | /* */ | 65 | /* */ |
72 | 66 | ||
73 | #ifdef HAVE_LCD_BITMAP | ||
74 | static bool tv_vertical_scrollbar_setting(void) | 67 | static bool tv_vertical_scrollbar_setting(void) |
75 | { | 68 | { |
76 | return rb->set_bool("Vertical Scrollbar", &new_prefs.vertical_scrollbar); | 69 | return rb->set_bool("Vertical Scrollbar", &new_prefs.vertical_scrollbar); |
77 | } | 70 | } |
78 | #endif | ||
79 | 71 | ||
80 | static bool tv_vertical_scroll_mode_setting(void) | 72 | static bool tv_vertical_scroll_mode_setting(void) |
81 | { | 73 | { |
@@ -110,11 +102,9 @@ static bool tv_narrow_mode_setting(void) | |||
110 | names, 2, NULL); | 102 | names, 2, NULL); |
111 | } | 103 | } |
112 | 104 | ||
113 | #ifdef HAVE_LCD_BITMAP | ||
114 | MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar", | 105 | MENUITEM_FUNCTION(vertical_scrollbar_item, 0, "Scrollbar", |
115 | tv_vertical_scrollbar_setting, | 106 | tv_vertical_scrollbar_setting, |
116 | NULL, NULL, Icon_NOICON); | 107 | NULL, NULL, Icon_NOICON); |
117 | #endif | ||
118 | MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode", | 108 | MENUITEM_FUNCTION(vertical_scroll_mode_item, 0, "Scroll Mode", |
119 | tv_vertical_scroll_mode_setting, NULL, NULL, Icon_NOICON); | 109 | tv_vertical_scroll_mode_setting, NULL, NULL, Icon_NOICON); |
120 | MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, | 110 | MENUITEM_FUNCTION(overlap_page_mode_item, 0, "Overlap Pages", tv_overlap_page_mode_setting, |
@@ -125,9 +115,7 @@ MENUITEM_FUNCTION(narrow_mode_item, 0, "Left/Right Key (Narrow mode)", | |||
125 | tv_narrow_mode_setting, NULL, NULL, Icon_NOICON); | 115 | tv_narrow_mode_setting, NULL, NULL, Icon_NOICON); |
126 | 116 | ||
127 | MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON, | 117 | MAKE_MENU(vertical_scroll_menu, "Vertical", NULL, Icon_NOICON, |
128 | #ifdef HAVE_LCD_BITMAP | ||
129 | &vertical_scrollbar_item, | 118 | &vertical_scrollbar_item, |
130 | #endif | ||
131 | &vertical_scroll_mode_item, &overlap_page_mode_item, &autoscroll_speed_item, | 119 | &vertical_scroll_mode_item, &overlap_page_mode_item, &autoscroll_speed_item, |
132 | &narrow_mode_item); | 120 | &narrow_mode_item); |
133 | 121 | ||
@@ -198,7 +186,6 @@ static bool tv_alignment_setting(void) | |||
198 | names , 2, NULL); | 186 | names , 2, NULL); |
199 | } | 187 | } |
200 | 188 | ||
201 | #ifdef HAVE_LCD_BITMAP | ||
202 | static bool tv_header_setting(void) | 189 | static bool tv_header_setting(void) |
203 | { | 190 | { |
204 | return rb->set_bool("Show Header", &new_prefs.header_mode); | 191 | return rb->set_bool("Show Header", &new_prefs.header_mode); |
@@ -239,7 +226,6 @@ static bool tv_font_setting(void) | |||
239 | 226 | ||
240 | return false; | 227 | return false; |
241 | } | 228 | } |
242 | #endif | ||
243 | 229 | ||
244 | static bool tv_indent_spaces_setting(void) | 230 | static bool tv_indent_spaces_setting(void) |
245 | { | 231 | { |
@@ -264,7 +250,6 @@ MENUITEM_FUNCTION(windows_item, 0, "Screens Per Page", tv_windows_setting, | |||
264 | NULL, NULL, Icon_NOICON); | 250 | NULL, NULL, Icon_NOICON); |
265 | MENUITEM_FUNCTION(alignment_item, 0, "Alignment", tv_alignment_setting, | 251 | MENUITEM_FUNCTION(alignment_item, 0, "Alignment", tv_alignment_setting, |
266 | NULL, NULL, Icon_NOICON); | 252 | NULL, NULL, Icon_NOICON); |
267 | #ifdef HAVE_LCD_BITMAP | ||
268 | MENUITEM_FUNCTION(header_item, 0, "Show Header", tv_header_setting, | 253 | MENUITEM_FUNCTION(header_item, 0, "Show Header", tv_header_setting, |
269 | NULL, NULL, Icon_NOICON); | 254 | NULL, NULL, Icon_NOICON); |
270 | MENUITEM_FUNCTION(footer_item, 0, "Show Footer", tv_footer_setting, | 255 | MENUITEM_FUNCTION(footer_item, 0, "Show Footer", tv_footer_setting, |
@@ -273,7 +258,6 @@ MENUITEM_FUNCTION(statusbar_item, 0, "Show Statusbar", tv_statusbar_setting, | |||
273 | NULL, NULL, Icon_NOICON); | 258 | NULL, NULL, Icon_NOICON); |
274 | MENUITEM_FUNCTION(font_item, 0, "Font", tv_font_setting, | 259 | MENUITEM_FUNCTION(font_item, 0, "Font", tv_font_setting, |
275 | NULL, NULL, Icon_NOICON); | 260 | NULL, NULL, Icon_NOICON); |
276 | #endif | ||
277 | MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", tv_indent_spaces_setting, | 261 | MENUITEM_FUNCTION(indent_spaces_item, 0, "Indent Spaces", tv_indent_spaces_setting, |
278 | NULL, NULL, Icon_NOICON); | 262 | NULL, NULL, Icon_NOICON); |
279 | #ifdef HAVE_LCD_COLOR | 263 | #ifdef HAVE_LCD_COLOR |
@@ -284,9 +268,7 @@ MENUITEM_FUNCTION(night_mode_item, 0, "Night Mode", tv_night_mode_setting, | |||
284 | MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON, | 268 | MAKE_MENU(option_menu, "Viewer Options", NULL, Icon_NOICON, |
285 | &encoding_item, &word_wrap_item, &line_mode_item, &windows_item, | 269 | &encoding_item, &word_wrap_item, &line_mode_item, &windows_item, |
286 | &alignment_item, | 270 | &alignment_item, |
287 | #ifdef HAVE_LCD_BITMAP | ||
288 | &header_item, &footer_item, &font_item, &statusbar_item, | 271 | &header_item, &footer_item, &font_item, &statusbar_item, |
289 | #endif | ||
290 | &scroll_menu, &indent_spaces_item | 272 | &scroll_menu, &indent_spaces_item |
291 | #ifdef HAVE_LCD_COLOR | 273 | #ifdef HAVE_LCD_COLOR |
292 | , &night_mode_item | 274 | , &night_mode_item |