From 1d3b6721c63b73ffa254eaa925c7c6f6779e432f Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 30 Dec 2016 18:20:46 +0100 Subject: [PATCH] If no WIZARD are present, do not display anything (#4173) * If no WIZARD are present, do not display anything * Cosmetics * More cosmetics ;) * String cleanup * Bertrand's feedbacks --- radio/src/gui/480x272/model_select.cpp | 23 ++++++++++------------- 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, 10 insertions(+), 26 deletions(-) diff --git a/radio/src/gui/480x272/model_select.cpp b/radio/src/gui/480x272/model_select.cpp index 3da082d38..57e335e28 100644 --- a/radio/src/gui/480x272/model_select.cpp +++ b/radio/src/gui/480x272/model_select.cpp @@ -107,9 +107,9 @@ void setCurrentCategory(unsigned int index) #define WIZARD_ICON_Y 110 #define WIZARD_TEXT_Y 195 -uint8_t getWizardNumber() +uint8_t getWizardCount() { - uint8_t wizNbr=0; + uint8_t wizCnt=0; DIR dir; static FILINFO fno; @@ -121,25 +121,26 @@ uint8_t getWizardNumber() break; } if (fno.fattrib & AM_DIR) { - wizNbr++; + wizCnt++; } } } - return wizNbr; + return wizCnt; } bool menuModelWizard(event_t event) { - static uint8_t wizardSelected; - static uint8_t wizardNumber; + static uint8_t wizardSelected = 0; + static uint8_t wizardCnt = getWizardCount(); bool executeMe = false; uint8_t first = 0; DIR dir; static FILINFO fno; char wizpath[MAX_WIZARD_NAME_LEN]; - if(wizardNumber == 0) { - wizardNumber = getWizardNumber(); + if (wizardCnt == 0) { + chainMenu(menuModelSelect); + return false; } switch(event) { @@ -156,7 +157,7 @@ bool menuModelWizard(event_t event) break; case EVT_ROTARY_RIGHT: - if (wizardSelected < wizardNumber-1) { + if (wizardSelected < wizardCnt-1) { wizardSelected++; } if (wizardSelected > 3) { @@ -210,10 +211,6 @@ bool menuModelWizard(event_t event) } } f_closedir(&dir); - if(wizardNumber == 0) { - lcdDrawText(40, LCD_H / 2, STR_SDCARD_NOWIZ); - return true; - } } return true; } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index eef590e98..ba12cde88 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -502,7 +502,6 @@ const pm_char STR_DELETE_ERROR[] PROGMEM = TR_DELETE_ERROR; const pm_char STR_SDCARD_ERROR[] PROGMEM = TR_SDCARD_ERROR; const pm_char STR_NO_SDCARD[] PROGMEM = TR_NO_SDCARD; const pm_char STR_SDCARD_FULL[] PROGMEM = TR_SDCARD_FULL; -const pm_char STR_SDCARD_NOWIZ[] PROGMEM = TR_SDCARD_NOWIZ; const pm_char STR_INCOMPATIBLE[] PROGMEM = TR_INCOMPATIBLE; const pm_char STR_LOGS_PATH[] PROGMEM = LOGS_PATH; const pm_char STR_LOGS_EXT[] PROGMEM = LOGS_EXT; diff --git a/radio/src/translations.h b/radio/src/translations.h index 56b385506..c666a9ff6 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -726,7 +726,6 @@ extern const pm_char STR_RESET_BTN[]; extern const pm_char STR_SDCARD_ERROR[]; extern const pm_char STR_NO_SDCARD[]; extern const pm_char STR_SDCARD_FULL[]; - extern const pm_char STR_SDCARD_NOWIZ[]; extern const pm_char STR_INCOMPATIBLE[]; extern const pm_char STR_LOGS_PATH[]; extern const pm_char STR_LOGS_EXT[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 437aea48d..51cda7040 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -954,7 +954,6 @@ #define TR_SDCARD_ERROR "Chyba SD karty" #define TR_NO_SDCARD "Není SD karta" #define TR_SDCARD_FULL "Plná SD karta" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Nekompatibilní" #define TR_WARNING "KONTROLA" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 97888a93b..78a3a000e 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -958,7 +958,6 @@ #define TR_SDCARD_ERROR "SD-Kartenfehler" #define TR_NO_SDCARD "Keine SD-Karte" #define TR_SDCARD_FULL "SD-Karte voll" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Nicht kompatibel" #define TR_WARNING "WARNUNG" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index f615c26f8..61918f156 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -929,7 +929,6 @@ #define TR_SDCARD_ERROR TR("SD error", "SD card error") #define TR_NO_SDCARD "No SD card" #define TR_SDCARD_FULL "SD card full" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Incompatible" #define TR_WARNING "WARNING" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 78678d163..6874a3536 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -902,7 +902,6 @@ #define TR_SDCARD_ERROR "SDCARD Error" #define TR_NO_SDCARD "No SDCARD" #define TR_SDCARD_FULL "SD Card Full" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Incompatible" #define TR_WARNING "AVISO" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index d19c1bf7f..2de4d5d99 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -902,7 +902,6 @@ #define TR_SDCARD_ERROR "SDCARD Error" #define TR_NO_SDCARD "No SDCARD" #define TR_SDCARD_FULL "SD Card Full" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Incompatible" #define TR_WARNING "WARNING" #define TR_EEPROMWARN "FINSKA" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 3b8e304da..ad5bdd703 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -936,7 +936,6 @@ #define TR_SDCARD_ERROR "Erreur carte SD" #define TR_NO_SDCARD "Carte SD indisponible" #define TR_SDCARD_FULL "Carte SD pleine" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Incompatible" #define TR_WARNING "ALERTE" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 0fb8cde24..d938de666 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -937,7 +937,6 @@ #define TR_SDCARD_ERROR "Errore SD" #define TR_NO_SDCARD "No SDCARD" #define TR_SDCARD_FULL "SD Card Piena" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Incompatibile" #define TR_WARNING "AVVISO" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index b889586bc..b288610d6 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -931,7 +931,6 @@ #define TR_SDCARD_ERROR "SD-Kaart fout" #define TR_NO_SDCARD "Geen SD-Kaart" #define TR_SDCARD_FULL "SD-Kaart vol" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Niet compatibel" #define TR_WARNING "MELDING" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 12ad48ffc..22fb93a30 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -939,7 +939,6 @@ #define TR_SDCARD_ERROR "Błąd karty SD" #define TR_NO_SDCARD "Brak karty SD" #define TR_SDCARD_FULL "Karta Pełna " -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Niekompatybilne" #define TR_WARNING "UWAGA" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 189a02700..cab6bbd67 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -897,7 +897,6 @@ #define TR_SDCARD_ERROR "SDCARD Erro" #define TR_NO_SDCARD "Sem SDCARD" #define TR_SDCARD_FULL "SD Card Full" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Incompativel" #define TR_WARNING "AVISO" #define TR_EEPROMWARN "EEPROM" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 94dc1cc67..2548627dd 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -941,7 +941,6 @@ #define TR_SDCARD_ERROR "SDCARD-fel" #define TR_NO_SDCARD "SDCARD saknas" #define TR_SDCARD_FULL "SD-kort Fullt" -#define TR_SDCARD_NOWIZ "No wizard found on SD Card" #define TR_INCOMPATIBLE "Inkompatibel" #define TR_WARNING "VARNING" #define TR_EEPROMWARN "EEPROM"