diff options
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/display_menu.c | 20 | ||||
-rw-r--r-- | apps/menus/exported_menus.h | 2 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 4 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 8 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 16 |
5 files changed, 0 insertions, 50 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index b7a44a3bb7..b4a3d3eb63 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -30,9 +30,7 @@ | |||
30 | #include "menu.h" | 30 | #include "menu.h" |
31 | #include "tree.h" | 31 | #include "tree.h" |
32 | #include "list.h" | 32 | #include "list.h" |
33 | #ifdef HAVE_LCD_BITMAP | ||
34 | #include "peakmeter.h" | 33 | #include "peakmeter.h" |
35 | #endif | ||
36 | #include "talk.h" | 34 | #include "talk.h" |
37 | #include "lcd.h" | 35 | #include "lcd.h" |
38 | #ifdef HAVE_REMOTE_LCD | 36 | #ifdef HAVE_REMOTE_LCD |
@@ -187,16 +185,12 @@ MENUITEM_SETTING(brightness_item, &global_settings.brightness, NULL); | |||
187 | #ifdef HAVE_LCD_CONTRAST | 185 | #ifdef HAVE_LCD_CONTRAST |
188 | MENUITEM_SETTING(contrast, &global_settings.contrast, NULL); | 186 | MENUITEM_SETTING(contrast, &global_settings.contrast, NULL); |
189 | #endif | 187 | #endif |
190 | #ifdef HAVE_LCD_BITMAP | ||
191 | #ifdef HAVE_LCD_INVERT | 188 | #ifdef HAVE_LCD_INVERT |
192 | MENUITEM_SETTING(invert, &global_settings.invert, NULL); | 189 | MENUITEM_SETTING(invert, &global_settings.invert, NULL); |
193 | #endif | 190 | #endif |
194 | #ifdef HAVE_LCD_FLIP | 191 | #ifdef HAVE_LCD_FLIP |
195 | MENUITEM_SETTING(flip_display, &global_settings.flip_display, flipdisplay_callback); | 192 | MENUITEM_SETTING(flip_display, &global_settings.flip_display, flipdisplay_callback); |
196 | #endif | 193 | #endif |
197 | #endif /* HAVE_LCD_BITMAP */ | ||
198 | |||
199 | |||
200 | 194 | ||
201 | /* now the actual menu */ | 195 | /* now the actual menu */ |
202 | MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | 196 | MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), |
@@ -226,14 +220,12 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
226 | #ifdef HAVE_LCD_CONTRAST | 220 | #ifdef HAVE_LCD_CONTRAST |
227 | ,&contrast | 221 | ,&contrast |
228 | #endif | 222 | #endif |
229 | #ifdef HAVE_LCD_BITMAP | ||
230 | # ifdef HAVE_LCD_INVERT | 223 | # ifdef HAVE_LCD_INVERT |
231 | ,&invert | 224 | ,&invert |
232 | # endif | 225 | # endif |
233 | # ifdef HAVE_LCD_FLIP | 226 | # ifdef HAVE_LCD_FLIP |
234 | ,&flip_display | 227 | ,&flip_display |
235 | # endif | 228 | # endif |
236 | #endif /* HAVE_LCD_BITMAP */ | ||
237 | ); | 229 | ); |
238 | /* LCD MENU */ | 230 | /* LCD MENU */ |
239 | /***********************************/ | 231 | /***********************************/ |
@@ -318,10 +310,8 @@ MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU), | |||
318 | MENUITEM_SETTING_W_TEXT(scroll_speed, &global_settings.scroll_speed, | 310 | MENUITEM_SETTING_W_TEXT(scroll_speed, &global_settings.scroll_speed, |
319 | ID2P(LANG_SCROLL), NULL); | 311 | ID2P(LANG_SCROLL), NULL); |
320 | MENUITEM_SETTING(scroll_delay, &global_settings.scroll_delay, NULL); | 312 | MENUITEM_SETTING(scroll_delay, &global_settings.scroll_delay, NULL); |
321 | #ifdef HAVE_LCD_BITMAP | ||
322 | MENUITEM_SETTING_W_TEXT(scroll_step, &global_settings.scroll_step, | 313 | MENUITEM_SETTING_W_TEXT(scroll_step, &global_settings.scroll_step, |
323 | ID2P(LANG_SCROLL_STEP_EXAMPLE), NULL); | 314 | ID2P(LANG_SCROLL_STEP_EXAMPLE), NULL); |
324 | #endif | ||
325 | MENUITEM_SETTING(bidir_limit, &global_settings.bidir_limit, NULL); | 315 | MENUITEM_SETTING(bidir_limit, &global_settings.bidir_limit, NULL); |
326 | #ifdef HAVE_REMOTE_LCD | 316 | #ifdef HAVE_REMOTE_LCD |
327 | MENUITEM_SETTING_W_TEXT(remote_scroll_speed, &global_settings.remote_scroll_speed, | 317 | MENUITEM_SETTING_W_TEXT(remote_scroll_speed, &global_settings.remote_scroll_speed, |
@@ -342,7 +332,6 @@ MENUITEM_SETTING(list_accel_start_delay, | |||
342 | &global_settings.list_accel_start_delay, NULL); | 332 | &global_settings.list_accel_start_delay, NULL); |
343 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); | 333 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); |
344 | #endif /* HAVE_WHEEL_ACCELERATION */ | 334 | #endif /* HAVE_WHEEL_ACCELERATION */ |
345 | #ifdef HAVE_LCD_BITMAP | ||
346 | static int screenscroll_callback(int action, | 335 | static int screenscroll_callback(int action, |
347 | const struct menu_item_ex *this_item, | 336 | const struct menu_item_ex *this_item, |
348 | struct gui_synclist *this_list) | 337 | struct gui_synclist *this_list) |
@@ -360,21 +349,16 @@ static int screenscroll_callback(int action, | |||
360 | MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, | 349 | MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, |
361 | screenscroll_callback); | 350 | screenscroll_callback); |
362 | MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); | 351 | MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); |
363 | #endif | ||
364 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); | 352 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); |
365 | 353 | ||
366 | MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, | 354 | MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, |
367 | &scroll_speed, &scroll_delay, | 355 | &scroll_speed, &scroll_delay, |
368 | #ifdef HAVE_LCD_BITMAP | ||
369 | &scroll_step, | 356 | &scroll_step, |
370 | #endif | ||
371 | &bidir_limit, | 357 | &bidir_limit, |
372 | #ifdef HAVE_REMOTE_LCD | 358 | #ifdef HAVE_REMOTE_LCD |
373 | &remote_scroll_sets, | 359 | &remote_scroll_sets, |
374 | #endif | 360 | #endif |
375 | #ifdef HAVE_LCD_BITMAP | ||
376 | &offset_out_of_view, &screen_scroll_step, | 361 | &offset_out_of_view, &screen_scroll_step, |
377 | #endif | ||
378 | &scroll_paginated, | 362 | &scroll_paginated, |
379 | #ifndef HAVE_WHEEL_ACCELERATION | 363 | #ifndef HAVE_WHEEL_ACCELERATION |
380 | &list_accel_start_delay, &list_accel_wait | 364 | &list_accel_start_delay, &list_accel_wait |
@@ -386,7 +370,6 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, | |||
386 | /***********************************/ | 370 | /***********************************/ |
387 | /* PEAK METER MENU */ | 371 | /* PEAK METER MENU */ |
388 | 372 | ||
389 | #ifdef HAVE_LCD_BITMAP | ||
390 | static int peakmeter_callback(int action, | 373 | static int peakmeter_callback(int action, |
391 | const struct menu_item_ex *this_item, | 374 | const struct menu_item_ex *this_item, |
392 | struct gui_synclist *this_list) | 375 | struct gui_synclist *this_list) |
@@ -570,7 +553,6 @@ MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, | |||
570 | &histogram, | 553 | &histogram, |
571 | #endif | 554 | #endif |
572 | &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); | 555 | &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); |
573 | #endif /* HAVE_LCD_BITMAP */ | ||
574 | /* PEAK METER MENU */ | 556 | /* PEAK METER MENU */ |
575 | /***********************************/ | 557 | /***********************************/ |
576 | 558 | ||
@@ -645,9 +627,7 @@ MAKE_MENU(display_menu, ID2P(LANG_DISPLAY), | |||
645 | &lcd_remote_settings, | 627 | &lcd_remote_settings, |
646 | #endif | 628 | #endif |
647 | &scroll_settings_menu, | 629 | &scroll_settings_menu, |
648 | #ifdef HAVE_LCD_BITMAP | ||
649 | &peak_meter_menu, | 630 | &peak_meter_menu, |
650 | #endif | ||
651 | &codepage_setting, | 631 | &codepage_setting, |
652 | #ifdef HAVE_TOUCHSCREEN | 632 | #ifdef HAVE_TOUCHSCREEN |
653 | &touchscreen_menu, | 633 | &touchscreen_menu, |
diff --git a/apps/menus/exported_menus.h b/apps/menus/exported_menus.h index efb6341155..93cabb0f2e 100644 --- a/apps/menus/exported_menus.h +++ b/apps/menus/exported_menus.h | |||
@@ -31,10 +31,8 @@ extern const struct menu_item_ex | |||
31 | #ifdef HAVE_RECORDING | 31 | #ifdef HAVE_RECORDING |
32 | recording_settings, /* recording_menu.c */ | 32 | recording_settings, /* recording_menu.c */ |
33 | recording_settings_menu, | 33 | recording_settings_menu, |
34 | #ifdef HAVE_LCD_BITMAP | ||
35 | peak_meter_menu, /* also used from within recording_menu */ | 34 | peak_meter_menu, /* also used from within recording_menu */ |
36 | #endif | 35 | #endif |
37 | #endif | ||
38 | sound_settings, /* sound_menu.c */ | 36 | sound_settings, /* sound_menu.c */ |
39 | settings_menu_item, /* settings_menu.c */ | 37 | settings_menu_item, /* settings_menu.c */ |
40 | bookmark_settings_menu, | 38 | bookmark_settings_menu, |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index c841de4e89..c3187afbef 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -32,10 +32,8 @@ | |||
32 | #include "settings.h" | 32 | #include "settings.h" |
33 | #include "screens.h" | 33 | #include "screens.h" |
34 | #include "icons.h" | 34 | #include "icons.h" |
35 | #ifdef HAVE_LCD_BITMAP | ||
36 | #include "font.h" | 35 | #include "font.h" |
37 | #include "scrollbar.h" | 36 | #include "scrollbar.h" |
38 | #endif | ||
39 | #include "lang.h" | 37 | #include "lang.h" |
40 | #include "talk.h" | 38 | #include "talk.h" |
41 | #include "misc.h" | 39 | #include "misc.h" |
@@ -601,9 +599,7 @@ MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), | |||
601 | #ifdef HAVE_AGC | 599 | #ifdef HAVE_AGC |
602 | &agc_preset, &agc_cliptime, | 600 | &agc_preset, &agc_cliptime, |
603 | #endif | 601 | #endif |
604 | #ifdef HAVE_LCD_BITMAP | ||
605 | &peak_meter_menu, | 602 | &peak_meter_menu, |
606 | #endif | ||
607 | &browse_recconfigs, &save_recpresets_item | 603 | &browse_recconfigs, &save_recpresets_item |
608 | ); | 604 | ); |
609 | 605 | ||
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index e2b496a6f7..431600bbe1 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -187,9 +187,7 @@ MENUITEM_SETTING(interpret_numbers, &global_settings.interpret_numbers, fileview | |||
187 | MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL); | 187 | MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL); |
188 | MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL); | 188 | MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL); |
189 | MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL); | 189 | MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL); |
190 | #ifdef HAVE_LCD_BITMAP | ||
191 | MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL); | 190 | MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL); |
192 | #endif | ||
193 | static int clear_start_directory(void) | 191 | static int clear_start_directory(void) |
194 | { | 192 | { |
195 | strcpy(global_settings.start_directory, "/"); | 193 | strcpy(global_settings.start_directory, "/"); |
@@ -222,9 +220,7 @@ static int fileview_callback(int action, | |||
222 | MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, | 220 | MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, |
223 | &sort_case, &sort_dir, &sort_file, &interpret_numbers, | 221 | &sort_case, &sort_dir, &sort_file, &interpret_numbers, |
224 | &dirfilter, &show_filename_ext, &browse_current, | 222 | &dirfilter, &show_filename_ext, &browse_current, |
225 | #ifdef HAVE_LCD_BITMAP | ||
226 | &show_path_in_browser, | 223 | &show_path_in_browser, |
227 | #endif | ||
228 | &clear_start_directory_item | 224 | &clear_start_directory_item |
229 | ); | 225 | ); |
230 | /* FILE VIEW MENU */ | 226 | /* FILE VIEW MENU */ |
@@ -312,14 +308,10 @@ MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, | |||
312 | /* Limits menu */ | 308 | /* Limits menu */ |
313 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); | 309 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); |
314 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); | 310 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); |
315 | #ifdef HAVE_LCD_BITMAP | ||
316 | MENUITEM_SETTING(default_glyphs, &global_settings.glyphs_to_cache, NULL); | 311 | MENUITEM_SETTING(default_glyphs, &global_settings.glyphs_to_cache, NULL); |
317 | #endif | ||
318 | MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, | 312 | MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, |
319 | &max_files_in_dir, &max_files_in_playlist | 313 | &max_files_in_dir, &max_files_in_playlist |
320 | #ifdef HAVE_LCD_BITMAP | ||
321 | ,&default_glyphs | 314 | ,&default_glyphs |
322 | #endif | ||
323 | ); | 315 | ); |
324 | 316 | ||
325 | 317 | ||
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 | ); |