From 91f67a2d406a4502d88166c3ea38fd05033c995a Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 8 Jul 2019 16:22:31 +0200 Subject: [PATCH] Improve version screen --- radio/src/gui/common/stdlcd/radio_version.cpp | 41 +++++++++++-------- radio/src/translations.cpp | 1 + radio/src/translations.h | 1 + radio/src/translations/cz.h.txt | 1 + radio/src/translations/de.h.txt | 1 + radio/src/translations/en.h.txt | 1 + radio/src/translations/es.h.txt | 1 + radio/src/translations/fi.h.txt | 1 + radio/src/translations/fr.h.txt | 1 + radio/src/translations/it.h.txt | 1 + radio/src/translations/nl.h.txt | 1 + radio/src/translations/pl.h.txt | 1 + radio/src/translations/pt.h.txt | 1 + radio/src/translations/se.h.txt | 1 + 14 files changed, 37 insertions(+), 17 deletions(-) diff --git a/radio/src/gui/common/stdlcd/radio_version.cpp b/radio/src/gui/common/stdlcd/radio_version.cpp index fc748cc0e..d7b38b6f2 100644 --- a/radio/src/gui/common/stdlcd/radio_version.cpp +++ b/radio/src/gui/common/stdlcd/radio_version.cpp @@ -85,16 +85,6 @@ void menuRadioModulesVersion(event_t event) coord_t y = (FH + 1) - menuVerticalOffset * FH; for (uint8_t module=0; module= 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) { diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 3a643b742..63be0e05c 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -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; diff --git a/radio/src/translations.h b/radio/src/translations.h index 0171d4db6..d4b7af0cd 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -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[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 04372779f..2e681b70a 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -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." diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index ece0f70c3..a2afcfdd1 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -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" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index b47439686..30182c90a 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -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..." diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 993eae28e..a31b52f6d 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -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..." diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index d9c328009..4d170ffc2 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -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..." diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index ace3651de..6f6fc26f1 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -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..." diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 956c034ed..e9e129e31 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -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..." diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 9a056eedb..fc4679769 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -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" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 6d99ab991..de0dd3c26 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -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." diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 9e94f4dfb..70a15b15d 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -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" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index eeea557f8..349efdd11 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -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 "