From 8936b3feec431eb1499d11b5a69d16942374aa6d Mon Sep 17 00:00:00 2001 From: Dvogonen Date: Sun, 26 Jan 2014 19:52:44 +0100 Subject: [PATCH 1/2] Fixes 607 --- radio/src/fonts/std/font_03x05.png | Bin 222 -> 261 bytes radio/src/gui/menu_model.cpp | 2 +- radio/src/translations.cpp | 1 + radio/src/translations.h | 1 + radio/src/translations/cz.h.txt | 1 + radio/src/translations/de.h.txt | 1 + radio/src/translations/en.h | 1 + radio/src/translations/es.h.txt | 1 + radio/src/translations/fr.h.txt | 1 + radio/src/translations/it.h.txt | 1 + radio/src/translations/pl.h.txt | 1 + radio/src/translations/pt.h.txt | 1 + radio/src/translations/se.h.txt | 1 + 13 files changed, 12 insertions(+), 1 deletion(-) diff --git a/radio/src/fonts/std/font_03x05.png b/radio/src/fonts/std/font_03x05.png index c378d30f00d8dc9d479bb2526dbc754ed709ec9a..59357bafdfa80fc355d921059336ff700d454d5f 100644 GIT binary patch delta 207 zcmV;=05JdF0fhpPBo78+OGiWi{{a60|De66laVeSf8GHa5(Xb4)Rfr(005FnL_t(I z%dJye4!|G`8fN#uvioR8NFUnF^^0^Uj8@D!uetyj!2p2Bsrrjri+0NSG0e`^k|T_c zl8V_65V))Lt8yavD}p#A1s|RGcy!uQh1(^T<002ov JPDHLkV1ftvU+4e; delta 194 zcmV;z06qVO0^R|TB!2;OQb$4nuFf3k00009a7bBm000XU000XU0RWnu7ytkO2XskI zMF-sn92O4)%%KC(0001RNklx4(T)}h ws+R63ZPGbt#n-r*3xj|`>O3#Xchn], sizeof(g_model.inputNames[ed->chn]), event, attr); + editSingleName(EXPO_ONE_2ND_COLUMN, y, STR_INPUTNAME, g_model.inputNames[ed->chn], sizeof(g_model.inputNames[ed->chn]), event, attr); break; #endif diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 842ec8090..7702d5dfe 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -462,6 +462,7 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text"; const pm_char STR_MODELNAME[] PROGMEM = TR_MODELNAME; const pm_char STR_PHASENAME[] PROGMEM = TR_PHASENAME; const pm_char STR_MIXNAME[] PROGMEM = TR_MIXNAME; + const pm_char STR_INPUTNAME[] PROGMEM = TR_INPUTNAME; const pm_char STR_EXPONAME[] PROGMEM = TR_EXPONAME; #endif diff --git a/radio/src/translations.h b/radio/src/translations.h index d83e3c753..b7a29ade0 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -644,6 +644,7 @@ extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_MODELNAME[]; extern const pm_char STR_PHASENAME[]; extern const pm_char STR_MIXNAME[]; + extern const pm_char STR_INPUTNAME[]; extern const pm_char STR_EXPONAME[]; #else #define STR_MODELNAME STR_NAME diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index e33ff4681..b7c647b22 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -396,6 +396,7 @@ #define TR_MODELNAME "Název modelu" #define TR_PHASENAME "Jméno" #define TR_MIXNAME "Jméno" +#define TR_INPUTNAME "Input Name" #if defined(PCBTARANIS) #define TR_EXPONAME "Line Name" #else diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index b3459d7d6..fdc27a031 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -396,6 +396,7 @@ #define TR_MODELNAME "Modell Name" #define TR_PHASENAME "Phase Name" #define TR_MIXNAME "Mix Name" +#define TR_INPUTNAME "Input Name" #if defined(PCBTARANIS) #define TR_EXPONAME "Linie Name" #else diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 7da0e0978..60ff2beac 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -396,6 +396,7 @@ #define TR_MODELNAME "Model Name" #define TR_PHASENAME "Mode Name" #define TR_MIXNAME "Mix Name" +#define TR_INPUTNAME "Input Name" #if defined(PCBTARANIS) #define TR_EXPONAME "Line Name" #else diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 960cc51b5..8156b0e1e 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -396,6 +396,7 @@ #define TR_MODELNAME "Nom.Modelo" #define TR_PHASENAME "Nom.Fase " #define TR_MIXNAME "Nom.Mezcla" +#define TR_INPUTNAME "Input Name" #if defined(PCBTARANIS) #define TR_EXPONAME "Line Name" #else diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 6d2c4f08c..a25d129b1 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -396,6 +396,7 @@ #define TR_MODELNAME TR("Nom modèle","Nom du modèle") #define TR_PHASENAME "Nom phase" #define TR_MIXNAME TR("Nom mix.","Nom du mixeur") +#define TR_INPUTNAME "Input Name" #if defined(PCBTARANIS) #define TR_EXPONAME "Nom ligne" #else diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 18b5d61e7..6c511de82 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -396,6 +396,7 @@ #define TR_MODELNAME "Nome modello" #define TR_PHASENAME "Nome fase" #define TR_MIXNAME "Nome mix" +#define TR_INPUTNAME "Input Name" #if defined(PCBTARANIS) #define TR_EXPONAME "Nome expo" #else diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index e2b92f2ea..88580ea5f 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -396,6 +396,7 @@ #define TR_MODELNAME "Nazwa modelu" #define TR_PHASENAME "Nazwa" #define TR_MIXNAME "Nazwa" +#define TR_INPUTNAME "Input Name" #if defined(PCBTARANIS) #define TR_EXPONAME "Line Name" #else diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index bf2d288ec..296df8b65 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -396,6 +396,7 @@ #define TR_MODELNAME "Model Name" #define TR_PHASENAME "Phase Name" #define TR_MIXNAME "Mix Name" +#define TR_INPUTNAME "Input Name" #if defined(PCBTARANIS) #define TR_EXPONAME "Line Name" #else diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index e7a23b7ba..e5948641c 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -396,6 +396,7 @@ #define TR_MODELNAME "Modellnamn" #define TR_PHASENAME "Lägesnamn " #define TR_MIXNAME "Mixnamn " +#define TR_INPUTNAME "Filternamn" #if defined(PCBTARANIS) #define TR_EXPONAME "Linjenamn" #else From 69da337b70c5f6338dad9dfe91917a2eaebdb3d6 Mon Sep 17 00:00:00 2001 From: Dvogonen Date: Sun, 26 Jan 2014 20:40:39 +0100 Subject: [PATCH 2/2] Fixes 607 --- radio/src/lcd.cpp | 2 +- radio/src/translations.h | 1 + radio/src/translations/cz.h.txt | 1 + radio/src/translations/de.h.txt | 1 + radio/src/translations/en.h | 1 + radio/src/translations/es.h.txt | 1 + radio/src/translations/fr.h.txt | 1 + radio/src/translations/it.h.txt | 1 + radio/src/translations/pl.h.txt | 1 + radio/src/translations/pt.h.txt | 1 + radio/src/translations/se.h.txt | 1 + 11 files changed, 11 insertions(+), 1 deletion(-) diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp index 3034f38ec..7b2cbe7f0 100644 --- a/radio/src/lcd.cpp +++ b/radio/src/lcd.cpp @@ -957,7 +957,7 @@ void putsMixerSource(xcoord_t x, uint8_t y, uint8_t idx, LcdFlags att) lcd_putsiAtt(x, y, STR_VSRCRAW, 0, att); } else if (idx <= MIXSRC_LAST_INPUT) { - lcd_putcAtt(x+2, y+1, 'I', TINSIZE); + lcd_putcAtt(x+2, y+1, CHR_INPUT, TINSIZE); lcd_filled_rect(x, y, 7, 7); if (ZEXIST(g_model.inputNames[idx-MIXSRC_FIRST_INPUT])) lcd_putsnAtt(x+8, y, g_model.inputNames[idx-MIXSRC_FIRST_INPUT], 4, ZCHAR|att); diff --git a/radio/src/translations.h b/radio/src/translations.h index b7a29ade0..0c7f7af19 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -765,5 +765,6 @@ extern const pm_char STR_VIEW_TEXT[]; #define CHR_LONG TR_CHR_LONG #define CHR_TOGGLE TR_CHR_TOGGLE #define CHR_HOUR TR_CHR_HOUR +#define CHR_INPUT TR_CHR_INPUT #endif diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index b7c647b22..f99387065 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' #define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Pípání" #define TR_WAV_VOLUME "Zvuky WAV" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index fdc27a031..e5b10c4db 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' //Taste long #define TR_CHR_TOGGLE 't' //Taste als togglefunktion = Ein Aus Ein #define TR_CHR_HOUR 'h' //Stunden +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Lautst" #define TR_WAV_VOLUME "Wav Lautst" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 60ff2beac..9339ce7df 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' #define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" #define TR_WAV_VOLUME "Wav Volume" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 8156b0e1e..bc4cf77fc 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' #define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Volumen Beep" #define TR_WAV_VOLUME "Volumen Wav" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index a25d129b1..ac546bc96 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' #define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" #define TR_WAV_VOLUME "Wav Volume" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 6c511de82..7e5183ecf 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' #define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" #define TR_WAV_VOLUME "Wav Volume" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 88580ea5f..925589797 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' #define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Głośność pikania" #define TR_WAV_VOLUME "Głośność wav" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 296df8b65..eeb98b1ef 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' #define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" #define TR_WAV_VOLUME "Wav Volume" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index e5948641c..fe453f4ff 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -762,6 +762,7 @@ #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' #define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'F' // Values between A-I will work #define TR_BEEP_VOLUME "Volym Pip" #define TR_WAV_VOLUME "Volym Wav"