From 183ed18a427698db6610b0214a164d635a1f5c8e Mon Sep 17 00:00:00 2001 From: rotorman Date: Sat, 21 Jan 2023 13:38:16 +0100 Subject: [PATCH] Adds option to align value widget label and value to left, center or right border of the widget zone. --- radio/src/gui/colorlcd/widget_settings.cpp | 17 ++++- radio/src/gui/colorlcd/widgets/value.cpp | 86 +++++++++++++++++++--- radio/src/gui/colorlcd/zone.h | 15 +++- radio/src/lua/api_general.cpp | 1 + radio/src/lua/widgets.cpp | 3 +- radio/src/translations.cpp | 3 + radio/src/translations.h | 3 + radio/src/translations/cn.h | 55 +++++++------- radio/src/translations/cz.h | 55 +++++++------- radio/src/translations/da.h | 55 +++++++------- radio/src/translations/de.h | 49 ++++++------ radio/src/translations/en.h | 55 +++++++------- radio/src/translations/es.h | 55 +++++++------- radio/src/translations/fi.h | 55 +++++++------- radio/src/translations/fr.h | 55 +++++++------- radio/src/translations/it.h | 55 +++++++------- radio/src/translations/jp.h | 55 +++++++------- radio/src/translations/nl.h | 55 +++++++------- radio/src/translations/pl.h | 55 +++++++------- radio/src/translations/pt.h | 57 +++++++------- radio/src/translations/se.h | 59 ++++++++------- 21 files changed, 532 insertions(+), 366 deletions(-) diff --git a/radio/src/gui/colorlcd/widget_settings.cpp b/radio/src/gui/colorlcd/widget_settings.cpp index c7054b5bf18..bf351a0aad3 100644 --- a/radio/src/gui/colorlcd/widget_settings.cpp +++ b/radio/src/gui/colorlcd/widget_settings.cpp @@ -107,7 +107,7 @@ WidgetSettings::WidgetSettings(Window* parent, Widget* widget) : case ZoneOption::File: break; - case ZoneOption::TextSize: { + case ZoneOption::TextSize: new Choice( line, rect_t{}, STR_FONT_SIZES, 0, FONTS_COUNT - 1, [=]() -> int { // getValue @@ -119,7 +119,20 @@ WidgetSettings::WidgetSettings(Window* parent, Widget* widget) : SET_DIRTY(); }); break; - } + + case ZoneOption::Align: + new Choice( + line, rect_t{}, STR_ALIGN_OPTS, 0, ALIGN_COUNT - 1, + [=]() -> int { // getValue + return (int)widget->getOptionValue(optIdx)->unsignedValue; + }, + [=](int newValue) { // setValue + widget->getOptionValue(optIdx)->unsignedValue = + (uint32_t)newValue; + SET_DIRTY(); + }); + break; + case ZoneOption::Timer: // Unsigned { auto tmChoice = new Choice( diff --git a/radio/src/gui/colorlcd/widgets/value.cpp b/radio/src/gui/colorlcd/widgets/value.cpp index 0208a6173f0..ffd3f4bb33d 100644 --- a/radio/src/gui/colorlcd/widgets/value.cpp +++ b/radio/src/gui/colorlcd/widgets/value.cpp @@ -41,16 +41,44 @@ class ValueWidget: public Widget // get color from options[1] LcdFlags color = COLOR2FLAGS(persistentData->options[1].value.unsignedValue); + // get label alignment from options[3] + LcdFlags label_alignment = persistentData->options[3].value.unsignedValue; + + // get value alignment from options[4] + LcdFlags value_alignment = persistentData->options[4].value.unsignedValue; + coord_t xValue, yValue, xLabel, yLabel; LcdFlags attrValue, attrLabel = 0; if (width() < 120 && height() < 50) { - xValue = 0; - yValue = 14; - xLabel = 0; + switch (label_alignment) { + case ALIGN_RIGHT: + xLabel = width() - NUMBERS_PADDING; + attrLabel = RIGHT; + break; + case ALIGN_CENTER: + xLabel = width()/2; + attrLabel = CENTERED; + break; + default: // ALIGN_LEFT: + xLabel = 0; + attrLabel = LEFT; + } yLabel = 0; - attrValue = LEFT | NO_UNIT | FONT(L); - attrLabel = LEFT; + switch (value_alignment) { + case ALIGN_RIGHT: + xValue = width() - NUMBERS_PADDING; + attrValue = RIGHT | NO_UNIT | FONT(L); + break; + case ALIGN_CENTER: + xValue = width()/2 - NUMBERS_PADDING; + attrValue = CENTERED | NO_UNIT | FONT(L); + break; + default: // ALIGN_LEFT: + xValue = 0; + attrValue = LEFT | NO_UNIT | FONT(L); + } + yValue = 14; } else if (height() < 50) { xValue = width() - NUMBERS_PADDING; @@ -60,25 +88,57 @@ class ValueWidget: public Widget attrValue = RIGHT | NO_UNIT | FONT(L); } else { - xValue = NUMBERS_PADDING; - yValue = 18; - xLabel = NUMBERS_PADDING; + switch (label_alignment) { + case ALIGN_RIGHT: + xLabel = width() - NUMBERS_PADDING; + attrLabel = RIGHT; + break; + case ALIGN_CENTER: + xLabel = width()/2 - NUMBERS_PADDING; + attrLabel = CENTERED; + break; + default: // ALIGN_LEFT: + xLabel = NUMBERS_PADDING; + attrLabel = LEFT; + } yLabel = 2; + switch (value_alignment) { + case ALIGN_RIGHT: + xValue = width() - NUMBERS_PADDING; + break; + case ALIGN_CENTER: + xValue = width()/2; + break; + default: // ALIGN_LEFT: + xValue = NUMBERS_PADDING; + } + yValue = 18; + LcdFlags valalign = LEFT; + switch (value_alignment) { + case ALIGN_RIGHT: + valalign = RIGHT; + break; + case ALIGN_CENTER: + valalign = CENTERED; + break; + default: // ALIGN_LEFT: + valalign = LEFT; + } if (field >= MIXSRC_FIRST_TELEM) { if (isGPSSensor(1 + (field - MIXSRC_FIRST_TELEM) / 3)) { - attrValue = LEFT | FONT(L) | PREC1; + attrValue = valalign | FONT(L) | PREC1; } else { - attrValue = LEFT | FONT(XL); + attrValue = valalign | FONT(XL); } } #if defined(INTERNAL_GPS) else if (field == MIXSRC_TX_GPS) { - attrValue = LEFT | FONT(L) | PREC1; + attrValue = valalign | FONT(L) | PREC1; } #endif else { - attrValue = LEFT | FONT(XL); + attrValue = valalign | FONT(XL); } } @@ -147,6 +207,8 @@ const ZoneOption ValueWidget::options[] = { { STR_SOURCE, ZoneOption::Source, OPTION_VALUE_UNSIGNED(MIXSRC_Rud) }, { STR_COLOR, ZoneOption::Color, OPTION_VALUE_UNSIGNED(COLOR_THEME_PRIMARY2) }, { STR_SHADOW, ZoneOption::Bool, OPTION_VALUE_BOOL(false) }, + { STR_ALIGN_LABEL, ZoneOption::Align, OPTION_VALUE_UNSIGNED(ALIGN_LEFT) }, + { STR_ALIGN_VALUE, ZoneOption::Align, OPTION_VALUE_UNSIGNED(ALIGN_LEFT) }, { nullptr, ZoneOption::Bool } }; diff --git a/radio/src/gui/colorlcd/zone.h b/radio/src/gui/colorlcd/zone.h index 688c3422cfb..4c452ee3c21 100644 --- a/radio/src/gui/colorlcd/zone.h +++ b/radio/src/gui/colorlcd/zone.h @@ -69,7 +69,8 @@ struct ZoneOption TextSize, Timer, Switch, - Color + Color, + Align }; const char * name; @@ -80,6 +81,17 @@ struct ZoneOption const char * displayName; }; +enum ZoneOptionAlign +{ + ALIGN_LEFT, + ALIGN_CENTER, + ALIGN_RIGHT, + + // this one MUST be last + ALIGN_COUNT +}; + + struct ZoneOptionValueTyped { ZoneOptionValueEnum type; @@ -109,6 +121,7 @@ inline ZoneOptionValueEnum zoneValueEnumFromType(ZoneOption::Type type) case ZoneOption::Timer: case ZoneOption::Switch: case ZoneOption::TextSize: + case ZoneOption::Align: default: return ZOV_Unsigned; } diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index 2f4276a4ae2..350291fafee 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -2809,6 +2809,7 @@ const luaR_value_entry opentxConstants[] = { { "STRING", ZoneOption::String }, { "TIMER", ZoneOption::Timer }, { "TEXT_SIZE", ZoneOption::TextSize }, + { "ALIGNMENT", ZoneOption::Align }, { "MENU_HEADER_HEIGHT", COLOR2FLAGS(MENU_HEADER_HEIGHT) }, // Colors gui/colorlcd/colors.h diff --git a/radio/src/lua/widgets.cpp b/radio/src/lua/widgets.cpp index 88b054f2d89..25108c58b5e 100644 --- a/radio/src/lua/widgets.cpp +++ b/radio/src/lua/widgets.cpp @@ -170,7 +170,8 @@ ZoneOption *createOptionsArray(int reference, uint8_t maxOptions) option->deflt.signedValue = lua_tointeger(lsWidgets, -1); // TRACE("default signed = %d", option->deflt.signedValue); } else if (option->type == ZoneOption::Source || - option->type == ZoneOption::TextSize) { + option->type == ZoneOption::TextSize || + option->type == ZoneOption::Align) { luaL_checktype(lsWidgets, -1, LUA_TNUMBER); // value is number option->deflt.unsignedValue = lua_tounsigned(lsWidgets, -1); // TRACE("default unsigned = %u", option->deflt.unsignedValue); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 940aa626c78..1755528ce90 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -804,6 +804,9 @@ const char STR_INVALID_FILE[] = TR_INVALID_FILE; const char STR_TIMER_SOURCE[] = TR_TIMER_SOURCE; const char STR_SIZE[] = TR_SIZE; const char STR_SHADOW[] = TR_SHADOW; +const char STR_ALIGN_LABEL[] = TR_ALIGN_LABEL; +const char STR_ALIGN_VALUE[] = TR_ALIGN_VALUE; +const char* const STR_ALIGN_OPTS[] = TR_ALIGN_OPTS; const char STR_TEXT[] = TR_TEXT; const char STR_COLOR[] = TR_COLOR; const char STR_MAIN_VIEW_X[] = TR_MAIN_VIEW_X; diff --git a/radio/src/translations.h b/radio/src/translations.h index 3d3d7fc3d88..0bb15fbf1d8 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -720,6 +720,9 @@ extern const char* const STR_TEXT_SIZE[]; extern const char* const STR_SUBTRIMMODES[]; extern const char STR_SIZE[]; extern const char STR_SHADOW[]; +extern const char STR_ALIGN_LABEL[]; +extern const char STR_ALIGN_VALUE[]; +extern const char* const STR_ALIGN_OPTS[]; extern const char STR_TEXT[]; extern const char STR_COLOR[]; extern const char STR_MAIN_VIEW_X[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index cd8934ea127..dae3bab4bae 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -1056,31 +1056,36 @@ #define TR_GVAR_HEADERS_FM7 "FM7值" #define TR_GVAR_HEADERS_FM8 "FM8值" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "比较类型或功能", "第一个变量", "第二个变量或常量", "第二个变量或常量", "启用本行的附加条件", "逻辑开关持续时间", "逻辑开关延时开启" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "起始通道" -#define TR_FILL_BACKGROUND "是否填充背景?" -#define TR_BG_COLOR "背景颜色" -#define TR_SLIDERS_TRIMS "滑块和微调" -#define TR_SLIDERS "滑块" -#define TR_FLIGHT_MODE "飞行模式" -#define TR_INVALID_FILE "无效的文件" -#define TR_TIMER_SOURCE "计时器选择" -#define TR_SIZE "尺寸" -#define TR_SHADOW "阴影" -#define TR_TEXT "文本" -#define TR_COLOR "颜色" -#define TR_MAIN_VIEW_X "Main view X" -#define TR_PANEL1_BACKGROUND "面板1背景" -#define TR_PANEL2_BACKGROUND "面板2背景" -#define TR_WIDGET_GAUGE "行程" -#define TR_WIDGET_MODELBMP "模型信息" -#define TR_WIDGET_OUTPUTS "输出" -#define TR_WIDGET_TEXT "文本" -#define TR_WIDGET_TIMER "计时器" -#define TR_WIDGET_VALUE "数值" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "比较类型或功能", "第一个变量", "第二个变量或常量", "第二个变量或常量", "启用本行的附加条件", "逻辑开关持续时间", "逻辑开关延时开启" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "起始通道" + #define TR_FILL_BACKGROUND "是否填充背景?" + #define TR_BG_COLOR "背景颜色" + #define TR_SLIDERS_TRIMS "滑块和微调" + #define TR_SLIDERS "滑块" + #define TR_FLIGHT_MODE "飞行模式" + #define TR_INVALID_FILE "无效的文件" + #define TR_TIMER_SOURCE "计时器选择" + #define TR_SIZE "尺寸" + #define TR_SHADOW "阴影" + #define TR_ALIGN_LABEL "对齐名称" + #define TR_ALIGN_VALUE "对齐值" + #define TR_ALIGN_OPTS { "左", "中", "右" } + #define TR_TEXT "文本" + #define TR_COLOR "颜色" + #define TR_MAIN_VIEW_X "Main view X" + #define TR_PANEL1_BACKGROUND "面板1背景" + #define TR_PANEL2_BACKGROUND "面板2背景" + #define TR_WIDGET_GAUGE "行程" + #define TR_WIDGET_MODELBMP "模型信息" + #define TR_WIDGET_OUTPUTS "输出" + #define TR_WIDGET_TEXT "文本" + #define TR_WIDGET_TIMER "计时器" + #define TR_WIDGET_VALUE "数值" +#endif // About screen #define TR_ABOUTUS TR(" 关于 ", "关于") diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index d8ed8975c3f..01aed893c6c 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -1078,31 +1078,36 @@ #define TR_GVAR_HEADERS_FM7 "Hodnota v režimu LR7" #define TR_GVAR_HEADERS_FM8 "Hodnota v režimu LR8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Typ porovnávací funkce", "První proměnná", "Druhá proměnná nebo konstanta", "Druhá proměnná nebo konstanta", "Další stav povolující tenko spínač", "Minimální doba trvání sepnutého stavu", "Minimální doba platné podmínky pro aktivaci" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "První kanál" -#define TR_FILL_BACKGROUND "Vyplnit pozadí?" -#define TR_BG_COLOR "Barva pozadí" -#define TR_SLIDERS_TRIMS "Slidery+Trimy" -#define TR_SLIDERS "Slidery" -#define TR_FLIGHT_MODE "Letový režim" -#define TR_INVALID_FILE "Neplatní soubor" -#define TR_TIMER_SOURCE "Časovač zdroj" -#define TR_SIZE "Velikost" -#define TR_SHADOW "Stíny" -#define TR_TEXT "Text" -#define TR_COLOR "Barva" -#define TR_MAIN_VIEW_X "Hlavní pohled X" -#define TR_PANEL1_BACKGROUND "Panel1 pozadí" -#define TR_PANEL2_BACKGROUND "Panel2 pozadí" -#define TR_WIDGET_GAUGE "Měřidlo" -#define TR_WIDGET_MODELBMP "Model info" -#define TR_WIDGET_OUTPUTS "Výstupy" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Časovač" -#define TR_WIDGET_VALUE "Hodnota" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Typ porovnávací funkce", "První proměnná", "Druhá proměnná nebo konstanta", "Druhá proměnná nebo konstanta", "Další stav povolující tenko spínač", "Minimální doba trvání sepnutého stavu", "Minimální doba platné podmínky pro aktivaci" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "První kanál" + #define TR_FILL_BACKGROUND "Vyplnit pozadí?" + #define TR_BG_COLOR "Barva pozadí" + #define TR_SLIDERS_TRIMS "Slidery+Trimy" + #define TR_SLIDERS "Slidery" + #define TR_FLIGHT_MODE "Letový režim" + #define TR_INVALID_FILE "Neplatní soubor" + #define TR_TIMER_SOURCE "Časovač zdroj" + #define TR_SIZE "Velikost" + #define TR_SHADOW "Stíny" + #define TR_ALIGN_LABEL "Zarovnat název" + #define TR_ALIGN_VALUE "Zarovnat hodnotu" + #define TR_ALIGN_OPTS { "Vlevo", "Uprostřed", "Vpravo" } + #define TR_TEXT "Text" + #define TR_COLOR "Barva" + #define TR_MAIN_VIEW_X "Hlavní pohled X" + #define TR_PANEL1_BACKGROUND "Panel1 pozadí" + #define TR_PANEL2_BACKGROUND "Panel2 pozadí" + #define TR_WIDGET_GAUGE "Měřidlo" + #define TR_WIDGET_MODELBMP "Model info" + #define TR_WIDGET_OUTPUTS "Výstupy" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Časovač" + #define TR_WIDGET_VALUE "Hodnota" +#endif // Taranis About screen #define TR_ABOUTUS "O nás" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 426bae4f1ad..7e265774375 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -1062,31 +1062,36 @@ #define TR_GVAR_HEADERS_FM7 "Værdi ved FT7" #define TR_GVAR_HEADERS_FM8 "Værdi ved FT8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Sammenlign type eller funktion", "Første variabel", "Anden variabel eller konstant", "Anden variabel eller konstant", "Endnu en betingelse for linje", "Minimum TIL varighed for logisk kontakt", "Minimum SAND varighed for betingelse bliver sand" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "Første kanal" -#define TR_FILL_BACKGROUND "Udfyld baggrund?" -#define TR_BG_COLOR "BG farve" -#define TR_SLIDERS_TRIMS "Skyder+Trim" -#define TR_SLIDERS "Skydere" -#define TR_FLIGHT_MODE "Flyve tilstand" -#define TR_INVALID_FILE "Ugyldig fil" -#define TR_TIMER_SOURCE "Tidstagning kilde" -#define TR_SIZE "Størrelse" -#define TR_SHADOW "Skygge" -#define TR_TEXT "Tekst" -#define TR_COLOR "Farve" -#define TR_MAIN_VIEW_X "Hoved visning X" -#define TR_PANEL1_BACKGROUND "Panel1 baggrund" -#define TR_PANEL2_BACKGROUND "Panel2 baggrund" -#define TR_WIDGET_GAUGE "Måling" -#define TR_WIDGET_MODELBMP "Modeller" -#define TR_WIDGET_OUTPUTS "Udgange" -#define TR_WIDGET_TEXT "Tekst" -#define TR_WIDGET_TIMER "Tider" -#define TR_WIDGET_VALUE "Værdi" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Sammenlign type eller funktion", "Første variabel", "Anden variabel eller konstant", "Anden variabel eller konstant", "Endnu en betingelse for linje", "Minimum TIL varighed for logisk kontakt", "Minimum SAND varighed for betingelse bliver sand" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "Første kanal" + #define TR_FILL_BACKGROUND "Udfyld baggrund?" + #define TR_BG_COLOR "BG farve" + #define TR_SLIDERS_TRIMS "Skyder+Trim" + #define TR_SLIDERS "Skydere" + #define TR_FLIGHT_MODE "Flyve tilstand" + #define TR_INVALID_FILE "Ugyldig fil" + #define TR_TIMER_SOURCE "Tidstagning kilde" + #define TR_SIZE "Størrelse" + #define TR_SHADOW "Skygge" + #define TR_ALIGN_LABEL "Justere navn" + #define TR_ALIGN_VALUE "Justere værdi" + #define TR_ALIGN_OPTS { "Venstre", "Center", "Højre" } + #define TR_TEXT "Tekst" + #define TR_COLOR "Farve" + #define TR_MAIN_VIEW_X "Hoved visning X" + #define TR_PANEL1_BACKGROUND "Panel1 baggrund" + #define TR_PANEL2_BACKGROUND "Panel2 baggrund" + #define TR_WIDGET_GAUGE "Måling" + #define TR_WIDGET_MODELBMP "Modeller" + #define TR_WIDGET_OUTPUTS "Udgange" + #define TR_WIDGET_TEXT "Tekst" + #define TR_WIDGET_TIMER "Tider" + #define TR_WIDGET_VALUE "Værdi" +#endif // About screen #define TR_ABOUTUS TR(" OM ", "OM") diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 1d85221886c..6c6dfcbe7a0 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -1033,28 +1033,33 @@ #define TR_PHASES_HEADERS_FAD_IN "Langs Ein" #define TR_PHASES_HEADERS_FAD_OUT "Langs Aus" -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "Erster Kanal" -#define TR_FILL_BACKGROUND "Hintergrund füllen?" -#define TR_BG_COLOR "Hintergrundfarbe" -#define TR_SLIDERS_TRIMS "Schieber+Trim" -#define TR_SLIDERS "Schieber" -#define TR_FLIGHT_MODE "Flugphase" -#define TR_INVALID_FILE "ungültige Datei" -#define TR_TIMER_SOURCE "Timer Quelle" -#define TR_SIZE "Größe" -#define TR_SHADOW "Schatten" -#define TR_TEXT "Text" -#define TR_COLOR "Farbe" -#define TR_MAIN_VIEW_X "Hauptansicht X" -#define TR_PANEL1_BACKGROUND "Panel1 Hintergrund" -#define TR_PANEL2_BACKGROUND "Panel2 Hintergrund" -#define TR_WIDGET_GAUGE "Pegel" -#define TR_WIDGET_MODELBMP "Modellinfo" -#define TR_WIDGET_OUTPUTS "Ausgänge" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Wert" +#if defined(COLORLCD) + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "Erster Kanal" + #define TR_FILL_BACKGROUND "Hintergrund füllen?" + #define TR_BG_COLOR "Hintergrundfarbe" + #define TR_SLIDERS_TRIMS "Schieber+Trim" + #define TR_SLIDERS "Schieber" + #define TR_FLIGHT_MODE "Flugphase" + #define TR_INVALID_FILE "ungültige Datei" + #define TR_TIMER_SOURCE "Timer Quelle" + #define TR_SIZE "Größe" + #define TR_SHADOW "Schatten" + #define TR_ALIGN_LABEL "Name ausrichten" + #define TR_ALIGN_VALUE "Wert ausrichten" + #define TR_ALIGN_OPTS { "Links", "Mitte", "Rechts" } + #define TR_TEXT "Text" + #define TR_COLOR "Farbe" + #define TR_MAIN_VIEW_X "Hauptansicht X" + #define TR_PANEL1_BACKGROUND "Panel1 Hintergrund" + #define TR_PANEL2_BACKGROUND "Panel2 Hintergrund" + #define TR_WIDGET_GAUGE "Pegel" + #define TR_WIDGET_MODELBMP "Modellinfo" + #define TR_WIDGET_OUTPUTS "Ausgänge" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Wert" +#endif // Taranis Info Zeile Anzeigen #define TR_LIMITS_HEADERS_NAME "Name" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 0dcc437f733..2053d69f659 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -1055,31 +1055,36 @@ #define TR_GVAR_HEADERS_FM7 "Value on FM7" #define TR_GVAR_HEADERS_FM8 "Value on FM8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "First channel" -#define TR_FILL_BACKGROUND "Fill background?" -#define TR_BG_COLOR "BG Color" -#define TR_SLIDERS_TRIMS "Sliders+Trims" -#define TR_SLIDERS "Sliders" -#define TR_FLIGHT_MODE "Flight mode" -#define TR_INVALID_FILE "Invalid File" -#define TR_TIMER_SOURCE "Timer source" -#define TR_SIZE "Size" -#define TR_SHADOW "Shadow" -#define TR_TEXT "Text" -#define TR_COLOR "Color" -#define TR_MAIN_VIEW_X "Main view X" -#define TR_PANEL1_BACKGROUND "Panel1 background" -#define TR_PANEL2_BACKGROUND "Panel2 background" -#define TR_WIDGET_GAUGE "Gauge" -#define TR_WIDGET_MODELBMP "Model info" -#define TR_WIDGET_OUTPUTS "Outputs" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Value" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "First channel" + #define TR_FILL_BACKGROUND "Fill background?" + #define TR_BG_COLOR "BG Color" + #define TR_SLIDERS_TRIMS "Sliders+Trims" + #define TR_SLIDERS "Sliders" + #define TR_FLIGHT_MODE "Flight mode" + #define TR_INVALID_FILE "Invalid File" + #define TR_TIMER_SOURCE "Timer source" + #define TR_SIZE "Size" + #define TR_SHADOW "Shadow" + #define TR_ALIGN_LABEL "Align label" + #define TR_ALIGN_VALUE "Align value" + #define TR_ALIGN_OPTS { "Left", "Center", "Right" } + #define TR_TEXT "Text" + #define TR_COLOR "Color" + #define TR_MAIN_VIEW_X "Main view X" + #define TR_PANEL1_BACKGROUND "Panel1 background" + #define TR_PANEL2_BACKGROUND "Panel2 background" + #define TR_WIDGET_GAUGE "Gauge" + #define TR_WIDGET_MODELBMP "Model info" + #define TR_WIDGET_OUTPUTS "Outputs" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Value" +#endif // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index ad33d09e7f7..c4679d0ff98 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -1062,31 +1062,36 @@ #define TR_GVAR_HEADERS_FM7 "Valor en FM7" #define TR_GVAR_HEADERS_FM8 "Valor en FM8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Tipo de comparación o función", "Primera variable", "Segunda variable o constante", "Segunda variable o constante", "Condición adicional para activar línea", "Duración mínima de switch lógico", "Duración mínima TRUE para activar switch lógico" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "Primer canal" -#define TR_FILL_BACKGROUND "Rellenar fondo" -#define TR_BG_COLOR "Color BG" -#define TR_SLIDERS_TRIMS "Sliders+Trims" -#define TR_SLIDERS "Sliders" -#define TR_FLIGHT_MODE "Modo de vuelo" -#define TR_INVALID_FILE "Fichero no valido" -#define TR_TIMER_SOURCE "Entrada timer" -#define TR_SIZE "Tamaño" -#define TR_SHADOW "Sombra" -#define TR_TEXT "Texto" -#define TR_COLOR "Color" -#define TR_MAIN_VIEW_X "Vista principal X" -#define TR_PANEL1_BACKGROUND "Fondo panel1" -#define TR_PANEL2_BACKGROUND "Fondo panel2" -#define TR_WIDGET_GAUGE "Gauge" -#define TR_WIDGET_MODELBMP "Models" -#define TR_WIDGET_OUTPUTS "Outputs" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Value" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Tipo de comparación o función", "Primera variable", "Segunda variable o constante", "Segunda variable o constante", "Condición adicional para activar línea", "Duración mínima de switch lógico", "Duración mínima TRUE para activar switch lógico" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "Primer canal" + #define TR_FILL_BACKGROUND "Rellenar fondo" + #define TR_BG_COLOR "Color BG" + #define TR_SLIDERS_TRIMS "Sliders+Trims" + #define TR_SLIDERS "Sliders" + #define TR_FLIGHT_MODE "Modo de vuelo" + #define TR_INVALID_FILE "Fichero no valido" + #define TR_TIMER_SOURCE "Entrada timer" + #define TR_SIZE "Tamaño" + #define TR_SHADOW "Sombra" + #define TR_ALIGN_LABEL "Alinear marbete" + #define TR_ALIGN_VALUE "Alinear valor" + #define TR_ALIGN_OPTS { "Lzquierdo", "Centro", "Derecho" } + #define TR_TEXT "Texto" + #define TR_COLOR "Color" + #define TR_MAIN_VIEW_X "Vista principal X" + #define TR_PANEL1_BACKGROUND "Fondo panel1" + #define TR_PANEL2_BACKGROUND "Fondo panel2" + #define TR_WIDGET_GAUGE "Gauge" + #define TR_WIDGET_MODELBMP "Models" + #define TR_WIDGET_OUTPUTS "Outputs" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Value" +#endif // Taranis About screen #define TR_ABOUTUS "Nosotros" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index b193987af48..8b01a9f3a76 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -1088,31 +1088,36 @@ #define TR_GVAR_HEADERS_FM7 "Value on FM7" #define TR_GVAR_HEADERS_FM8 "Value on FM8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "First channel" -#define TR_FILL_BACKGROUND "Fill background?" -#define TR_BG_COLOR "BG Color" -#define TR_SLIDERS_TRIMS "Sliders+Trims" -#define TR_SLIDERS "Sliders" -#define TR_FLIGHT_MODE "Flight mode" -#define TR_INVALID_FILE "Invalid File" -#define TR_TIMER_SOURCE "Timer source" -#define TR_SIZE "Size" -#define TR_SHADOW "Shadow" -#define TR_TEXT "Text" -#define TR_COLOR "Color" -#define TR_MAIN_VIEW_X "Main view X" -#define TR_PANEL1_BACKGROUND "Panel1 background" -#define TR_PANEL2_BACKGROUND "Panel2 background" -#define TR_WIDGET_GAUGE "Gauge" -#define TR_WIDGET_MODELBMP "Models" -#define TR_WIDGET_OUTPUTS "Outputs" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Value" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "First channel" + #define TR_FILL_BACKGROUND "Fill background?" + #define TR_BG_COLOR "BG Color" + #define TR_SLIDERS_TRIMS "Sliders+Trims" + #define TR_SLIDERS "Sliders" + #define TR_FLIGHT_MODE "Flight mode" + #define TR_INVALID_FILE "Invalid File" + #define TR_TIMER_SOURCE "Timer source" + #define TR_SIZE "Size" + #define TR_SHADOW "Shadow" + #define TR_ALIGN_LABEL "Kohdista merkki" + #define TR_ALIGN_VALUE "Kohdista arvo" + #define TR_ALIGN_OPTS { "Vasen", "Keski", "Oikea" } + #define TR_TEXT "Text" + #define TR_COLOR "Color" + #define TR_MAIN_VIEW_X "Main view X" + #define TR_PANEL1_BACKGROUND "Panel1 background" + #define TR_PANEL2_BACKGROUND "Panel2 background" + #define TR_WIDGET_GAUGE "Gauge" + #define TR_WIDGET_MODELBMP "Models" + #define TR_WIDGET_OUTPUTS "Outputs" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Value" +#endif // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index dab81d65371..f016bd53e92 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -1088,31 +1088,36 @@ #define TR_GVAR_HEADERS_FM7 "Valeur FM7" #define TR_GVAR_HEADERS_FM8 "Valeur FM8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Type de comparaison ou fonction", "Première variable", "Seconde variable ou constante", "Seconde variable ou constante", "Condition supplémentaire pour activer la ligne", "Durée minimale d'activation de l'inter logique", "Durée min de la condition avant l'activation de l'inter" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "First channel" -#define TR_FILL_BACKGROUND "Fill background?" -#define TR_BG_COLOR "BG Color" -#define TR_SLIDERS_TRIMS "Sliders+Trims" -#define TR_SLIDERS "Sliders" -#define TR_FLIGHT_MODE "Flight mode" -#define TR_INVALID_FILE "Invalid File" -#define TR_TIMER_SOURCE "Timer source" -#define TR_SIZE "Size" -#define TR_SHADOW "Shadow" -#define TR_TEXT "Text" -#define TR_COLOR "Color" -#define TR_MAIN_VIEW_X "Main view X" -#define TR_PANEL1_BACKGROUND "Panel1 background" -#define TR_PANEL2_BACKGROUND "Panel2 background" -#define TR_WIDGET_GAUGE "Gauge" -#define TR_WIDGET_MODELBMP "Models" -#define TR_WIDGET_OUTPUTS "Outputs" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Value" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Type de comparaison ou fonction", "Première variable", "Seconde variable ou constante", "Seconde variable ou constante", "Condition supplémentaire pour activer la ligne", "Durée minimale d'activation de l'inter logique", "Durée min de la condition avant l'activation de l'inter" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "First channel" + #define TR_FILL_BACKGROUND "Fill background?" + #define TR_BG_COLOR "BG Color" + #define TR_SLIDERS_TRIMS "Sliders+Trims" + #define TR_SLIDERS "Sliders" + #define TR_FLIGHT_MODE "Flight mode" + #define TR_INVALID_FILE "Invalid File" + #define TR_TIMER_SOURCE "Timer source" + #define TR_SIZE "Size" + #define TR_SHADOW "Shadow" + #define TR_ALIGN_LABEL "Aligner le label" + #define TR_ALIGN_VALUE "Aligner la valeur" + #define TR_ALIGN_OPTS { "Gauche", "Centre", "Droite" } + #define TR_TEXT "Text" + #define TR_COLOR "Color" + #define TR_MAIN_VIEW_X "Main view X" + #define TR_PANEL1_BACKGROUND "Panel1 background" + #define TR_PANEL2_BACKGROUND "Panel2 background" + #define TR_WIDGET_GAUGE "Gauge" + #define TR_WIDGET_MODELBMP "Models" + #define TR_WIDGET_OUTPUTS "Outputs" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Value" +#endif // Taranis About screen #define TR_ABOUTUS TR(" A PROPOS ", "A PROPOS") diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index 7d30c78bb10..3a079f24ccd 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -1062,31 +1062,36 @@ #define TR_GVAR_HEADERS_FM7 "Valore su FM7" #define TR_GVAR_HEADERS_FM8 "Valore su FM8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Tipo o funzione di confronto", "Prima variabile", "Seconda variabile o costante", "Seconda variabile o costante", "Condizione aggiuntiva da abilitare linea", "Durata minima ON dell'interruttore logico", "Durata minima TRUE affinché l'interruttore si accenda" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "Primo canale" -#define TR_FILL_BACKGROUND "Riempi lo sfondo?" -#define TR_BG_COLOR "Colore sfondo" -#define TR_SLIDERS_TRIMS "Sliders+Trims" -#define TR_SLIDERS "Sliders" -#define TR_FLIGHT_MODE "Modo di volo" -#define TR_INVALID_FILE "File invalido" -#define TR_TIMER_SOURCE "Sorgente timer" -#define TR_SIZE "Dimensione" -#define TR_SHADOW "Ombra" -#define TR_TEXT "Testo" -#define TR_COLOR "Colore" -#define TR_MAIN_VIEW_X "Vista principale X" -#define TR_PANEL1_BACKGROUND "Sfondo Panello 1" -#define TR_PANEL2_BACKGROUND "Sfondo Panello 2" -#define TR_WIDGET_GAUGE "Indicatore" -#define TR_WIDGET_MODELBMP "Immagine e nome modello" -#define TR_WIDGET_OUTPUTS "Uscite" -#define TR_WIDGET_TEXT "Testo" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Valore" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Tipo o funzione di confronto", "Prima variabile", "Seconda variabile o costante", "Seconda variabile o costante", "Condizione aggiuntiva da abilitare linea", "Durata minima ON dell'interruttore logico", "Durata minima TRUE affinché l'interruttore si accenda" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "Primo canale" + #define TR_FILL_BACKGROUND "Riempi lo sfondo?" + #define TR_BG_COLOR "Colore sfondo" + #define TR_SLIDERS_TRIMS "Sliders+Trims" + #define TR_SLIDERS "Sliders" + #define TR_FLIGHT_MODE "Modo di volo" + #define TR_INVALID_FILE "File invalido" + #define TR_TIMER_SOURCE "Sorgente timer" + #define TR_SIZE "Dimensione" + #define TR_SHADOW "Ombra" + #define TR_ALIGN_LABEL "Allineare il cartellino" + #define TR_ALIGN_VALUE "Allineare il valore" + #define TR_ALIGN_OPTS { "Sinistra", "Mezzo", "Destra" } + #define TR_TEXT "Testo" + #define TR_COLOR "Colore" + #define TR_MAIN_VIEW_X "Vista principale X" + #define TR_PANEL1_BACKGROUND "Sfondo Panello 1" + #define TR_PANEL2_BACKGROUND "Sfondo Panello 2" + #define TR_WIDGET_GAUGE "Indicatore" + #define TR_WIDGET_MODELBMP "Immagine e nome modello" + #define TR_WIDGET_OUTPUTS "Uscite" + #define TR_WIDGET_TEXT "Testo" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Valore" +#endif // About screen #define TR_ABOUTUS TR(" INFO ", "INFO SU") diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 5d12a1ff071..eb87253733d 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -1056,31 +1056,36 @@ #define TR_GVAR_HEADERS_FM7 "FM7 値" #define TR_GVAR_HEADERS_FM8 "FM8 値" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "比較タイプまたは機能", "第1変数", "第2変数または定数", "第2変数または定数", "回線が有効となる追加条件", "論理スイッチの最小ON時間", "スイッチONになるまでの最小TRUE時間" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "第1チャンネル" -#define TR_FILL_BACKGROUND "背景を塗り潰しますか？" -#define TR_BG_COLOR "背景カラー" -#define TR_SLIDERS_TRIMS "スライダー＋トリム" -#define TR_SLIDERS "スライダー" -#define TR_FLIGHT_MODE "飛行モード" -#define TR_INVALID_FILE "無効なファイル" -#define TR_TIMER_SOURCE "タイマーソース" -#define TR_SIZE "サイズ" -#define TR_SHADOW "影" -#define TR_TEXT "テキスト" -#define TR_COLOR "カラー" -#define TR_MAIN_VIEW_X "メインビュー X" -#define TR_PANEL1_BACKGROUND "パネル1 背景" -#define TR_PANEL2_BACKGROUND "パネル2 背景" -#define TR_WIDGET_GAUGE "ゲージ" -#define TR_WIDGET_MODELBMP "モデル" -#define TR_WIDGET_OUTPUTS "出力" -#define TR_WIDGET_TEXT "テキスト" -#define TR_WIDGET_TIMER "タイマー" -#define TR_WIDGET_VALUE "値" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "比較タイプまたは機能", "第1変数", "第2変数または定数", "第2変数または定数", "回線が有効となる追加条件", "論理スイッチの最小ON時間", "スイッチONになるまでの最小TRUE時間" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "第1チャンネル" + #define TR_FILL_BACKGROUND "背景を塗り潰しますか？" + #define TR_BG_COLOR "背景カラー" + #define TR_SLIDERS_TRIMS "スライダー＋トリム" + #define TR_SLIDERS "スライダー" + #define TR_FLIGHT_MODE "飛行モード" + #define TR_INVALID_FILE "無効なファイル" + #define TR_TIMER_SOURCE "タイマーソース" + #define TR_SIZE "サイズ" + #define TR_SHADOW "影" + #define TR_ALIGN_LABEL "ラベルを揃える" + #define TR_ALIGN_VALUE "値を揃える" + #define TR_ALIGN_OPTS { "左", "中央", "右" } + #define TR_TEXT "テキスト" + #define TR_COLOR "カラー" + #define TR_MAIN_VIEW_X "メインビュー X" + #define TR_PANEL1_BACKGROUND "パネル1 背景" + #define TR_PANEL2_BACKGROUND "パネル2 背景" + #define TR_WIDGET_GAUGE "ゲージ" + #define TR_WIDGET_MODELBMP "モデル" + #define TR_WIDGET_OUTPUTS "出力" + #define TR_WIDGET_TEXT "テキスト" + #define TR_WIDGET_TIMER "タイマー" + #define TR_WIDGET_VALUE "値" +#endif // About screen #define TR_ABOUTUS TR(" 概要 ", "概要") diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 6a6615af9d8..e5d940ea11a 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -1071,31 +1071,36 @@ #define TR_GVAR_HEADERS_FM7 "Waarde bij FM7" #define TR_GVAR_HEADERS_FM8 "Waarde bij FM8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Vergelijking of Functie", "1e variabele", "2e variabele of constante", "2e variabele of constante", "Additionele conditie", "Minimale AAN duur van de logische schakelaar", "Minimale WAAR duur om AAN te gaan" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "First channel" -#define TR_FILL_BACKGROUND "Fill background?" -#define TR_BG_COLOR "BG Color" -#define TR_SLIDERS_TRIMS "Sliders+Trims" -#define TR_SLIDERS "Sliders" -#define TR_FLIGHT_MODE "Flight mode" -#define TR_INVALID_FILE "Invalid File" -#define TR_TIMER_SOURCE "Timer source" -#define TR_SIZE "Size" -#define TR_SHADOW "Shadow" -#define TR_TEXT "Text" -#define TR_COLOR "Color" -#define TR_MAIN_VIEW_X "Main view X" -#define TR_PANEL1_BACKGROUND "Panel1 background" -#define TR_PANEL2_BACKGROUND "Panel2 background" -#define TR_WIDGET_GAUGE "Gauge" -#define TR_WIDGET_MODELBMP "Models" -#define TR_WIDGET_OUTPUTS "Outputs" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Value" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Vergelijking of Functie", "1e variabele", "2e variabele of constante", "2e variabele of constante", "Additionele conditie", "Minimale AAN duur van de logische schakelaar", "Minimale WAAR duur om AAN te gaan" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "First channel" + #define TR_FILL_BACKGROUND "Fill background?" + #define TR_BG_COLOR "BG Color" + #define TR_SLIDERS_TRIMS "Sliders+Trims" + #define TR_SLIDERS "Sliders" + #define TR_FLIGHT_MODE "Flight mode" + #define TR_INVALID_FILE "Invalid File" + #define TR_TIMER_SOURCE "Timer source" + #define TR_SIZE "Size" + #define TR_SHADOW "Shadow" + #define TR_ALIGN_LABEL "Label uitlijnen" + #define TR_ALIGN_VALUE "Waarde uitlijnen" + #define TR_ALIGN_OPTS { "Links", "Midden", "Rechts" } + #define TR_TEXT "Text" + #define TR_COLOR "Color" + #define TR_MAIN_VIEW_X "Main view X" + #define TR_PANEL1_BACKGROUND "Panel1 background" + #define TR_PANEL2_BACKGROUND "Panel2 background" + #define TR_WIDGET_GAUGE "Gauge" + #define TR_WIDGET_MODELBMP "Models" + #define TR_WIDGET_OUTPUTS "Outputs" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Value" +#endif // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 40a2132443c..92789029baf 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -1057,31 +1057,36 @@ #define TR_GVAR_HEADERS_FM7 "Wartość w FM7" #define TR_GVAR_HEADERS_FM8 "Wartość w FM8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "Pierwszy kanał" -#define TR_FILL_BACKGROUND "Wypełnić tło?" -#define TR_BG_COLOR "BG Color" -#define TR_SLIDERS_TRIMS "Sliders+Trims" -#define TR_SLIDERS "Sliders" -#define TR_FLIGHT_MODE "Flight mode" -#define TR_INVALID_FILE "Invalid File" -#define TR_TIMER_SOURCE "Timer source" -#define TR_SIZE "Rozmiar" -#define TR_SHADOW "Cień" -#define TR_TEXT "Tekst" -#define TR_COLOR "Kolor" -#define TR_MAIN_VIEW_X "Main view X" -#define TR_PANEL1_BACKGROUND "Panel1 tło" -#define TR_PANEL2_BACKGROUND "Panel2 tło" -#define TR_WIDGET_GAUGE "Wskaźnik" -#define TR_WIDGET_MODELBMP "Modele" -#define TR_WIDGET_OUTPUTS "Wyjścia" -#define TR_WIDGET_TEXT "Tekst" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Wartość" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "Pierwszy kanał" + #define TR_FILL_BACKGROUND "Wypełnić tło?" + #define TR_BG_COLOR "BG Color" + #define TR_SLIDERS_TRIMS "Sliders+Trims" + #define TR_SLIDERS "Sliders" + #define TR_FLIGHT_MODE "Flight mode" + #define TR_INVALID_FILE "Invalid File" + #define TR_TIMER_SOURCE "Timer source" + #define TR_SIZE "Rozmiar" + #define TR_SHADOW "Cień" + #define TR_ALIGN_LABEL "Wyrównaj przywieszka" + #define TR_ALIGN_VALUE "Wyrównać wartość" + #define TR_ALIGN_OPTS { "Lewy", "Centrum", "Prawe" } + #define TR_TEXT "Tekst" + #define TR_COLOR "Kolor" + #define TR_MAIN_VIEW_X "Main view X" + #define TR_PANEL1_BACKGROUND "Panel1 tło" + #define TR_PANEL2_BACKGROUND "Panel2 tło" + #define TR_WIDGET_GAUGE "Wskaźnik" + #define TR_WIDGET_MODELBMP "Modele" + #define TR_WIDGET_OUTPUTS "Wyjścia" + #define TR_WIDGET_TEXT "Tekst" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Wartość" +#endif // About screen #define TR_ABOUTUS TR(" O ", " O ") diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 5298525259e..e6e110b5272 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -1064,34 +1064,39 @@ #define TR_GVAR_HEADERS_FM7 "Value on FM7" #define TR_GVAR_HEADERS_FM8 "Value on FM8" -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "First channel" -#define TR_FILL_BACKGROUND "Fill background?" -#define TR_BG_COLOR "BG Color" -#define TR_SLIDERS_TRIMS "Sliders+Trims" -#define TR_SLIDERS "Sliders" -#define TR_FLIGHT_MODE "Flight mode" -#define TR_INVALID_FILE "Invalid File" -#define TR_TIMER_SOURCE "Timer source" -#define TR_SIZE "Size" -#define TR_SHADOW "Shadow" -#define TR_TEXT "Text" -#define TR_COLOR "Color" -#define TR_MAIN_VIEW_X "Main view X" -#define TR_PANEL1_BACKGROUND "Panel1 background" -#define TR_PANEL2_BACKGROUND "Panel2 background" -#define TR_WIDGET_GAUGE "Gauge" -#define TR_WIDGET_MODELBMP "Models" -#define TR_WIDGET_OUTPUTS "Outputs" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Value" +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "First channel" + #define TR_FILL_BACKGROUND "Fill background?" + #define TR_BG_COLOR "BG Color" + #define TR_SLIDERS_TRIMS "Sliders+Trims" + #define TR_SLIDERS "Sliders" + #define TR_FLIGHT_MODE "Flight mode" + #define TR_INVALID_FILE "Invalid File" + #define TR_TIMER_SOURCE "Timer source" + #define TR_SIZE "Size" + #define TR_SHADOW "Shadow" + #define TR_ALIGN_LABEL "Alinhar legenda" + #define TR_ALIGN_VALUE "Alinhar valor" + #define TR_ALIGN_OPTS { "Esquerda", "Centro", "Direita" } + #define TR_TEXT "Text" + #define TR_COLOR "Color" + #define TR_MAIN_VIEW_X "Main view X" + #define TR_PANEL1_BACKGROUND "Panel1 background" + #define TR_PANEL2_BACKGROUND "Panel2 background" + #define TR_WIDGET_GAUGE "Gauge" + #define TR_WIDGET_MODELBMP "Models" + #define TR_WIDGET_OUTPUTS "Outputs" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Value" +#endif // Taranis About screen -#define TR_ABOUTUS "ABOUT US" +#define TR_ABOUTUS "ABOUT US" #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 210e71886de..01d17db6c02 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -1109,33 +1109,38 @@ #define TR_GVAR_HEADERS_FM6 "Värde för FL6" #define TR_GVAR_HEADERS_FM7 "Värde för FL7" #define TR_GVAR_HEADERS_FM8 "Värde för FL8" -//#define TR_CHECK_FM_TRIMS "Kolla FL-trimmar" - -// Horus footer descriptions -#define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } - -// Horus layouts and widgets -#define TR_FIRST_CHANNEL "Första kanal" -#define TR_FILL_BACKGROUND "Fyll bakgrund?" -#define TR_BG_COLOR "Bakgrundsfärg" -#define TR_SLIDERS_TRIMS "Reglage+Trimmar" -#define TR_SLIDERS "Reglage" -#define TR_FLIGHT_MODE "Flygläge" -#define TR_INVALID_FILE "Ogiltig fil" -#define TR_TIMER_SOURCE "Timerkälla" -#define TR_SIZE "Storlek" -#define TR_SHADOW "Skugga" -#define TR_TEXT "Text" -#define TR_COLOR "Färg" -#define TR_MAIN_VIEW_X "Huvudvy X" -#define TR_PANEL1_BACKGROUND "Panel 1 bakgrund" -#define TR_PANEL2_BACKGROUND "Panel 2 bakgrund" -#define TR_WIDGET_GAUGE "Mätare" -#define TR_WIDGET_MODELBMP "Modellinfo" -#define TR_WIDGET_OUTPUTS "Output" -#define TR_WIDGET_TEXT "Text" -#define TR_WIDGET_TIMER "Timer" -#define TR_WIDGET_VALUE "Värde" +//#define TR_CHECK_FM_TRIMS "Kolla FL-trimmar" + +#if defined(COLORLCD) + // Horus footer descriptions + #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } + + // Horus layouts and widgets + #define TR_FIRST_CHANNEL "Första kanal" + #define TR_FILL_BACKGROUND "Fyll bakgrund?" + #define TR_BG_COLOR "Bakgrundsfärg" + #define TR_SLIDERS_TRIMS "Reglage+Trimmar" + #define TR_SLIDERS "Reglage" + #define TR_FLIGHT_MODE "Flygläge" + #define TR_INVALID_FILE "Ogiltig fil" + #define TR_TIMER_SOURCE "Timerkälla" + #define TR_SIZE "Storlek" + #define TR_SHADOW "Skugga" + #define TR_ALIGN_LABEL "Justera märka" + #define TR_ALIGN_VALUE "Justera värde" + #define TR_ALIGN_OPTS { "Vänster", "Mitten", "Höger" } + #define TR_TEXT "Text" + #define TR_COLOR "Färg" + #define TR_MAIN_VIEW_X "Huvudvy X" + #define TR_PANEL1_BACKGROUND "Panel 1 bakgrund" + #define TR_PANEL2_BACKGROUND "Panel 2 bakgrund" + #define TR_WIDGET_GAUGE "Mätare" + #define TR_WIDGET_MODELBMP "Modellinfo" + #define TR_WIDGET_OUTPUTS "Output" + #define TR_WIDGET_TEXT "Text" + #define TR_WIDGET_TIMER "Timer" + #define TR_WIDGET_VALUE "Värde" +#endif // About screen #define TR_ABOUTUS "Om oss"