mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

glcdsetup: don't hide position settings; just deactivate items

Browse Source 
Origin commit data
------------------
Commit: 132f6319f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-26 (Fri, 26 Jun 2020)

Origin message was:
------------------
- glcdsetup: don't hide position settings; just deactivate items
This commit is contained in:
vanhofen
2020-06-26 11:01:47 +02:00
parent f238d481bb
commit e65c1b5949
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/glcdsetup.cpp
View File

@@ -368,18 +368,15 @@ int GLCD_Menu::GLCD_Standby_Settings()
int shortcut = 1; int shortcut = 1;
m.addItem(new CMenuOptionChooser(LOCALE_GLCD_TIME_IN_STANDBY, &g_settings.glcd_time_in_standby, m.addItem(new CMenuOptionChooser(LOCALE_GLCD_TIME_IN_STANDBY, &g_settings.glcd_time_in_standby,
ONOFFSEC_OPTIONS, ONOFFSEC_OPTION_COUNT, true, this, ONOFFSEC_OPTIONS, ONOFFSEC_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++)));
CRCInput::convertDigitToKey(shortcut++)));
m.addItem(new CMenuOptionChooser(LOCALE_GLCD_STANDBY_WEATHER, &g_settings.glcd_standby_weather, m.addItem(new CMenuOptionChooser(LOCALE_GLCD_STANDBY_WEATHER, &g_settings.glcd_standby_weather,
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
if (t.glcd_position_settings) {
m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION, m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_DIGITAL_CLOCK_Y_POSITION,
&t.glcd_digital_clock_y_position, true, 0, 500, this)); &t.glcd_digital_clock_y_position, t.glcd_position_settings, 0, 500, this));
m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_SIMPLE_CLOCK, m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_SIMPLE_CLOCK,
&t.glcd_size_simple_clock, true, 0, 100, this)); &t.glcd_size_simple_clock, t.glcd_position_settings, 0, 100, this));
m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION, m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIMPLE_CLOCK_Y_POSITION,
&t.glcd_simple_clock_y_position, true, 0, 500, this)); &t.glcd_simple_clock_y_position, t.glcd_position_settings, 0, 500, this));
}
int res = m.exec(NULL, ""); int res = m.exec(NULL, "");
selected = m.getSelected(); selected = m.getSelected();
cGLCD::getInstance()->StandbyMode(false); cGLCD::getInstance()->StandbyMode(false);
@@ -417,6 +414,8 @@ int GLCD_Menu::GLCD_Brightness_Settings()
int GLCD_Menu::GLCD_Theme_Settings() int GLCD_Menu::GLCD_Theme_Settings()
{ {
CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier();
CMenuWidget m(LOCALE_GLCD_THEME_SETTINGS, NEUTRINO_ICON_SETTINGS, width); CMenuWidget m(LOCALE_GLCD_THEME_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
m.addIntroItems(); m.addIntroItems();
m.setSelected(selected); m.setSelected(selected);
@@ -427,11 +426,9 @@ int GLCD_Menu::GLCD_Theme_Settings()
m.addItem(new CMenuForwarder(LOCALE_GLCD_THEME, true, NULL, CGLCDThemes::getInstance(), NULL, CRCInput::convertDigitToKey(shortcut++))); m.addItem(new CMenuForwarder(LOCALE_GLCD_THEME, true, NULL, CGLCDThemes::getInstance(), NULL, CRCInput::convertDigitToKey(shortcut++)));
m.addItem(new CMenuForwarder(LOCALE_GLCD_FONT, true, t.glcd_font, this, "select_font", m.addItem(new CMenuForwarder(LOCALE_GLCD_FONT, true, t.glcd_font, this, "select_font", CRCInput::convertDigitToKey(shortcut++)));
CRCInput::convertDigitToKey(shortcut++)));
m.addItem(GenericMenuSeparatorLine); m.addItem(GenericMenuSeparatorLine);
CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier();
CColorChooser* fg = new CColorChooser(LOCALE_GLCD_SELECT_FG, &t.glcd_color_fg_red, &t.glcd_color_fg_green, &t.glcd_color_fg_blue, NULL, colorSetupNotifier); CColorChooser* fg = new CColorChooser(LOCALE_GLCD_SELECT_FG, &t.glcd_color_fg_red, &t.glcd_color_fg_green, &t.glcd_color_fg_blue, NULL, colorSetupNotifier);
m.addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_FG, true, NULL, fg)); m.addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_FG, true, NULL, fg));
@@ -442,9 +439,7 @@ int GLCD_Menu::GLCD_Theme_Settings()
CColorChooser* bar = new CColorChooser(LOCALE_GLCD_SELECT_BAR, &t.glcd_color_bar_red, &t.glcd_color_bar_green, &t.glcd_color_bar_blue, NULL, colorSetupNotifier); CColorChooser* bar = new CColorChooser(LOCALE_GLCD_SELECT_BAR, &t.glcd_color_bar_red, &t.glcd_color_bar_green, &t.glcd_color_bar_blue, NULL, colorSetupNotifier);
m.addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_BAR, true, NULL, bar)); m.addItem(new CMenuDForwarder(LOCALE_GLCD_SELECT_BAR, true, NULL, bar));
if (t.glcd_position_settings) m.addItem(new CMenuForwarder(LOCALE_GLCD_POSITION_SETTINGS, t.glcd_position_settings, NULL, this, "position_settings", CRCInput::convertDigitToKey(shortcut++)));
m.addItem(new CMenuForwarder(LOCALE_GLCD_POSITION_SETTINGS, true, NULL, this, "position_settings",
CRCInput::convertDigitToKey(shortcut++)));
//delete colorSetupNotifier; //delete colorSetupNotifier;
int res = m.exec(NULL, ""); int res = m.exec(NULL, "");