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

Fixes #1395

Browse Source
This commit is contained in:
bsongis
2014-07-02 21:38:05 +02:00
parent 81ed325830
commit e3866fda45
13 changed files with 93 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/menus.cpp
+2 -1
View File
@@ -1074,8 +1074,9 @@ void displayWarning(uint8_t event)
{
s_warning_result = false;
displayBox();
if (s_warning_info)
if (s_warning_info) {
lcd_putsnAtt(16, WARNING_LINE_Y+FH, s_warning_info, s_warning_info_len, WARNING_INFO_FLAGS);
}
lcd_puts(16, WARNING_LINE_Y+2*FH, s_warning_type == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS);
switch (event) {
#if defined(ROTARY_ENCODER_NAVIGATION)
radio/src/translations.cpp
+3
View File
@@ -127,6 +127,9 @@ const pm_char STR_OPEN9X[] PROGMEM =
// The 0-terminated-strings
const pm_char STR_POPUPS[] PROGMEM = TR_POPUPS;
#if !defined(OFS_EXIT)
const pm_char STR_EXIT[] PROGMEM = TR_EXIT;
#endif
const pm_char STR_MENUWHENDONE[] PROGMEM = TR_MENUWHENDONE;
const pm_char STR_FREE[] PROGMEM = TR_FREE;
const pm_char STR_DELETEMODEL[] PROGMEM = TR_DELETEMODEL;
radio/src/translations.h
+7 -1
View File
@@ -291,7 +291,13 @@ extern const pm_char STR_OPEN9X[];
#define NO_INDENT(x) (x)+LEN_INDENT
extern const pm_char STR_POPUPS[];
#define STR_EXIT (STR_POPUPS + OFS_EXIT)
#if defined(OFS_EXIT)
#define STR_EXIT (STR_POPUPS + OFS_EXIT)
#else
extern const pm_char STR_EXIT[];
#endif
extern const pm_char STR_MENUWHENDONE[];
extern const pm_char STR_FREE[];
#define LEN_FREE PSIZE(TR_FREE)
radio/src/translations/cz.h.txt
+9 -3
View File
@@ -485,10 +485,16 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[EXIT]"
#define TR_MENUWHENDONE CENTER "\011"TR_ENTER" > DALŠÍ"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER "\011" TR_ENTER " > DALŠÍ"
#define TR_FREE TR("volné:", "volných")
#define TR_DELETEMODEL "SMAZAT MODEL"
#define TR_COPYINGMODEL "Kopíruji model.."
radio/src/translations/de.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[EXIT]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER"\010"TR_ENTER" > Weiter"
#define TR_FREE "frei"
radio/src/translations/en.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER "\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[EXIT]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE"
#define TR_FREE "free"
radio/src/translations/es.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER "\010[SALIR]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[SALIR]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER "\007" TR_ENTER " AL ACABAR "
#define TR_FREE "libre"
radio/src/translations/fi.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER "\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[EXIT]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE"
#define TR_FREE "free"
radio/src/translations/fr.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[EXIT]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" QUAND PRET"
#define TR_FREE "disp"
radio/src/translations/it.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[Menù]"
#endif
#define TR_POPUPS TR_ENTER"\004[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[EXIT]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER "\007" TR_ENTER " Conferma"
#define TR_FREE "disp"
radio/src/translations/pl.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER "\010[WYJŚ]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[WYJŚ]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER "\006"TR_ENTER " > DALEJ "
#define TR_FREE "woln"
radio/src/translations/pt.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[EXIT]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER"\006"TR_ENTER"QDO PRONTO"
#define TR_FREE "Livre"
radio/src/translations/se.h.txt
+8 -2
View File
@@ -485,8 +485,14 @@
#define TR_ENTER "[MENU]"
#endif
#define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER)
#define TR_EXIT "[EXIT]"
#if defined(PCBTARANIS)
#define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER
#else
#define TR_POPUPS TR_ENTER "\010" TR_EXIT
#define OFS_EXIT sizeof(TR_ENTER)
#endif
#define TR_MENUWHENDONE CENTER "\011" TR_ENTER " Avslutar "
#define TR_FREE "kvar"