From 3ce9ffd846bc7bd1fb748f967e7cad6311be9422 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 4 Apr 2021 10:19:30 +0200 Subject: [PATCH] improve --- radio/src/gui/colorlcd/confirm_dialog.cpp | 28 ++++++++++++----------- radio/src/translations.cpp | 2 ++ radio/src/translations.h | 2 ++ radio/src/translations/cn.h.txt | 2 ++ radio/src/translations/cz.h.txt | 2 ++ radio/src/translations/de.h.txt | 2 ++ radio/src/translations/en.h.txt | 2 ++ radio/src/translations/es.h.txt | 2 ++ radio/src/translations/fi.h.txt | 2 ++ radio/src/translations/fr.h.txt | 2 ++ radio/src/translations/it.h.txt | 2 ++ radio/src/translations/nl.h.txt | 2 ++ radio/src/translations/pl.h.txt | 2 ++ radio/src/translations/pt.h.txt | 2 ++ radio/src/translations/se.h.txt | 2 ++ radio/src/translations/tw.h.txt | 2 ++ 16 files changed, 45 insertions(+), 13 deletions(-) diff --git a/radio/src/gui/colorlcd/confirm_dialog.cpp b/radio/src/gui/colorlcd/confirm_dialog.cpp index a6d7d83a9..ac6559a6f 100644 --- a/radio/src/gui/colorlcd/confirm_dialog.cpp +++ b/radio/src/gui/colorlcd/confirm_dialog.cpp @@ -18,33 +18,35 @@ * GNU General Public License for more details. */ +#include "opentx.h" #include "confirm_dialog.h" #include "static.h" #include "gridlayout.h" ConfirmDialog::ConfirmDialog(Window * parent, const char * title, const char * message, std::function confirmHandler) : - Dialog(parent, title, {50, 73, LCD_W - 100, LCD_H - 146}), + Dialog(parent, title, {LCD_W / 10 , LCD_H / 4, LCD_W - 2 * LCD_W / 10, LCD_H - 2 * LCD_H / 4}), confirmHandler(std::move(confirmHandler)) { auto form = &content->form; FormGridLayout grid(content->form.width()); form->clear(); - + new StaticText(form, grid.getCenteredSlot(), message); + grid.setLabelWidth(15); + grid.setMarginRight(15); + grid.nextLine(); grid.nextLine(); - auto noButton = new TextButton(form, grid.getSlot(2, 0), "NO", - [=]() -> int8_t { - this->deleteLater(); - return 0; - }); + auto noButton = new TextButton(form, grid.getFieldSlot(2, 0), STR_NO, [=]() -> int8_t { + this->deleteLater(); + return 0; + }); - new TextButton(form, grid.getSlot(2, 1), "YES", - [=]() -> int8_t { - this->deleteLater(); - this->confirmHandler(); - return 0; - }); + new TextButton(form, grid.getFieldSlot(2, 1), STR_YES, [=]() -> int8_t { + this->deleteLater(); + this->confirmHandler(); + return 0; + }); noButton->setFocus(SET_FOCUS_DEFAULT); } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index ef23ee02f..00029ebb2 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -110,6 +110,8 @@ ISTR(SUBTRIMMODES); 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_YES[] = TR_YES; +const char STR_NO[] = TR_NO; 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 1575f6b9d..04fd1d9f2 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -207,6 +207,8 @@ extern const char STR_NO_TELEMETRY_SCREENS[]; #endif extern const char STR_FREE[]; +extern const char STR_YES[]; +extern const char STR_NO[]; #define LEN_FREE PSIZE(TR_FREE) extern const char STR_DELETEMODEL[]; extern const char STR_COPYINGMODEL[]; diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt index 5af97c900..91e172e5c 100644 --- a/radio/src/translations/cn.h.txt +++ b/radio/src/translations/cn.h.txt @@ -348,6 +348,8 @@ #define TR_POPUPS_ENTER_EXIT TR_ENTER "\010" TR_EXIT #define TR_FREE "空闲" +#define TR_YES "Yes" +#define TR_NO "No" #define TR_DELETEMODEL "删除" BREAKSPACE "模型" #define TR_COPYINGMODEL "复制模型..." #define TR_MOVINGMODEL "移动模型..." diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 6ebc683a5..d24ac7949 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -423,6 +423,8 @@ #define TR_MENUWHENDONE CENTER "\011" TR_ENTER " > DALŠÍ" #define TR_FREE TR("volné:", "volných") +#define TR_YES "Yes" +#define TR_NO "No" #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 6030854aa..fa39e5ce8 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -428,6 +428,8 @@ #endif #define TR_FREE "frei" +#define TR_YES "Yes" +#define TR_NO "No" #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 5bf6819b3..300c50c4a 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -427,6 +427,8 @@ #endif #define TR_FREE "free" +#define TR_YES "Yes" +#define TR_NO "No" #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 403b91683..0bfbb9506 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -426,6 +426,8 @@ #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " AL ACABAR " #define TR_FREE "libre" +#define TR_YES "Yes" +#define TR_NO "No" #define TR_DELETEMODEL "BORRAR MODELO" #define TR_COPYINGMODEL "Copiando modelo.." #define TR_MOVINGMODEL "Moviendo modelo..." diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index ae0a33191..7459d8909 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -436,6 +436,8 @@ #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" #define TR_FREE "free" +#define TR_YES "Yes" +#define TR_NO "No" #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 04081b185..189cbef48 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -446,6 +446,8 @@ #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " QUAND PRET" #define TR_FREE "disp" +#define TR_YES "Yes" +#define TR_NO "No" #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 f7b6df8d5..8d514debe 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -451,6 +451,8 @@ #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " Conferma" #define TR_FREE "Disp." +#define TR_YES "Yes" +#define TR_NO "No" #define TR_DELETEMODEL "CANCELLA" BREAKSPACE "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 9f8a384a8..5f76c5b3a 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -427,6 +427,8 @@ #endif #define TR_FREE "vrij" +#define TR_YES "Yes" +#define TR_NO "No" #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 fdc8c7d8f..9e38e723e 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -447,6 +447,8 @@ #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " > DALEJ" #define TR_FREE "woln" +#define TR_YES "Yes" +#define TR_NO "No" #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 b2194d6d0..389eeea00 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -440,6 +440,8 @@ #define TR_MENUWHENDONE CENTER"\006" TR_ENTER "QDO PRONTO" #define TR_FREE "Livre" +#define TR_YES "Yes" +#define TR_NO "No" #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 585ec8d12..9637b9f65 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -445,6 +445,8 @@ #define TR_MENUWHENDONE CENTER "\011" TR_ENTER " Avslutar " #define TR_FREE "kvar" +#define TR_YES "Yes" +#define TR_NO "No" #define TR_DELETEMODEL "Radera Modell" #define TR_COPYINGMODEL "Kopierar Modell " #define TR_MOVINGMODEL "Flyttar Modell " diff --git a/radio/src/translations/tw.h.txt b/radio/src/translations/tw.h.txt index ff7f1f3e7..915fd406f 100644 --- a/radio/src/translations/tw.h.txt +++ b/radio/src/translations/tw.h.txt @@ -348,6 +348,8 @@ #define TR_POPUPS_ENTER_EXIT TR_ENTER "\010" TR_EXIT #define TR_FREE "空閒" +#define TR_YES "Yes" +#define TR_NO "No" #define TR_DELETEMODEL "刪除" BREAKSPACE "模型" #define TR_COPYINGMODEL "複製模型..." #define TR_MOVINGMODEL "移動模型..."