Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

[Horus] Column names are back + A small description in the status bar ...

Browse source
This commit is contained in:
Bertrand Songis 2016-05-30 17:11:10 +02:00
parent 60334a3cf2
commit 086632003b
19 changed files with 52 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/horus/menu_model_flightmodes.cpp
View file

@ -91,7 +91,7 @@ bool menuModelFlightModesAll(evt_t event)
}
if (sub<MAX_FLIGHT_MODES && posHorz>=0) {
drawColumnHeader(STR_PHASES_HEADERS, posHorz);
drawColumnHeader(STR_PHASES_HEADERS, NULL, posHorz);
}
for (int i=0; i<NUM_BODY_LINES; i++) {

2
radio/src/gui/horus/menu_model_limits.cpp
View file

@ -103,7 +103,7 @@ bool menuModelLimits(evt_t event)
uint32_t sub = menuVerticalPosition;
if (sub<NUM_CHNOUT && menuHorizontalPosition>=0) {
drawColumnHeader(STR_LIMITS_HEADERS, menuHorizontalPosition);
drawColumnHeader(STR_LIMITS_HEADERS, NULL, menuHorizontalPosition);
}
if (warningResult) {

2
radio/src/gui/horus/menu_model_logical_switches.cpp
View file

@ -84,7 +84,7 @@ bool menuModelLogicalSwitches(evt_t event)
int horz = menuHorizontalPosition;
if (sub>= 0 && horz>=0) {
drawColumnHeader(STR_CSW_HEADERS, horz);
drawColumnHeader(STR_LSW_HEADERS, STR_LSW_DESCRIPTIONS, horz);
}
if (horz<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {

14
radio/src/gui/horus/widgets.cpp
View file

@ -21,9 +21,17 @@
#include "opentx.h"
#include <stdio.h>
void drawColumnHeader(const char * const * headers, uint8_t index)
void drawStatusText(const char * text)
{
// TODO ? displayHeader(headers[index]);
lcdDrawText(MENUS_MARGIN_LEFT, MENU_FOOTER_TOP, text, MENU_TITLE_COLOR); // TODO dedicated theme color
}
void drawColumnHeader(const char * const * headers, const char * const * descriptions, uint8_t index)
{
lcdDrawText(LCD_W, MENU_TITLE_TOP + 2, headers[index], RIGHT | SMLSIZE | MENU_TITLE_COLOR);
if (descriptions) {
drawStatusText(descriptions[index]);
}
}
#include "alpha_stick_background.lbm"
@ -142,7 +150,7 @@ void drawMenuTemplate(const char * title, uint8_t icon, const uint8_t * icons, u
lcdDrawSolidFilledRect(0, MENU_HEADER_HEIGHT, LCD_W, MENU_TITLE_TOP - MENU_HEADER_HEIGHT, TEXT_BGCOLOR);
lcdDrawSolidFilledRect(0, MENU_TITLE_TOP, LCD_W, MENU_TITLE_HEIGHT, TITLE_BGCOLOR);
if (title) {
lcdDrawText(MENUS_MARGIN_LEFT, MENU_TITLE_TOP+2, title, MENU_TITLE_COLOR);
lcdDrawText(MENUS_MARGIN_LEFT, MENU_TITLE_TOP+1, title, MENU_TITLE_COLOR);
}
if (icons) {
for (int i=0; i<menuPageCount; i++) {

4
radio/src/gui/horus/widgets.h
View file

@ -39,8 +39,8 @@
#define OPTION_SLIDER_NUMBER_BUTTON 0x100
#define OPTION_SLIDER_SQUARE_BUTTON 0x200
void drawColumnHeader(const char * const * headers, uint8_t index);
void drawStatusText(const char * text);
void drawColumnHeader(const char * const * headers, const char * const * descriptions, uint8_t index);
void drawTopbarDatetime();
void drawStick(coord_t x, coord_t y, int16_t xval, int16_t yval);

2
radio/src/gui/taranis/menu_model_logical_switches.cpp
View file

@ -83,7 +83,7 @@ void menuModelLogicalSwitches(uint8_t event)
horzpos_t horz = menuHorizontalPosition;
if (horz>=0) {
drawColumnHeader(STR_CSW_HEADERS, horz);
drawColumnHeader(STR_LSW_HEADERS, horz);
}
if (horz<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {

3
radio/src/translations.cpp
View file

@ -560,7 +560,8 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
#if LCD_W >= 212
const char * const STR_PHASES_HEADERS[] = TR_PHASES_HEADERS;
const char * const STR_LIMITS_HEADERS[] = TR_LIMITS_HEADERS;
const char * const STR_CSW_HEADERS[] = TR_CSW_HEADERS;
const char * const STR_LSW_HEADERS[] = TR_LSW_HEADERS;
const char * const STR_LSW_DESCRIPTIONS[] = TR_LSW_DESCRIPTIONS;
#endif
#if defined(CPUARM)

3
radio/src/translations.h
View file

@ -828,7 +828,8 @@ extern const pm_char STR_BLCOLOR[];
#if LCD_W >= 212
extern const char * const STR_PHASES_HEADERS[];
extern const char * const STR_LIMITS_HEADERS[];
extern const char * const STR_CSW_HEADERS[];
extern const char * const STR_LSW_HEADERS[];
extern const char * const STR_LSW_DESCRIPTIONS[];
#endif
#if defined(CPUARM)

3
radio/src/translations/cz.h.txt
View file

@ -1078,7 +1078,8 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Název ", " Spínač ", " Trim směrovky ", " Trim výškovky ", " Trim plynu ", " Trim křidélek ", " Přechod náběhu ", " Přechod konce " }
#define TR_LIMITS_HEADERS { " Název ", " Subtrim ", " Min ", " Max ", " Invertovat ", " Křivka ", " Střed PPM ", " Symetrické " }
#define TR_CSW_HEADERS { " Funkce ", " Hodnota 1 ", " Hodnota 2 ", " Hodnota 2 ", " AND Spínač ", " Trvání ", " Zpoždění " }
#define TR_LSW_HEADERS { " Funkce ", " Hodnota 1 ", " Hodnota 2 ", " Hodnota 2 ", " AND Spínač ", " Trvání ", " Zpoždění " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// Taranis About screen
#define TR_ABOUTUS TR(" O nás ", "O nás")

3
radio/src/translations/de.h.txt
View file

@ -1082,7 +1082,8 @@
// Taranis Info Zeile Anzeigen
#define TR_PHASES_HEADERS { " Name ", " Schalter ", " Trim Seite ", " Trim Höhe ", " Trim Gas ", " Trim Quer ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Mitte ", " Min ", " Max ", " Richtung ", " Kurve ", " PPM-Mitte ", " Mitte-Mode " }
#define TR_CSW_HEADERS { " Funktion ", " Var1 ", " Var2 ", " Var2 ", " UND-Schalter ", " Dauer ", " Verzögerung " }
#define TR_LSW_HEADERS { " Funktion ", " Var1 ", " Var2 ", " Var2 ", " UND-Schalter ", " Dauer ", " Verzögerung " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// Taranis About screen
#define TR_ABOUTUS "Über OpenTx"

4
radio/src/translations/en.h.txt
View file

@ -1092,7 +1092,9 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Subtrim mode " }
#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// About screen
#define TR_ABOUTUS TR(" ABOUT ", "ABOUT")

3
radio/src/translations/es.h.txt
View file

@ -1042,7 +1042,8 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Nombre ", " Interrup.", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Aparecer ", " Desparecer " }
#define TR_LIMITS_HEADERS { " Nombre ", " Compensacion", " Min ", " Max ", " Direccion ", " Curve ", " Centrado PPM ", " Simetrica " }
#define TR_CSW_HEADERS { " Funcion ", " V1 ", " V2 ", " V2 ", " AND Interrup. ", " Duracion ", " Retardo " }
#define TR_LSW_HEADERS { " Funcion ", " V1 ", " V2 ", " V2 ", " AND Interrup. ", " Duracion ", " Retardo " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// Taranis About screen
#define TR_ABOUTUS "Nosotros"

3
radio/src/translations/fi.h.txt
View file

@ -1042,7 +1042,8 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Subtrim mode " }
#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// About screen
#define TR_ABOUTUS TR(" ABOUT ", "ABOUT")

3
radio/src/translations/fr.h.txt
View file

@ -1069,7 +1069,8 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Nom ", " Inter ", " Trim Dir ", " Trim Prf ", " Trim Gaz ", " Trim Ail ", " Fondu ON ", " Fondu OFF " }
#define TR_LIMITS_HEADERS { " Nom ", " Subtrim ", " Min ", " Max ", " Direction ", " Courbe ", " Neutre PPM ", " Mode subtrim " }
#define TR_CSW_HEADERS { " Fonction ", " V1 ", " V2 ", " V2 ", " ET suppl. ", " Durée ", " Délai " }
#define TR_LSW_HEADERS { " Fonction ", " V1 ", " V2 ", " V2 ", " ET suppl. ", " Durée ", " Délai " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// Taranis About screen
#define TR_ABOUTUS TR(" A PROPOS ", "A PROPOS")

3
radio/src/translations/it.h.txt
View file

@ -1077,7 +1077,8 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Nome ", " Inter. ", " Trim Deriva ", " Trim Elevator ", " Trim Motore ", " Trim Alettoni ", " Disolv. In ", " Dissolv. Out " }
#define TR_LIMITS_HEADERS { " Nome ", " Offset ", " Min ", " Max ", " Direzione ", " Curve ", " Centro PPM ", " Simmetria " }
#define TR_CSW_HEADERS { " Funzione ", " V1 ", " V2 ", " V2 ", " Inter. AND ", " Durata ", " Ritardo " }
#define TR_LSW_HEADERS { " Funzione ", " V1 ", " V2 ", " V2 ", " Inter. AND ", " Durata ", " Ritardo " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// About screen
#define TR_ABOUTUS TR(" INFO ", "INFO SU")

3
radio/src/translations/nl.h.txt
View file

@ -1091,7 +1091,8 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Richtung ", " Curve ", " PPM-Midden ", " Subtrim Mode " }
#define TR_CSW_HEADERS { " Funktie ", " Var1 ", " Var2 ", " Var2 ", " EN-Schakelaar ", " Duur ", " Vertraging " }
#define TR_LSW_HEADERS { " Funktie ", " Var1 ", " Var2 ", " Var2 ", " EN-Schakelaar ", " Duur ", " Vertraging " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// About screen
#define TR_ABOUTUS TR(" ABOUT ", "ABOUT")

3
radio/src/translations/pl.h.txt
View file

@ -1079,7 +1079,8 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Nazwa", " Przełą.", " Trymer SK ", " Trymer SW ", " Trymer Gazu ", " Trymer Lotek ", " Pojawian", " Zanik " }
#define TR_LIMITS_HEADERS { " Nazwa", " Subtrim ", " Min ", " Max ", " Kierunek ", " Krzywa", " Środek PPM ", " Tryb subtrim " }
#define TR_CSW_HEADERS { " Funkcja ", " V1 ", " V2 ", " V2 ", " AND Przełą ", " CzasTrwa ", " Opóźn " }
#define TR_LSW_HEADERS { " Funkcja ", " V1 ", " V2 ", " V2 ", " AND Przełą ", " CzasTrwa ", " Opóźn " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// About screen
#define TR_ABOUTUS TR(" O ", " O ")

3
radio/src/translations/pt.h.txt
View file

@ -1038,7 +1038,8 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Symmetrical " }
#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// Taranis About screen
#define TR_ABOUTUS "ABOUT US"

4
radio/src/translations/se.h.txt
View file

@ -1090,7 +1090,9 @@
// Taranis column headers
#define TR_PHASES_HEADERS { " Namn ", " Brytare ", " Rodertrim ", " Höjdrodertrim ", " Gastrim ", " Skevrodertrim ", " Tona Upp ", " Tona Ned " }
#define TR_LIMITS_HEADERS { " Namn ", " Subtrim ", " Min ", " Max ", " Riktning ", " Kurva ", " PPM-center ", " Subtrim-läge " }
#define TR_CSW_HEADERS { " Funktion ", " V1 ", " V2 ", " V2 ", " OCH Brytare ", " Tidslängd ", " Fördröj " }
#define TR_LSW_HEADERS { " Funktion ", " V1 ", " V2 ", " V2 ", " OCH Brytare ", " Tidslängd ", " Fördröj " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// About screen
#define TR_ABOUTUS "Om Oss"