From a7739cbd67a0b425ab90c1bb7b04baed7763e4c0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 15 Jun 2020 12:03:20 +0200 Subject: [PATCH] glcdsetup: rename and auto-count clock options struct Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/dea8208e32bec709946447fe93f69c0cd2e6dad0 Author: vanhofen Date: 2020-06-15 (Mon, 15 Jun 2020) Origin message was: ------------------ - glcdsetup: rename and auto-count clock options struct --- src/gui/glcdsetup.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp index 86f801e71..5ca817f9b 100644 --- a/src/gui/glcdsetup.cpp +++ b/src/gui/glcdsetup.cpp @@ -219,13 +219,13 @@ bool GLCD_Menu::changeNotify (const neutrino_locale_t OptionName, void *Data) return true; } -#define ONOFFSEC_OPTION_COUNT 3 -static const CMenuOptionChooser::keyval ONOFFSEC_OPTIONS[ONOFFSEC_OPTION_COUNT] = { +static const CMenuOptionChooser::keyval GLCD_CLOCK_OPTIONS[] = { { nGLCD::CLOCK_OFF, LOCALE_OPTIONS_OFF }, { nGLCD::CLOCK_DIGITAL_HM, LOCALE_GLCD_CLOCK_DIGITAL_HM }, // { nGLCD::CLOCK_DIGITAL_HMS, LOCALE_GLCD_CLOCK_DIGITAL_HMS }, { nGLCD::CLOCK_ANALOG, LOCALE_GLCD_CLOCK_ANALOG } }; +#define GLCD_CLOCK_OPTIONS_COUNT (sizeof(GLCD_CLOCK_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) void GLCD_Menu::GLCD_Menu_Settings() { @@ -272,7 +272,7 @@ void GLCD_Menu::GLCD_Menu_Settings() &g_settings.glcd_brightness, true, 0, 100, this)); m.addItem(GenericMenuSeparatorLine); m.addItem(new CMenuOptionChooser(LOCALE_GLCD_TIME_IN_STANDBY, &g_settings.glcd_time_in_standby, - ONOFFSEC_OPTIONS, ONOFFSEC_OPTION_COUNT, true, this, + GLCD_CLOCK_OPTIONS, GLCD_CLOCK_OPTIONS_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++))); m.addItem(new CMenuOptionNumberChooser(LOCALE_GLCD_SIZE_TIME_STANDBY, &g_settings.glcd_percent_time_standby, true, 0, 100, this));