From a3fe388399cb789e2de834a09dbf459541e35390 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 6 May 2019 10:30:51 +0200 Subject: [PATCH] Register fix --- radio/src/gui/128x64/model_setup.cpp | 1 + radio/src/gui/480x272/model_failsafe.cpp | 4 ++-- radio/src/gui/common/stdlcd/popups.h | 4 ---- radio/src/translations/de.h.txt | 4 ++-- radio/src/translations/en.h.txt | 4 ++-- radio/src/translations/es.h.txt | 4 ++-- radio/src/translations/fi.h.txt | 4 ++-- radio/src/translations/fr.h.txt | 4 ++-- radio/src/translations/it.h.txt | 4 ++-- radio/src/translations/nl.h.txt | 4 ++-- radio/src/translations/pl.h.txt | 4 ++-- radio/src/translations/pt.h.txt | 4 ++-- radio/src/translations/se.h.txt | 4 ++-- 13 files changed, 23 insertions(+), 26 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 969ecea50..0548d5fe2 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -501,6 +501,7 @@ void startRegisterDialog(uint8_t module) reusableBuffer.moduleSetup.pxx2.registerPopupVerticalPosition = ITEM_REGISTER_BUTTONS; moduleState[module].mode = MODULE_MODE_REGISTER; s_editMode = 0; + killAllEvents(); POPUP_INPUT("", runPopupRegister); } diff --git a/radio/src/gui/480x272/model_failsafe.cpp b/radio/src/gui/480x272/model_failsafe.cpp index 02ae5e6f2..0a720aad0 100644 --- a/radio/src/gui/480x272/model_failsafe.cpp +++ b/radio/src/gui/480x272/model_failsafe.cpp @@ -96,11 +96,11 @@ bool menuModelFailsafe(event_t event) x += (LCD_W/2)-4-MENUS_MARGIN_LEFT-SLIDER_W; if (failsafeValue == FAILSAFE_CHANNEL_HOLD) { - lcdDrawText(x, y+2, "HOLD", flags|SMLSIZE); + lcdDrawText(x, y+2, STR_HOLD, flags|SMLSIZE); failsafeValue = 0; } else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) { - lcdDrawText(x, y+2, "NONE", flags|SMLSIZE); + lcdDrawText(x, y+2, STR_NONE, flags|SMLSIZE); failsafeValue = 0; } else { diff --git a/radio/src/gui/common/stdlcd/popups.h b/radio/src/gui/common/stdlcd/popups.h index f5c8ef386..4ba6e8b14 100644 --- a/radio/src/gui/common/stdlcd/popups.h +++ b/radio/src/gui/common/stdlcd/popups.h @@ -91,7 +91,6 @@ enum inline void POPUP_INFORMATION(const char * s) { - killAllEvents(); warningText = s; warningInfoText = nullptr; warningType = WARNING_TYPE_INFO; @@ -100,7 +99,6 @@ enum inline void POPUP_WARNING(const char * s) { - killAllEvents(); warningText = s; warningInfoText = nullptr; warningType = WARNING_TYPE_ASTERISK; @@ -109,7 +107,6 @@ enum inline void POPUP_CONFIRMATION(const char * s, PopupMenuHandler handler) { - killAllEvents(); warningText = s; warningInfoText = nullptr; warningType = WARNING_TYPE_CONFIRM; @@ -119,7 +116,6 @@ enum inline void POPUP_INPUT(const char * s, PopupFunc func) { - killAllEvents(); warningText = s; warningInfoText = nullptr; warningType = WARNING_TYPE_INPUT; diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 9a3364ce2..7dbde0e42 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -954,8 +954,8 @@ #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 1b98cbf3d..448d83387 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -944,8 +944,8 @@ #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 4492f672a..183296eec 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -956,8 +956,8 @@ #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 7e490f1cc..cb27bbaef 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -944,8 +944,8 @@ #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index e1349a78e..ca7ad01e8 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -956,8 +956,8 @@ #define TR_REG_ID TR("ID Enr.", "ID Enregisrement") #define TR_OWNER_ID "ID Radio" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "CAPTEUR" #define TR_POWERMETER_PEAK "Pic" #define TR_POWERMETER_POWER "Puiss" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index d8fd09808..c9cbacf0c 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -950,8 +950,8 @@ #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index aa20b0810..b10fc37b5 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -951,8 +951,8 @@ TR_GYR_VSRCRAW #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 75b2e3992..7cc386677 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -951,8 +951,8 @@ #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "CZUJNIK" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 0c386ead2..88060f009 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -955,8 +955,8 @@ #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 602fb4572..f2463fb56 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -964,8 +964,8 @@ #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" -#define TR_HOLD "HOLD" -#define TR_NONE "NONE" +#define TR_HOLD "Hold" +#define TR_NONE "None" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power"