piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

improve

Browse Source
This commit is contained in:
3djc
2021-04-04 10:19:30 +02:00
parent c5b8ec7707
commit 3ce9ffd846
16 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/confirm_dialog.cpp
+15 -13
View File
@@ -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<void(void)> 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);
}
radio/src/translations.cpp
+2
View File
@@ -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;
radio/src/translations.h
+2
View File
@@ -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[];
radio/src/translations/cn.h.txt
+2
View File
@@ -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 "移动模型..."
radio/src/translations/cz.h.txt
+2
View File
@@ -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."
radio/src/translations/de.h.txt
+2
View File
@@ -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"
radio/src/translations/en.h.txt
+2
View File
@@ -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..."
radio/src/translations/es.h.txt
+2
View File
@@ -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..."
radio/src/translations/fi.h.txt
+2
View File
@@ -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..."
radio/src/translations/fr.h.txt
+2
View File
@@ -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..."
radio/src/translations/it.h.txt
+2
View File
@@ -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..."
radio/src/translations/nl.h.txt
+2
View File
@@ -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"
radio/src/translations/pl.h.txt
+2
View File
@@ -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."
radio/src/translations/pt.h.txt
+2
View File
@@ -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"
radio/src/translations/se.h.txt
+2
View File
@@ -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 "
radio/src/translations/tw.h.txt
+2
View File
@@ -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 "移動模型..."