piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetics

Browse Source
This commit is contained in:
Bertrand Songis
2019-12-09 17:43:37 +01:00
parent 093abdf906
commit 2621aafae1
17 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/212x64/model_gvars.cpp
+1 -1
View File
@@ -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 });
radio/src/gui/colorlcd/model_gvars.h
+21 -17
View File
@@ -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
radio/src/thirdparty/libopenui
Vendored
+1 -1
Submodule radio/src/thirdparty/libopenui updated: 08ebd5c62e...c0443d20d6
radio/src/translations.cpp
+1 -1
View File
@@ -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;
radio/src/translations.h
+1 -1
View File
@@ -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[];
radio/src/translations/cn.h.txt
+1 -1
View File
@@ -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 "年"
radio/src/translations/cz.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/de.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/en.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/es.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/fi.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/fr.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/it.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/nl.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/pl.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/pt.h.txt
+1 -1
View File
@@ -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" }
radio/src/translations/se.h.txt
+1 -1
View File
@@ -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" }