summaryrefslogtreecommitdiff
path: root/apps/menus/display_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r--apps/menus/display_menu.c63
1 files changed, 1 insertions, 62 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 04360d8251..5559ecebe7 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -306,67 +306,6 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON,
306/***********************************/ 306/***********************************/
307 307
308/***********************************/ 308/***********************************/
309/* BARS MENU */
310#ifdef HAVE_LCD_BITMAP
311static int statusbar_callback_ex(int action,const struct menu_item_ex *this_item,
312 enum screen_type screen)
313{
314 (void)this_item;
315 /* we save the old statusbar value here, so the old statusbars can get
316 * removed and cleared from the display properly on exiting
317 * (in gui_statusbar_changed() ) */
318 static enum statusbar_values old_bar[NB_SCREENS];
319 switch (action)
320 {
321 case ACTION_ENTER_MENUITEM:
322 old_bar[screen] = statusbar_position(screen);
323 case ACTION_EXIT_MENUITEM:
324 gui_statusbar_changed(screen, old_bar[screen]);
325 send_event(GUI_EVENT_STATUSBAR_TOGGLE, NULL);
326 send_event(GUI_EVENT_ACTIONUPDATE, (void*)true);
327 break;
328 }
329 return action;
330}
331
332#ifdef HAVE_REMOTE_LCD
333static int statusbar_callback_remote(int action,const struct menu_item_ex *this_item)
334{
335 return statusbar_callback_ex(action, this_item, SCREEN_REMOTE);
336}
337#endif
338static int statusbar_callback(int action,const struct menu_item_ex *this_item)
339{
340 return statusbar_callback_ex(action, this_item, SCREEN_MAIN);
341}
342MENUITEM_SETTING(scrollbar_item, &global_settings.scrollbar, NULL);
343MENUITEM_SETTING(scrollbar_width, &global_settings.scrollbar_width, NULL);
344MENUITEM_SETTING(statusbar, &global_settings.statusbar,
345 statusbar_callback);
346#ifdef HAVE_REMOTE_LCD
347MENUITEM_SETTING(remote_statusbar, &global_settings.remote_statusbar,
348 statusbar_callback_remote);
349#endif
350#if CONFIG_KEYPAD == RECORDER_PAD
351MENUITEM_SETTING(buttonbar, &global_settings.buttonbar, NULL);
352#endif
353MENUITEM_SETTING(volume_type, &global_settings.volume_type, NULL);
354MENUITEM_SETTING(battery_display, &global_settings.battery_display, NULL);
355MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON,
356 &scrollbar_item, &scrollbar_width, &statusbar,
357#ifdef HAVE_REMOTE_LCD
358 &remote_statusbar,
359#endif
360#if CONFIG_KEYPAD == RECORDER_PAD
361 &buttonbar,
362#endif
363 &volume_type, &battery_display);
364#endif /* HAVE_LCD_BITMAP */
365/* BARS MENU */
366/***********************************/
367
368
369/***********************************/
370/* PEAK METER MENU */ 309/* PEAK METER MENU */
371 310
372#ifdef HAVE_LCD_BITMAP 311#ifdef HAVE_LCD_BITMAP
@@ -563,7 +502,7 @@ MAKE_MENU(display_menu, ID2P(LANG_DISPLAY),
563#endif 502#endif
564 &scroll_settings_menu, 503 &scroll_settings_menu,
565#ifdef HAVE_LCD_BITMAP 504#ifdef HAVE_LCD_BITMAP
566 &bars_menu, &peak_meter_menu, 505 &peak_meter_menu,
567#endif 506#endif
568 &codepage_setting, 507 &codepage_setting,
569#ifdef HAVE_TOUCHSCREEN 508#ifdef HAVE_TOUCHSCREEN