diff options
Diffstat (limited to 'apps/menus/display_menu.c')
| -rw-r--r-- | apps/menus/display_menu.c | 53 |
1 files changed, 20 insertions, 33 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index c72fb08fae..c5c5e6d908 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -149,10 +149,10 @@ MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL); MENUITEM_SETTING(backlight_timeout_plugged, &global_settings.backlight_timeout_plugged, NULL); #endif -#ifdef HAS_BUTTON_HOLD + MENUITEM_SETTING(backlight_on_button_hold, &global_settings.backlight_on_button_hold, NULL); -#endif + MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL); #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \ || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) @@ -168,8 +168,8 @@ MENUITEM_SETTING(bl_selective_actions, selectivebacklight_callback); MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), - selectivebacklight_set_mask, NULL, - selectivebacklight_callback, Icon_Menu_setting); + selectivebacklight_set_mask, selectivebacklight_callback, + Icon_Menu_setting); MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); @@ -200,9 +200,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), # if CONFIG_CHARGING ,&backlight_timeout_plugged # endif -# ifdef HAS_BUTTON_HOLD ,&backlight_on_button_hold -# endif ,&caption_backlight #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \ || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) @@ -332,24 +330,11 @@ MENUITEM_SETTING(list_accel_start_delay, &global_settings.list_accel_start_delay, NULL); MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); #endif /* HAVE_WHEEL_ACCELERATION */ -static int screenscroll_callback(int action, - const struct menu_item_ex *this_item, - struct gui_synclist *this_list) -{ - (void)this_item; - (void)this_list; - switch (action) - { - case ACTION_EXIT_MENUITEM: - gui_list_screen_scroll_out_of_view(global_settings.offset_out_of_view); - break; - } - return action; -} -MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, - screenscroll_callback); +MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, NULL); MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); +MENUITEM_SETTING(list_wraparound, &global_settings.list_wraparound, NULL); +MENUITEM_SETTING(list_order, &global_settings.list_order, NULL); MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, &scroll_speed, &scroll_delay, @@ -360,6 +345,8 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, #endif &offset_out_of_view, &screen_scroll_step, &scroll_paginated, + &list_wraparound, + &list_order, #ifndef HAVE_WHEEL_ACCELERATION &list_accel_start_delay, &list_accel_wait #endif @@ -528,21 +515,20 @@ static bool history_interval(void) return set_option(str(LANG_HISTOGRAM_INTERVAL), &global_settings.histogram_interval, - INT, names, 4, NULL ); + RB_INT, names, 4, NULL ); } -MENUITEM_FUNCTION(histogram, 0, - ID2P(LANG_HISTOGRAM_INTERVAL), - history_interval, NULL, NULL, Icon_Menu_setting); +MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL), + history_interval, NULL, Icon_Menu_setting); #endif MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), - peak_meter_scale, NULL, NULL, Icon_NOICON); + peak_meter_scale, NULL, Icon_NOICON); MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), - peak_meter_min, NULL, NULL, Icon_NOICON); + peak_meter_min, NULL, Icon_NOICON); MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), - peak_meter_max, NULL, NULL, Icon_NOICON); + peak_meter_max, NULL, Icon_NOICON); MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, &peak_meter_release, &peak_meter_hold, &peak_meter_clip_hold, @@ -586,10 +572,11 @@ static int line_padding_callback(int action, MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback); -MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, - NULL, NULL, Icon_NOICON); -MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), reset_mapping, - NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, + ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, NULL, Icon_NOICON); +MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, + ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), + reset_mapping, NULL, Icon_NOICON); MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode, |