diff --git a/radio/src/gui/212x64/model_gvars.cpp b/radio/src/gui/212x64/model_gvars.cpp index 7c286a05e..48421797d 100644 --- a/radio/src/gui/212x64/model_gvars.cpp +++ b/radio/src/gui/212x64/model_gvars.cpp @@ -146,7 +146,7 @@ void menuModelGVars(event_t event) } } else { - menuTitle = STR_MENUGLOBALVARS; + menuTitle = STR_MENU_GLOBAL_VARS; } MENU_FLAGS(menuTitle, menuTabModel, MENU_MODEL_GVARS, after2seconds ? CHECK_FLAG_NO_SCREEN_INDEX : 0, MAX_GVARS, { GVARS_COLUMNS, GVARS_COLUMNS, GVARS_COLUMNS, GVARS_COLUMNS, GVARS_COLUMNS, GVARS_COLUMNS, GVARS_COLUMNS, GVARS_COLUMNS, GVARS_COLUMNS }); diff --git a/radio/src/gui/colorlcd/model_gvars.h b/radio/src/gui/colorlcd/model_gvars.h index 50b5ffc45..e2b75f58e 100644 --- a/radio/src/gui/colorlcd/model_gvars.h +++ b/radio/src/gui/colorlcd/model_gvars.h @@ -17,6 +17,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ + #ifndef _MODEL_GVARS_H #define _MODEL_GVARS_H @@ -25,9 +26,11 @@ #include "window.h" #include "numberedit.h" -class GVarButton : public Button { +class GVarButton: public Button { public: GVarButton(FormGroup * parent, const rect_t & rect, uint8_t gvar); + + protected: void checkEvents() override; void paint(BitmapBuffer * dc) override; @@ -39,14 +42,19 @@ class GVarButton : public Button { uint8_t currentFlightMode; //used for invalidation }; -class ModelGVarsPage : public PageTab { +class ModelGVarsPage: public PageTab { public: - ModelGVarsPage() : PageTab(STR_GLOBAL_VARS, ICON_MODEL_GVARS) {} - void build(FormWindow * window); + ModelGVarsPage(): + PageTab(STR_MENU_GLOBAL_VARS, ICON_MODEL_GVARS) + { + } + + protected: + void build(FormWindow * window) override; void rebuild(FormWindow * window); }; -class GVarRenderer : public Window { +class GVarRenderer: public Window { public: GVarRenderer(Window * window, rect_t rect, uint8_t gvarIndex) : Window(window, rect), @@ -54,21 +62,22 @@ class GVarRenderer : public Window { { } + protected: void paint(BitmapBuffer * dc) override; void checkEvents() override; bool isUpdated(); protected: uint8_t index; - gvar_t lastGVar; - uint8_t lastFlightMode; - bool updated; + gvar_t lastGVar = 0; + uint8_t lastFlightMode = 0; + bool updated = false; }; -class GVarEditWindow : public Page { +class GVarEditWindow: public Page { public: - GVarEditWindow(uint8_t gvarIndex) : + explicit GVarEditWindow(uint8_t gvarIndex) : Page(ICON_MODEL_GVARS), index(gvarIndex) { @@ -76,20 +85,15 @@ class GVarEditWindow : public Page { buildBody(&body); } - ~GVarEditWindow() override - { - } - - void checkEvents() override; - protected: uint8_t index; NumberEdit * min = nullptr; NumberEdit * max = nullptr; NumberEdit * values[MAX_FLIGHT_MODES] = {}; - GVarRenderer * gVarInHeader; + GVarRenderer * gVarInHeader = nullptr; void buildHeader(Window * window); void buildBody(FormWindow * window); void setProperties(int onlyForFlightMode = -1); + void checkEvents() override; }; #endif \ No newline at end of file diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 08ebd5c62..c0443d20d 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 08ebd5c62e8968e9bad2a73a6511113b0fb35cbb +Subproject commit c0443d20d698d44c22a1f769f172e16c7ff86c47 diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index c046eda70..d1e77807c 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -239,7 +239,7 @@ const char *const STR_MONITOR_CHANNELS[] = {TR_MONITOR_CHANNELS1, TR_MONITOR_CHA const char STR_MONITOR_SWITCHES[] = TR_MONITOR_SWITCHES; const char STR_MONITOR_OUTPUT_DESC[] = TR_MONITOR_OUTPUT_DESC; const char STR_MONITOR_MIXER_DESC[] = TR_MONITOR_MIXER_DESC; -const char STR_MENUGLOBALVARS[] = TR_MENUGLOBALVARS; +const char STR_MENU_GLOBAL_VARS[] = TR_MENU_GLOBAL_VARS; const char STR_INTERNALRF[] = TR_INTERNALRF; const char STR_INTERNAL_MODULE[] = TR_INTERNAL_MODULE; const char STR_EXTERNAL_MODULE[] = TR_EXTERNAL_MODULE; diff --git a/radio/src/translations.h b/radio/src/translations.h index d4864afdb..9bba710e8 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -388,7 +388,7 @@ extern const char * const STR_MONITOR_CHANNELS[]; extern const char STR_MONITOR_SWITCHES[]; extern const char STR_MONITOR_OUTPUT_DESC[]; extern const char STR_MONITOR_MIXER_DESC[]; -extern const char STR_MENUGLOBALVARS[]; +extern const char STR_MENU_GLOBAL_VARS[]; extern const char STR_AND_SWITCH[]; extern const char STR_SF[]; extern const char STR_GF[]; diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt index 951a02d32..d896c427e 100644 --- a/radio/src/translations/cn.h.txt +++ b/radio/src/translations/cn.h.txt @@ -814,7 +814,7 @@ #define TR_GLOBAL_VARS "Global variables" #define TR_GVARS "GVARS" #define TR_GLOBAL_VAR "Global variable" -#define TR_MENUGLOBALVARS "GLOBAL VARIABLES" +#define TR_MENU_GLOBAL_VARS "GLOBAL VARIABLES" #define TR_OWN "Own" #define TR_DATE "日期" #define TR_YEAR "年" diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index ea6101c1c..3eb454ad5 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -815,7 +815,7 @@ #define TR_GLOBAL_VARS "Globální proměnné" #define TR_GVARS "GLOB.PROM." #define TR_GLOBAL_VAR "Globální proměnná" -#define TR_MENUGLOBALVARS "GLOBÁLNÍ PROMĚNNÉ" +#define TR_MENU_GLOBAL_VARS "GLOBÁLNÍ PROMĚNNÉ" #define TR_OWN " \043 " #define TR_DATE "Datum" #define TR_MONTHS { "Led", "Úno", "Bře", "Dub", "Kvě", "Čer", "Čec", "Srp", "Zář", "Říj", "Lis", "Pro" } diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index e69632ec6..884f8d702 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -822,7 +822,7 @@ #define TR_GLOBAL_VARS "Globale Variablen" #define TR_GVARS "GLOBALE V." #define TR_GLOBAL_VAR "Globale Variable" -#define TR_MENUGLOBALVARS "GLOBALE VARIABLEN" +#define TR_MENU_GLOBAL_VARS "GLOBALE VARIABLEN" #define TR_OWN "Eigen" #define TR_DATE "Datum:" #define TR_MONTHS { "Jan", "Feb", "Mar", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez" } diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index e8bc7676c..10e3716f9 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -819,7 +819,7 @@ #define TR_GLOBAL_VARS "Global variables" #define TR_GVARS "GVARS" #define TR_GLOBAL_VAR "Global variable" -#define TR_MENUGLOBALVARS "GLOBAL VARIABLES" +#define TR_MENU_GLOBAL_VARS "GLOBAL VARIABLES" #define TR_OWN "Own" #define TR_DATE "Date" #define TR_MONTHS { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" } diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index f88fe72aa..eb4eac50d 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -845,7 +845,7 @@ #define TR_GLOBAL_VARS "Global Variables" #define TR_GVARS "GLOBAL V." #define TR_GLOBAL_VAR "Global Variable" -#define TR_MENUGLOBALVARS "GLOBAL VARIABLES" +#define TR_MENU_GLOBAL_VARS "GLOBAL VARIABLES" #define TR_OWN "Propio" #define TR_DATE "Fecha" #define TR_MONTHS { "Jan", "Fev", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" } diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index b8f71634f..f039f42ba 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -839,7 +839,7 @@ #define TR_GLOBAL_VARS "Global Variables" #define TR_GVARS "GLOBAL V." #define TR_GLOBAL_VAR "Global Variable" -#define TR_MENUGLOBALVARS "GLOBAL VARIABLES" +#define TR_MENU_GLOBAL_VARS "GLOBAL VARIABLES" #define TR_OWN "Own" #define TR_DATE "Date" #define TR_MONTHS { "Jan", "Fev", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" } diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 46601495f..eb7a1ecdc 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -841,7 +841,7 @@ #define TR_GLOBAL_VARS "Variables Globales" #define TR_GVARS "V. GLOBALES" #define TR_GLOBAL_VAR "Variable globale" -#define TR_MENUGLOBALVARS "VARIABLES GLOBALES" +#define TR_MENU_GLOBAL_VARS "VARIABLES GLOBALES" #define TR_OWN "Pers" #define TR_DATE "Date" #define TR_MONTHS { "Jan", "Fév", "Mar", "Avr", "Mai", "Jun", "Jul", "Aou", "Sep", "Oct", "Nov", "Dec" } diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index e2d5bf4a9..da3d64f89 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -844,7 +844,7 @@ #define TR_GLOBAL_VARS "Variabili Globali" #define TR_GVARS "V.GLOBALI" #define TR_GLOBAL_VAR "Variabile globale" -#define TR_MENUGLOBALVARS "VARIABILI GLOBALI" +#define TR_MENU_GLOBAL_VARS "VARIABILI GLOBALI" #define TR_OWN "Fase" #define TR_DATE "Data" #define TR_MONTHS { "Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Auo", "Set", "Ott", "Nov", "Dic" } diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index b51d8017a..a3025476c 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -827,7 +827,7 @@ #define TR_GLOBAL_VARS "Globale Variabelen" #define TR_GVARS "GLOBALE V." #define TR_GLOBAL_VAR "Globale Variabele" -#define TR_MENUGLOBALVARS "GLOBALE VARIABELEN" +#define TR_MENU_GLOBAL_VARS "GLOBALE VARIABELEN" #define TR_OWN "Eigen" #define TR_DATE "Datum:" #define TR_MONTHS { "Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec" } diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 273052b4c..939865e59 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -840,7 +840,7 @@ #define TR_GLOBAL_VARS "Zmienne Globalne" #define TR_GVARS "Zmien.Glob." #define TR_GLOBAL_VAR "Zmienna Globalna" -#define TR_MENUGLOBALVARS "ZMIENNE GLOBALNE" +#define TR_MENU_GLOBAL_VARS "ZMIENNE GLOBALNE" #define TR_OWN "Własność" #define TR_DATE "Data" #define TR_MONTHS { "Jan", "Fev", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" } diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index eed4a4b14..0c7ecf7ed 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -830,7 +830,7 @@ #define TR_GLOBAL_VARS "Variaveis" #define TR_GVARS "GLOBAL V." #define TR_GLOBAL_VAR "Global Variable" -#define TR_MENUGLOBALVARS "VARIAVEIS" +#define TR_MENU_GLOBAL_VARS "VARIAVEIS" #define TR_OWN "Propr." #define TR_DATE "Data" #define TR_MONTHS { "Jan", "Fev", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" } diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 08d43ab44..22bf475bd 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -843,7 +843,7 @@ #define TR_GLOBAL_VARS "Globala Variabler" #define TR_GVARS "GLOBAL V." #define TR_GLOBAL_VAR "Global Variabel" -#define TR_MENUGLOBALVARS "GLOBALA VARIABLER" +#define TR_MENU_GLOBAL_VARS "GLOBALA VARIABLER" #define TR_OWN "Egen" #define TR_DATE "Datum" #define TR_MONTHS { "Jan", "Fev", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }