diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp index 202628769..92930ce46 100644 --- a/radio/src/gui/128x64/popups.cpp +++ b/radio/src/gui/128x64/popups.cpp @@ -97,6 +97,11 @@ void runPopupWarning(event_t event) lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT)); switch (event) { case EVT_KEY_BREAK(KEY_ENTER): + if(warningType == WARNING_TYPE_INFO) { + warningText = NULL; + warningType = WARNING_TYPE_ASTERISK; + } + // no break if (warningType == WARNING_TYPE_ASTERISK) break; warningResult = true; diff --git a/radio/src/gui/212x64/popups.cpp b/radio/src/gui/212x64/popups.cpp index c233a1df0..d36d65efb 100644 --- a/radio/src/gui/212x64/popups.cpp +++ b/radio/src/gui/212x64/popups.cpp @@ -91,9 +91,14 @@ void runPopupWarning(event_t event) if (warningInfoText) { lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS); } - lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT)); + lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT)); switch (event) { case EVT_KEY_BREAK(KEY_ENTER): + if(warningType == WARNING_TYPE_INFO) { + warningText = NULL; + warningType = WARNING_TYPE_ASTERISK; + } + // no break if (warningType == WARNING_TYPE_ASTERISK) break; warningResult = true; diff --git a/radio/src/gui/480x272/popups.cpp b/radio/src/gui/480x272/popups.cpp index 4566bd85c..f5ae8bf22 100644 --- a/radio/src/gui/480x272/popups.cpp +++ b/radio/src/gui/480x272/popups.cpp @@ -81,6 +81,11 @@ void runPopupWarning(event_t event) switch (event) { case EVT_KEY_BREAK(KEY_ENTER): + if(warningType == WARNING_TYPE_INFO) { + warningText = NULL; + warningType = WARNING_TYPE_ASTERISK; + } + // no break if (warningType == WARNING_TYPE_ASTERISK) break; warningResult = true; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 15af4d5d8..b88c9d7be 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -558,6 +558,7 @@ const char STR_FLASH_BOOTLOADER[] = TR_FLASH_BOOTLOADER; const char STR_FLASH_INTERNAL_MODULE[] = TR_FLASH_INTERNAL_MODULE; const char STR_FLASH_EXTERNAL_MODULE[] = TR_FLASH_EXTERNAL_MODULE; const char STR_FIRMWARE_UPDATE_ERROR[] = TR_FIRMWARE_UPDATE_ERROR; +const char STR_FIRMWARE_UPDATE_SUCCESS[] = TR_FIRMWARE_UPDATE_SUCCESS; const char STR_FLASH_EXTERNAL_DEVICE[] = TR_FLASH_EXTERNAL_DEVICE; const char STR_WRITING[] = TR_WRITING; const char STR_CONFIRM_FORMAT[] = TR_CONFIRM_FORMAT; diff --git a/radio/src/translations.h b/radio/src/translations.h index 77db494b2..383363a63 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -759,6 +759,7 @@ extern const char STR_FLASH_EXTERNAL_DEVICE[]; extern const char STR_FLASH_INTERNAL_MODULE[]; extern const char STR_FLASH_EXTERNAL_MODULE[]; extern const char STR_FIRMWARE_UPDATE_ERROR[]; +extern const char STR_FIRMWARE_UPDATE_SUCCESS[]; extern const char STR_WRITING[]; extern const char STR_CONFIRM_FORMAT[]; extern const char STR_EEBACKUP[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 846df51d0..b6602dc9f 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -915,6 +915,7 @@ #define TR_FLASH_INTERNAL_MODULE TR("Flash vnitř. modulu", "Flash vnitřního modulu") #define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. modulu", "Flash externího zařízení") #define TR_FIRMWARE_UPDATE_ERROR TR("Chyba zápisu FW", "Chyba zápisu firmware") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING TR3("\14Zapisuji..", "\032Zapisuji..", "Zapisuji..") #define TR_CONFIRM_FORMAT "Provést Formát?" #define TR_INTERNALRF "Vnitřní RF modul" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index c1113ccd5..c0c7edd59 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -920,6 +920,7 @@ #define TR_FLASH_INTERNAL_MODULE TR("Flash int. XJT","Flash internes XJT-Modul") #define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. mod","Flash extern module") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING "\032Writing..." // #define TR_CONFIRM_FORMAT "Formatieren bestätigen?" #define TR_INTERNALRF "Internes HF-Modul" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index c8283c509..59afceeea 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -919,6 +919,7 @@ #define TR_FLASH_INTERNAL_MODULE TR("Flash int. module", "Flash internal module") #define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. module", "Flash external module") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update error", "Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING TR3("\14Writing...", "\032Writing...", "Writing...") #define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Internal RF" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index c25de41ac..4f8b92c5d 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -926,6 +926,7 @@ #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING "\032Writing..." #define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Interna RF" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 5815b18b4..035415480 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -918,6 +918,7 @@ #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING "\032Writing..." #define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Internal RF" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index c5e61d9d3..e51b559ce 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -930,6 +930,7 @@ #define TR_FLASH_INTERNAL_MODULE TR("Flasher module int.", "Flasher module interne") #define TR_FLASH_EXTERNAL_MODULE TR("Flasher module ext.", "Flasher module externe") #define TR_FIRMWARE_UPDATE_ERROR TR("Erreur màj FW","Erreur de mise à jour") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING TR("\14Ecriture...", "\032Ecriture...") #define TR_CONFIRM_FORMAT "Confirmer Formatage?" #define TR_INTERNALRF "HF interne" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index ea8d0272b..43a903070 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -920,6 +920,7 @@ #define TR_FLASH_INTERNAL_MODULE "Progr. Modulo Interno" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING "\032Scrivendo..." #define TR_CONFIRM_FORMAT "Confermi Format?" #define TR_INTERNALRF "Modulo Interno" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 107733162..8520deafd 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -921,6 +921,7 @@ #define TR_FLASH_INTERNAL_MODULE "Flash interne XJT-Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING "\032Schrijven..." #define TR_CONFIRM_FORMAT "Formatteren bevestigen?" #define TR_INTERNALRF "Interne RF" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index bf74ec903..646901062 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -921,6 +921,7 @@ #define TR_FLASH_INTERNAL_MODULE "Sflashuj Moduł Wewnętrzny" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING "\032Zapis... " #define TR_CONFIRM_FORMAT "Zatwierdź Format?" #define TR_INTERNALRF "Wewn.Moduł RF" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 37d2bdd10..5cb8a2245 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -925,6 +925,7 @@ #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING "\032Writing..." #define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Internal RF" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index a9bf87e83..afdc67c59 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -934,6 +934,7 @@ #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") +#define TR_FIRMWARE_UPDATE_SUCCESS "Flash successful" #define TR_WRITING "\032Skriver..." #define TR_CONFIRM_FORMAT "Formatera Minnet?" #define TR_INTERNALRF "Intern Radio"