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

Kjell added to the list of contributors in the About dialog. Thanks

Browse Source 
again!
This commit is contained in:
bsongis
2014-06-02 10:04:48 +02:00
parent b2058761f0
commit 14de1bb3f8
13 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/view_about.cpp
+24 -16
View File
@@ -49,11 +49,12 @@
enum AboutScreens {
ABOUT_OPENTX,
ABOUT_BERTRAND,
ABOUT_MIKE,
ABOUT_ROMOLO,
ABOUT_ANDRE,
ABOUT_ROB,
ABOUT_MIKE,
ABOUT_KJELL,
ABOUT_MARTIN,
ABOUT_ROMOLO,
ABOUT_ROB,
ABOUT_HARDWARE,
ABOUT_PARENTS,
ABOUT_END,
@@ -124,11 +125,29 @@ void menuAboutView(uint8_t event)
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_BERTRAND_3, att|SMLSIZE);
break;
case ABOUT_ANDRE:
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_ANDRE_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ANDRE_2, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ANDRE_3, att|SMLSIZE);
break;
case ABOUT_MIKE:
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_MIKE_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MIKE_2, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_MIKE_3, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT-1, 52, STR_ABOUT_MIKE_4, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_MIKE_4, att|SMLSIZE);
break;
case ABOUT_KJELL:
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_KJELL_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_KJELL_2, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_KJELL_3, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_KJELL_4, att|SMLSIZE);
break;
case ABOUT_MARTIN:
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_MARTIN_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MARTIN_2, att|SMLSIZE);
break;
case ABOUT_ROMOLO:
@@ -137,22 +156,11 @@ void menuAboutView(uint8_t event)
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ROMOLO_3, att|SMLSIZE);
break;
case ABOUT_ANDRE:
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_ANDRE_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ANDRE_2, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ANDRE_3, att|SMLSIZE);
break;
case ABOUT_ROB:
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_ROB_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROB_2, att|SMLSIZE);
break;
case ABOUT_MARTIN:
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_MARTIN_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MARTIN_2, att|SMLSIZE);
break;
case ABOUT_HARDWARE:
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_HARDWARE_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_HARDWARE_2, att|SMLSIZE);
@@ -163,7 +171,7 @@ void menuAboutView(uint8_t event)
lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_PARENTS_1, att);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_PARENTS_2, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_PARENTS_3, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT-1, 52, STR_ABOUT_PARENTS_4, att|SMLSIZE);
lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_PARENTS_4, att|SMLSIZE);
screenDuration = 255;
break;
}
radio/src/translations.cpp
+5
View File
@@ -596,6 +596,11 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
const pm_char STR_ABOUT_MARTIN_1[] PROGMEM = TR_ABOUT_MARTIN_1;
const pm_char STR_ABOUT_MARTIN_2[] PROGMEM = TR_ABOUT_MARTIN_2;
const pm_char STR_ABOUT_KJELL_1[] PROGMEM = TR_ABOUT_KJELL_1;
const pm_char STR_ABOUT_KJELL_2[] PROGMEM = TR_ABOUT_KJELL_2;
const pm_char STR_ABOUT_KJELL_3[] PROGMEM = TR_ABOUT_KJELL_3;
const pm_char STR_ABOUT_KJELL_4[] PROGMEM = TR_ABOUT_KJELL_4;
const pm_char STR_ABOUT_HARDWARE_1[] PROGMEM = TR_ABOUT_HARDWARE_1;
const pm_char STR_ABOUT_HARDWARE_2[] PROGMEM = TR_ABOUT_HARDWARE_2;
const pm_char STR_ABOUT_HARDWARE_3[] PROGMEM = TR_ABOUT_HARDWARE_3;
radio/src/translations.h
+5
View File
@@ -777,6 +777,11 @@ extern const pm_char STR_BLCOLOR[];
extern const pm_char STR_ABOUT_MARTIN_1[];
extern const pm_char STR_ABOUT_MARTIN_2[];
extern const pm_char STR_ABOUT_KJELL_1[];
extern const pm_char STR_ABOUT_KJELL_2[];
extern const pm_char STR_ABOUT_KJELL_3[];
extern const pm_char STR_ABOUT_KJELL_4[];
extern const pm_char STR_ABOUT_HARDWARE_1[];
extern const pm_char STR_ABOUT_HARDWARE_2[];
extern const pm_char STR_ABOUT_HARDWARE_3[];
radio/src/translations/cz.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "openrcforums webmaster"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotař"
#define TR_ABOUT_MARTIN_2 "Grafický design, Čeština"
radio/src/translations/de.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "Openrcforums Webmaster"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Grafik Designer"
radio/src/translations/en.h.txt
+7 -2
View File
@@ -856,7 +856,7 @@
#define TR_ABOUT_MIKE_4 "Inspirational"
#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini"
#define TR_ABOUT_ROMOLO_2 "Companion9x co-author"
#define TR_ABOUT_ROMOLO_2 "Companion co-author"
#define TR_ABOUT_ROMOLO_3 ""
#define TR_ABOUT_ANDRE_1 "Andre Bernet"
@@ -866,7 +866,12 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "openrcforums webmaster"
#define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Kjell Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Graphics designer"
#if defined(PCBTARANIS)
radio/src/translations/es.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "openrcforums webmaster"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Dise\201o grafico"
radio/src/translations/fi.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "openrcforums webmaster"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Graphics designer"
radio/src/translations/fr.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "Webmaster d'openrcforums"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Design graphique"
radio/src/translations/it.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "Webmaster openrcforums"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Graphic Designer"
radio/src/translations/pl.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "openrcforums webmaster"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotař"
#define TR_ABOUT_MARTIN_2 "Projekty graficzne"
radio/src/translations/pt.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "openrcforums webmaster"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Graphics designer"
radio/src/translations/se.h.txt
+5
View File
@@ -866,6 +866,11 @@
#define TR_ABOUT_ROB_1 "Rob Thomson"
#define TR_ABOUT_ROB_2 "Webmaster för openRCforums"
#define TR_ABOUT_KJELL_1 "Kjell Kernen"
#define TR_ABOUT_KJELL_2 "www.open-tx.org main author"
#define TR_ABOUT_KJELL_3 "OpenTX Recorder author"
#define TR_ABOUT_KJELL_4 "Companion contributor"
#define TR_ABOUT_MARTIN_1 "Martin Hotar"
#define TR_ABOUT_MARTIN_2 "Grafikdesigner"