From a83ce6a4d530272af3b58e687de6467522d76d17 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 17 Jun 2019 17:16:06 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/128x64/model_setup.cpp | 2 +- radio/src/gui/212x64/model_setup.cpp | 6 +++--- radio/src/gui/480x272/model_setup.cpp | 6 +++--- 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.txt | 1 - radio/src/translations/es.h.txt | 1 - radio/src/translations/fi.h.txt | 1 - radio/src/translations/fr.h.txt | 1 - radio/src/translations/it.h.txt | 1 - radio/src/translations/nl.h.txt | 1 - radio/src/translations/pl.h.txt | 1 - radio/src/translations/pt.h.txt | 1 - radio/src/translations/se.h.txt | 1 - 16 files changed, 7 insertions(+), 20 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 6e1ffc8a4..cfb95e554 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -449,7 +449,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER3_NAME: { TimerData * timer = &g_model.timers[k>=ITEM_MODEL_SETUP_TIMER3 ? 2 : (k>=ITEM_MODEL_SETUP_TIMER2 ? 1 : 0)]; - editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_TIMER_NAME, timer->name, sizeof(timer->name), event, attr); + editSingleName(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_NAME, timer->name, sizeof(timer->name), event, attr); break; } diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 94122139b..cc6aefead 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -401,7 +401,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER1_NAME: - editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_TIMER_NAME, g_model.timers[0].name, LEN_TIMER_NAME, event, attr); + editSingleName(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_NAME, g_model.timers[0].name, LEN_TIMER_NAME, event, attr); break; case ITEM_MODEL_SETUP_TIMER1_MINUTE_BEEP: @@ -422,7 +422,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER2_NAME: - editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_TIMER_NAME, g_model.timers[1].name, LEN_TIMER_NAME, event, attr); + editSingleName(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_NAME, g_model.timers[1].name, LEN_TIMER_NAME, event, attr); break; case ITEM_MODEL_SETUP_TIMER2_MINUTE_BEEP: @@ -444,7 +444,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER3_NAME: - editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_TIMER_NAME, g_model.timers[2].name, LEN_TIMER_NAME, event, attr); + editSingleName(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_NAME, g_model.timers[2].name, LEN_TIMER_NAME, event, attr); break; case ITEM_MODEL_SETUP_TIMER3_MINUTE_BEEP: diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index f512a6859..0364e935f 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -342,7 +342,7 @@ bool menuModelSetup(event_t event) break; case ITEM_MODEL_TIMER1_NAME: - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_TIMER_NAME); + lcdDrawText(MENUS_MARGIN_LEFT, y, INDENT TR_NAME); editName(MODEL_SETUP_2ND_COLUMN, y, g_model.timers[0].name, LEN_TIMER_NAME, event, attr); break; @@ -366,7 +366,7 @@ bool menuModelSetup(event_t event) break; case ITEM_MODEL_TIMER2_NAME: - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_TIMER_NAME); + lcdDrawText(MENUS_MARGIN_LEFT, y, INDENT TR_NAME); editName(MODEL_SETUP_2ND_COLUMN, y, g_model.timers[1].name, LEN_TIMER_NAME, event, attr); break; @@ -391,7 +391,7 @@ bool menuModelSetup(event_t event) break; case ITEM_MODEL_TIMER3_NAME: - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_TIMER_NAME); + lcdDrawText(MENUS_MARGIN_LEFT, y, INDENT TR_NAME); editName(MODEL_SETUP_2ND_COLUMN, y, g_model.timers[2].name, LEN_TIMER_NAME, event, attr); break; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index caf79251e..6a6a34901 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -187,7 +187,6 @@ const char STR_MODEL_STILL_POWERED[] = TR_MODEL_STILL_POWERED; const char STR_MODEL_SHUTDOWN[] = TR_MODEL_SHUTDOWN; const char STR_PRESS_ENTER_TO_CONFIRM[] = TR_PRESS_ENTER_TO_CONFIRM; const char STR_THROTTLEREVERSE[] = TR_THROTTLEREVERSE; -const char STR_TIMER_NAME[] = TR_TIMER_NAME; const char STR_MINUTEBEEP[] = TR_MINUTEBEEP; const char STR_BEEPCOUNTDOWN[] = TR_BEEPCOUNTDOWN; const char STR_PERSISTENT[] = TR_PERSISTENT; diff --git a/radio/src/translations.h b/radio/src/translations.h index 2d07b31e0..c91be1df9 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -288,7 +288,6 @@ extern const char STR_MODEL_STILL_POWERED[]; extern const char STR_MODEL_SHUTDOWN[]; extern const char STR_PRESS_ENTER_TO_CONFIRM[]; extern const char STR_THROTTLEREVERSE[]; -extern const char STR_TIMER_NAME[]; extern const char STR_MINUTEBEEP[]; extern const char STR_BEEPCOUNTDOWN[]; extern const char STR_PERSISTENT[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 7b6f0d15b..eaeb9c3e8 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -588,7 +588,6 @@ #define TR_RENAVIG "Navig. RotEnc" #define TR_THROTTLE_LABEL "Plyn" #define TR_THROTTLEREVERSE TR("ReversPlyn", INDENT"Revers plynu") -#define TR_TIMER_NAME INDENT "Název" #define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Oznamovat minuty") #define TR_BEEPCOUNTDOWN INDENT"Odpočet" #define TR_PERSISTENT INDENT"Trvalé" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 8807d478e..534644682 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -595,7 +595,6 @@ #define TR_RENAVIG "Drehgeb. Navig." #define TR_THROTTLE_LABEL "Gas-Kontrolle" #define TR_THROTTLEREVERSE TR("Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis -#define TR_TIMER_NAME INDENT "Name" #define TR_MINUTEBEEP TR(INDENT "Min-Alarm", INDENT "Minuten-Alarm") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Permanent", INDENT "Permanent") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 605c5cb9e..006561031 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -590,7 +590,6 @@ #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse") -#define TR_TIMER_NAME INDENT "Name" #define TR_MINUTEBEEP TR(INDENT "Minute", INDENT "Minute call") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistent") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 8e7f46a0f..e247bb789 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -606,7 +606,6 @@ #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("Invert_Acel", INDENT "Invertir Acel.") -#define TR_TIMER_NAME INDENT "Name" #define TR_MINUTEBEEP TR(INDENT"Minuto", INDENT"Cada Minuto") #define TR_BEEPCOUNTDOWN INDENT"Cuentaatras" #define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistente") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 51b8a081a..62eeda86a 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -598,7 +598,6 @@ #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Throttle reverse") -#define TR_TIMER_NAME INDENT "Name" #define TR_MINUTEBEEP TR(INDENT"Minute", INDENT"Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistent") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 108318792..eaa4cb9a9 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -604,7 +604,6 @@ #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLE_LABEL "Gaz" #define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz") -#define TR_TIMER_NAME INDENT "Nom" #define TR_MINUTEBEEP TR(INDENT "Bip min.", INDENT "Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin", INDENT "Compte à rebours") #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistant") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 977c94cc1..bdcc05350 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -605,7 +605,6 @@ #define TR_RENAVIG "Navig EncRot " #define TR_THROTTLE_LABEL "Motore" #define TR_THROTTLEREVERSE TR("Mot inv.", INDENT "Motore Inverso") -#define TR_TIMER_NAME INDENT "Nome" #define TR_MINUTEBEEP INDENT"Minuto" #define TR_BEEPCOUNTDOWN TR(INDENT"Conto rov", INDENT"Conto rovescia") #define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistente") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index e8d5f18b8..f085e70a5 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -589,7 +589,6 @@ TR_GYR_VSRCRAW #define TR_RENAVIG "Stappenschakelaar" #define TR_THROTTLE_LABEL "Gas" #define TR_THROTTLEREVERSE TR("Reverse", INDENT "Omgekeerd") -#define TR_TIMER_NAME INDENT "Naam" #define TR_MINUTEBEEP TR(INDENT "Min-Alarm", INDENT "Minuten-Alarm") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Vasth.", INDENT "Vasthouden") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 2c52d7057..210abc63a 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -605,7 +605,6 @@ #define TR_RENAVIG "Nawigacja potencjometrem" #define TR_THROTTLE_LABEL "Gaz " #define TR_THROTTLEREVERSE TR("OdwrGaz", INDENT "OdwrGaz") -#define TR_TIMER_NAME INDENT "Nazwa" #define TR_MINUTEBEEP TR(INDENT "Minuta", INDENT "PikCoMinutę") #define TR_BEEPCOUNTDOWN INDENT "Odliczanie" #define TR_PERSISTENT TR(INDENT "Dokł.", INDENT "Dokładny") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 6c35d5e9a..192e59226 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -591,7 +591,6 @@ #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("Inverte Acel.", INDENT "Inverte Acel.") -#define TR_TIMER_NAME INDENT "Name" #define TR_MINUTEBEEP INDENT "Beep Minuto" #define TR_BEEPCOUNTDOWN INDENT "Beep Regressivo" #define TR_PERSISTENT INDENT "Persist." diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index a72ef145f..328cdbfc5 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -604,7 +604,6 @@ #define TR_RENAVIG "RotEnk Navig" #define TR_THROTTLE_LABEL "Gas" #define TR_THROTTLEREVERSE TR("Inv.Gas", INDENT "Inverterad Gas") -#define TR_TIMER_NAME INDENT "Namn" #define TR_MINUTEBEEP INDENT "Minutpip" #define TR_BEEPCOUNTDOWN INDENT "Nedräkning" #define TR_PERSISTENT TR("Jämt på ", INDENT"Alltid På")