From e3ebad8307e5082251bcb3b85be922e4bed8ad80 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 25 Jun 2020 23:50:19 +0200 Subject: [PATCH] glcdsetup: fix logo/channel menu item dependencies Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/81888d58c75b9c7b912e181ac44b51b8af618fef Author: vanhofen Date: 2020-06-25 (Thu, 25 Jun 2020) Origin message was: ------------------ - glcdsetup: fix logo/channel menu item dependencies --- src/gui/glcdsetup.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp index c955382fa..f56dfa4f4 100644 --- a/src/gui/glcdsetup.cpp +++ b/src/gui/glcdsetup.cpp @@ -438,23 +438,22 @@ void GLCD_Menu::GLCD_Theme_Position_Settings() sigc::slot0 slot_repaint = sigc::mem_fun(m, &CMenuWidget::paint); //we want to repaint after changed Option m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_CHANNEL, - &t.glcd_percent_channel, true, 0, 100, this)); + &t.glcd_percent_channel, !g_settings.glcd_show_logo, 0, 100, this)); m.addItem(new CMenuOptionChooser(LOCALE_GLCD_ALIGN_CHANNEL, &t.glcd_align_channel, - ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, true, NULL)); + ONOFFPRI_OPTIONS, ONOFFPRI_OPTION_COUNT, !g_settings.glcd_show_logo, NULL)); m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_X_POSITION, - &t.glcd_channel_x_position, true, 0, 500, this)); + &t.glcd_channel_x_position, !g_settings.glcd_show_logo, 0, 500, this)); m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_CHANNEL_Y_POSITION, - &t.glcd_channel_y_position, true, 0, 500, this)); + &t.glcd_channel_y_position, !g_settings.glcd_show_logo, 0, 500, this)); m.addItem(GenericMenuSeparatorLine); - m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_LOGO, - &t.glcd_percent_logo, true, 0, 100, this)); + &t.glcd_percent_logo, g_settings.glcd_show_logo, 0, 100, this)); m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_LOGO_X_POSITION, - &t.glcd_logo_x_position, true, 0, 500, this)); + &t.glcd_logo_x_position, g_settings.glcd_show_logo, 0, 500, this)); m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_LOGO_Y_POSITION, - &t.glcd_logo_y_position, true, 0, 500, this)); + &t.glcd_logo_y_position, g_settings.glcd_show_logo, 0, 500, this)); m.addItem(GenericMenuSeparatorLine);