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/menus/theme_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/menus/theme_menu.c')
-rw-r--r-- | apps/menus/theme_menu.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 138a2f928a..a160d4c298 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c | |||
@@ -159,7 +159,6 @@ MAKE_MENU(colors_settings, ID2P(LANG_COLORS_MENU), | |||
159 | /* */ | 159 | /* */ |
160 | 160 | ||
161 | 161 | ||
162 | #ifdef HAVE_LCD_BITMAP | ||
163 | static int statusbar_callback_ex(int action,const struct menu_item_ex *this_item, | 162 | static int statusbar_callback_ex(int action,const struct menu_item_ex *this_item, |
164 | enum screen_type screen) | 163 | enum screen_type screen) |
165 | { | 164 | { |
@@ -218,19 +217,16 @@ MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON, | |||
218 | , &battery_display | 217 | , &battery_display |
219 | #endif | 218 | #endif |
220 | ); | 219 | ); |
221 | #endif /* HAVE_LCD_BITMAP */ | ||
222 | 220 | ||
223 | /* */ | 221 | /* */ |
224 | /* BARS MENU */ | 222 | /* BARS MENU */ |
225 | /************************************/ | 223 | /************************************/ |
226 | 224 | ||
227 | #ifdef HAVE_LCD_BITMAP | ||
228 | static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT}; | 225 | static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT}; |
229 | static struct browse_folder_info sbs = {SBS_DIR, SHOW_SBS}; | 226 | static struct browse_folder_info sbs = {SBS_DIR, SHOW_SBS}; |
230 | #if CONFIG_TUNER | 227 | #if CONFIG_TUNER |
231 | static struct browse_folder_info fms = {WPS_DIR, SHOW_FMS}; | 228 | static struct browse_folder_info fms = {WPS_DIR, SHOW_FMS}; |
232 | #endif | 229 | #endif |
233 | #endif | ||
234 | static struct browse_folder_info wps = {WPS_DIR, SHOW_WPS}; | 230 | static struct browse_folder_info wps = {WPS_DIR, SHOW_WPS}; |
235 | #ifdef HAVE_REMOTE_LCD | 231 | #ifdef HAVE_REMOTE_LCD |
236 | static struct browse_folder_info rwps = {WPS_DIR, SHOW_RWPS}; | 232 | static struct browse_folder_info rwps = {WPS_DIR, SHOW_RWPS}; |
@@ -268,7 +264,6 @@ int browse_folder(void *param) | |||
268 | setting = global_settings.wps_file; | 264 | setting = global_settings.wps_file; |
269 | lang_id = LANG_WHILE_PLAYING; | 265 | lang_id = LANG_WHILE_PLAYING; |
270 | break; | 266 | break; |
271 | #ifdef HAVE_LCD_BITMAP | ||
272 | case SHOW_FONT: | 267 | case SHOW_FONT: |
273 | ext = "fnt"; | 268 | ext = "fnt"; |
274 | setting = global_settings.font_file; | 269 | setting = global_settings.font_file; |
@@ -286,7 +281,6 @@ int browse_folder(void *param) | |||
286 | lang_id = LANG_RADIOSCREEN; | 281 | lang_id = LANG_RADIOSCREEN; |
287 | break; | 282 | break; |
288 | #endif /* CONFIG_TUNER */ | 283 | #endif /* CONFIG_TUNER */ |
289 | #endif | ||
290 | #ifdef HAVE_REMOTE_LCD | 284 | #ifdef HAVE_REMOTE_LCD |
291 | case SHOW_RWPS: | 285 | case SHOW_RWPS: |
292 | ext = "rwps"; | 286 | ext = "rwps"; |
@@ -324,7 +318,6 @@ int browse_folder(void *param) | |||
324 | return rockbox_browse(&browse); | 318 | return rockbox_browse(&browse); |
325 | } | 319 | } |
326 | 320 | ||
327 | #ifdef HAVE_LCD_BITMAP | ||
328 | MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, | 321 | MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, |
329 | ID2P(LANG_CUSTOM_FONT), | 322 | ID2P(LANG_CUSTOM_FONT), |
330 | browse_folder, (void*)&fonts, NULL, Icon_Font); | 323 | browse_folder, (void*)&fonts, NULL, Icon_Font); |
@@ -337,7 +330,6 @@ MENUITEM_FUNCTION(browse_fms, MENU_FUNC_USEPARAM, | |||
337 | ID2P(LANG_RADIOSCREEN), | 330 | ID2P(LANG_RADIOSCREEN), |
338 | browse_folder, (void*)&fms, NULL, Icon_Wps); | 331 | browse_folder, (void*)&fms, NULL, Icon_Wps); |
339 | #endif | 332 | #endif |
340 | #endif | ||
341 | MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, | 333 | MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, |
342 | ID2P(LANG_WHILE_PLAYING), | 334 | ID2P(LANG_WHILE_PLAYING), |
343 | browse_folder, (void*)&wps, NULL, Icon_Wps); | 335 | browse_folder, (void*)&wps, NULL, Icon_Wps); |
@@ -380,9 +372,7 @@ MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); | |||
380 | MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, | 372 | MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, |
381 | ID2P(LANG_CUSTOM_THEME), | 373 | ID2P(LANG_CUSTOM_THEME), |
382 | browse_folder, (void*)&themes, NULL, Icon_Config); | 374 | browse_folder, (void*)&themes, NULL, Icon_Config); |
383 | #ifdef HAVE_LCD_BITMAP | ||
384 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); | 375 | MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); |
385 | #endif | ||
386 | #if LCD_DEPTH > 1 | 376 | #if LCD_DEPTH > 1 |
387 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); | 377 | MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); |
388 | #endif | 378 | #endif |
@@ -390,9 +380,7 @@ MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); | |||
390 | MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), | 380 | MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), |
391 | NULL, Icon_Wps, | 381 | NULL, Icon_Wps, |
392 | &browse_themes, | 382 | &browse_themes, |
393 | #ifdef HAVE_LCD_BITMAP | ||
394 | &browse_fonts, | 383 | &browse_fonts, |
395 | #endif | ||
396 | &browse_wps, | 384 | &browse_wps, |
397 | #ifdef HAVE_REMOTE_LCD | 385 | #ifdef HAVE_REMOTE_LCD |
398 | &browse_rwps, | 386 | &browse_rwps, |
@@ -403,9 +391,7 @@ MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), | |||
403 | &browse_rfms, | 391 | &browse_rfms, |
404 | #endif | 392 | #endif |
405 | #endif | 393 | #endif |
406 | #ifdef HAVE_LCD_BITMAP | ||
407 | &browse_sbs, | 394 | &browse_sbs, |
408 | #endif | ||
409 | #ifdef HAVE_REMOTE_LCD | 395 | #ifdef HAVE_REMOTE_LCD |
410 | &browse_rsbs, | 396 | &browse_rsbs, |
411 | #endif | 397 | #endif |
@@ -413,7 +399,6 @@ MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), | |||
413 | #ifdef HAVE_BACKDROP_IMAGE | 399 | #ifdef HAVE_BACKDROP_IMAGE |
414 | &clear_main_bd, | 400 | &clear_main_bd, |
415 | #endif | 401 | #endif |
416 | #ifdef HAVE_LCD_BITMAP | ||
417 | &bars_menu, | 402 | &bars_menu, |
418 | &cursor_style, | 403 | &cursor_style, |
419 | #if LCD_DEPTH > 1 | 404 | #if LCD_DEPTH > 1 |
@@ -422,5 +407,4 @@ MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), | |||
422 | #ifdef HAVE_LCD_COLOR | 407 | #ifdef HAVE_LCD_COLOR |
423 | &colors_settings, | 408 | &colors_settings, |
424 | #endif | 409 | #endif |
425 | #endif /* HAVE_LCD_BITMAP */ | ||
426 | ); | 410 | ); |