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

Improve version screen

Browse Source
This commit is contained in:
3djc
2019-07-08 16:23:31 +02:00
parent 31ccb3751e
commit 91f67a2d40
14 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/radio_version.cpp
+24 -17
View File
@@ -85,16 +85,6 @@ void menuRadioModulesVersion(event_t event)
coord_t y = (FH + 1) - menuVerticalOffset * FH;
for (uint8_t module=0; module<NUM_MODULES; module++) {
if (module == INTERNAL_MODULE) {
if (!isModulePXX2(INTERNAL_MODULE) || !IS_INTERNAL_MODULE_ON()) {
continue;
}
}
else if (module == EXTERNAL_MODULE) {
if (!isModulePXX2(EXTERNAL_MODULE) || !IS_EXTERNAL_MODULE_ON()) {
continue;
}
}
// Label
if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) {
@@ -108,6 +98,30 @@ void menuRadioModulesVersion(event_t event)
// Module model
if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) {
lcdDrawText(INDENT_WIDTH, y, STR_MODULE);
if (module == INTERNAL_MODULE) {
if (!IS_INTERNAL_MODULE_ON()) {
lcdDrawText(COLUMN2_X, y, STR_OFF);
y += FH;
continue;
}
if (!isModulePXX2(INTERNAL_MODULE)) {
lcdDrawText(COLUMN2_X, y, TR("no info", "no information"));
y += FH;
continue;
}
}
else if (module == EXTERNAL_MODULE) {
if (!IS_EXTERNAL_MODULE_ON()) {
lcdDrawText(COLUMN2_X, y, STR_OFF);
y += FH;
continue;
}
if (!isModulePXX2(EXTERNAL_MODULE)) {
lcdDrawText(COLUMN2_X, y, "no information");
y += FH;
continue;
}
}
uint8_t modelId = reusableBuffer.hardwareAndSettings.modules[module].information.modelID;
lcdDrawText(COLUMN2_X, y, PXX2modulesModels[modelId]);
}
@@ -150,13 +164,6 @@ void menuRadioModulesVersion(event_t event)
if (lines > NUM_BODY_LINES) {
drawVerticalScrollbar(LCD_W-1, FH, LCD_H-FH, menuVerticalOffset, lines, NUM_BODY_LINES);
}
else {
menuVerticalOffset = 0;
if (lines == 0) {
lcdDrawText(LCD_W/2, 4*FH, STR_NO_MODULE_INFORMATION, CENTERED);
}
}
switch(event) {
case EVT_KEY_PREVIOUS_LINE:
if (lines > NUM_BODY_LINES) {
radio/src/translations.cpp
+1
View File
@@ -123,6 +123,7 @@ ISTR(BLUETOOTH_MODES);
const char STR_POPUPS_ENTER_EXIT[] = TR_POPUPS_ENTER_EXIT;
const char STR_OK[] = TR_OK;
const char STR_FREE[] = TR_FREE;
const char STR_NO_INFO[] = TR_NO_INFO;
const char STR_DELETEMODEL[] = TR_DELETEMODEL;
const char STR_COPYINGMODEL[] = TR_COPYINGMODEL;
const char STR_MOVINGMODEL[] = TR_MOVINGMODEL;
radio/src/translations.h
+1
View File
@@ -198,6 +198,7 @@ extern const char STR_MENUWHENDONE[];
#endif
extern const char STR_FREE[];
extern const char STR_NO_INFO[];
#define LEN_FREE PSIZE(TR_FREE)
extern const char STR_DELETEMODEL[];
extern const char STR_COPYINGMODEL[];
radio/src/translations/cz.h.txt
+1
View File
@@ -488,6 +488,7 @@
#define TR_MENUWHENDONE CENTER "\011" TR_ENTER " > DALŠÍ"
#define TR_FREE TR("volné:", "volných")
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "SMAZAT" BREAKSPACE "MODEL"
#define TR_COPYINGMODEL "Kopíruji model.."
#define TR_MOVINGMODEL "Přesouvám model."
radio/src/translations/de.h.txt
+1
View File
@@ -495,6 +495,7 @@
#endif
#define TR_FREE "frei"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "Modell löschen?"
#define TR_COPYINGMODEL "Kopiere Modell"
#define TR_MOVINGMODEL "Schiebe Modell"
radio/src/translations/en.h.txt
+1
View File
@@ -490,6 +490,7 @@
#endif
#define TR_FREE "free"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "DELETE" BREAKSPACE "MODEL"
#define TR_COPYINGMODEL "Copying model..."
#define TR_MOVINGMODEL "Moving model..."
radio/src/translations/es.h.txt
+1
View File
@@ -502,6 +502,7 @@
#define TR_MENUWHENDONE CENTER "\007" TR_ENTER " AL ACABAR "
#define TR_FREE "libre"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "BORRAR MODELO"
#define TR_COPYINGMODEL "Copiando modelo.."
#define TR_MOVINGMODEL "Mover modelo..."
radio/src/translations/fi.h.txt
+1
View File
@@ -494,6 +494,7 @@
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE"
#define TR_FREE "free"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "DELETE MODEL"
#define TR_COPYINGMODEL "Copying model..."
#define TR_MOVINGMODEL "Moving model..."
radio/src/translations/fr.h.txt
+1
View File
@@ -504,6 +504,7 @@
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " QUAND PRET"
#define TR_FREE "disp"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "SUPPRIMER" BREAKSPACE "MODELE"
#define TR_COPYINGMODEL "Copie..."
#define TR_MOVINGMODEL "Déplacement..."
radio/src/translations/it.h.txt
+1
View File
@@ -505,6 +505,7 @@
#define TR_MENUWHENDONE CENTER "\007" TR_ENTER " Conferma"
#define TR_FREE "disp"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "Elimina modello?"
#define TR_COPYINGMODEL "Copia in corso.."
#define TR_MOVINGMODEL "Spostamento..."
radio/src/translations/nl.h.txt
+1
View File
@@ -487,6 +487,7 @@ TR_GYR_VSRCRAW
#endif
#define TR_FREE "vrij"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "WIS" BREAKSPACE "MODEL"
#define TR_COPYINGMODEL "Kopieer Model"
#define TR_MOVINGMODEL "Verplaats Model"
radio/src/translations/pl.h.txt
+1
View File
@@ -505,6 +505,7 @@
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " > DALEJ"
#define TR_FREE "woln"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "SKASUJ MODEL"
#define TR_COPYINGMODEL "Kopiuj model.."
#define TR_MOVINGMODEL "Przenieś model."
radio/src/translations/pt.h.txt
+1
View File
@@ -487,6 +487,7 @@
#define TR_MENUWHENDONE CENTER"\006" TR_ENTER "QDO PRONTO"
#define TR_FREE "Livre"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "EXCLUI MODELO"
#define TR_COPYINGMODEL "Copiando modelo"
#define TR_MOVINGMODEL "Movendo modelo"
radio/src/translations/se.h.txt
+1
View File
@@ -500,6 +500,7 @@
#define TR_MENUWHENDONE CENTER "\011" TR_ENTER " Avslutar "
#define TR_FREE "kvar"
#define TR_NO_INFO TR("no info", "no information")
#define TR_DELETEMODEL "Radera Modell"
#define TR_COPYINGMODEL "Kopierar Modell "
#define TR_MOVINGMODEL "Flyttar Modell "