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

[128x64] UI fixes, French translations

Browse source
This commit is contained in:
Andre Bernet 2016-12-19 21:26:12 +01:00
parent 86ee899905
commit 2b56ea70df
6 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/128x64/model_curve_edit.cpp
View file

@ -69,7 +69,7 @@ void menuModelCurveOne(event_t event)
CurveData & crv = g_model.curves[s_curveChan]; CurveData & crv = g_model.curves[s_curveChan];
int8_t * points = curveAddress(s_curveChan); int8_t * points = curveAddress(s_curveChan);
drawStringWithIndex(PSIZE(TR_MENUCURVES)*FW+FW, 0, "CV", s_curveChan+1); drawStringWithIndex(PSIZE(TR_MENUCURVES)*FW+FW, 0, STR_CV, s_curveChan+1);
SIMPLE_SUBMENU(STR_MENUCURVES, 4 + 5+crv.points + (crv.type==CURVE_TYPE_CUSTOM ? 5+crv.points-2 : 0)); SIMPLE_SUBMENU(STR_MENUCURVES, 4 + 5+crv.points + (crv.type==CURVE_TYPE_CUSTOM ? 5+crv.points-2 : 0));

6
radio/src/gui/128x64/model_flightmodes.cpp
View file

@ -201,10 +201,10 @@ void menuModelPhaseOne(event_t event)
if (v > GVAR_MAX) { if (v > GVAR_MAX) {
uint8_t p = v - GVAR_MAX - 1; uint8_t p = v - GVAR_MAX - 1;
if (p >= s_currIdx) p++; if (p >= s_currIdx) p++;
drawFlightMode(11*FW, y, p+1, posHorz==1 ? attr : 0); drawFlightMode(10*FW, y, p+1, posHorz==1 ? attr : 0);
} }
else { else {
lcdDrawText(11*FW, y, STR_OWN, posHorz==1 ? attr : 0); lcdDrawText(10*FW, y, STR_OWN, posHorz==1 ? attr : 0);
} }
if (attr && s_currIdx>0 && posHorz==1 && (editMode>0 || p1valdiff)) { if (attr && s_currIdx>0 && posHorz==1 && (editMode>0 || p1valdiff)) {
if (v < GVAR_MAX) v = GVAR_MAX; if (v < GVAR_MAX) v = GVAR_MAX;
@ -216,7 +216,7 @@ void menuModelPhaseOne(event_t event)
} }
uint8_t p = getGVarFlightMode(s_currIdx, idx); uint8_t p = getGVarFlightMode(s_currIdx, idx);
lcdDrawNumber(21*FW, y, GVAR_VALUE(idx, p), posHorz==2 ? attr : 0); lcdDrawNumber(18*FW, y, GVAR_VALUE(idx, p), posHorz==2 ? attr : 0);
if (attr && posHorz==2 && ((editMode>0) || p1valdiff)) { if (attr && posHorz==2 && ((editMode>0) || p1valdiff)) {
GVAR_VALUE(idx, p) = checkIncDec(event, GVAR_VALUE(idx, p), -500, 500, EE_MODEL); GVAR_VALUE(idx, p) = checkIncDec(event, GVAR_VALUE(idx, p), -500, 500, EE_MODEL);
} }

2
radio/src/gui/128x64/model_input_edit.cpp
View file

@ -132,7 +132,7 @@ void menuModelExpoOne(event_t event)
break; break;
case EXPO_FIELD_CURVE: case EXPO_FIELD_CURVE:
editCurveRef(EXPO_ONE_2ND_COLUMN, y, ed->curve, event, RIGHT | attr); editCurveRef(EXPO_ONE_2ND_COLUMN-3*FW, y, ed->curve, event, RIGHT | attr);
break; break;
#endif #endif

2
radio/src/gui/128x64/model_special_functions.cpp
View file

@ -22,7 +22,7 @@
#define MODEL_SPECIAL_FUNC_1ST_COLUMN (0) #define MODEL_SPECIAL_FUNC_1ST_COLUMN (0)
#define MODEL_SPECIAL_FUNC_2ND_COLUMN (4*FW-1) #define MODEL_SPECIAL_FUNC_2ND_COLUMN (4*FW-1)
#define MODEL_SPECIAL_FUNC_3RD_COLUMN (14*FW-3) #define MODEL_SPECIAL_FUNC_3RD_COLUMN (15*FW-3)
#define MODEL_SPECIAL_FUNC_4TH_COLUMN (20*FW) #define MODEL_SPECIAL_FUNC_4TH_COLUMN (20*FW)
#if defined(GRAPHICS) #if defined(GRAPHICS)
#define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (20*FW) #define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (20*FW)

4
radio/src/gui/common/stdlcd/model_curves.cpp
View file

@ -127,11 +127,11 @@ void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlag
curve.value = GVAR_MENU_ITEM(x, y, curve.value, -100, 100, LEFT | (menuHorizontalPosition==1 ? flags : 0), 0, event); curve.value = GVAR_MENU_ITEM(x, y, curve.value, -100, 100, LEFT | (menuHorizontalPosition==1 ? flags : 0), 0, event);
break; break;
case CURVE_REF_FUNC: case CURVE_REF_FUNC:
lcdDrawTextAtIndex(x, y, STR_VCURVEFUNC, curve.value, RIGHT | (menuHorizontalPosition==1 ? flags : 0)); lcdDrawTextAtIndex(x+2*FW, y, STR_VCURVEFUNC, curve.value, RIGHT | (menuHorizontalPosition==1 ? flags : 0));
if (flags && menuHorizontalPosition==1) CHECK_INCDEC_MODELVAR_ZERO(event, curve.value, CURVE_BASE-1); if (flags && menuHorizontalPosition==1) CHECK_INCDEC_MODELVAR_ZERO(event, curve.value, CURVE_BASE-1);
break; break;
case CURVE_REF_CUSTOM: case CURVE_REF_CUSTOM:
drawCurveName(x, y, curve.value, RIGHT | (menuHorizontalPosition==1 ? flags : 0)); drawCurveName(x+2*FW, y, curve.value, RIGHT | (menuHorizontalPosition==1 ? flags : 0));
if (flags && menuHorizontalPosition==1) { if (flags && menuHorizontalPosition==1) {
if (event==EVT_KEY_LONG(KEY_ENTER) && curve.value!=0) { if (event==EVT_KEY_LONG(KEY_ENTER) && curve.value!=0) {
s_curveChan = (curve.value<0 ? -curve.value-1 : curve.value-1); s_curveChan = (curve.value<0 ? -curve.value-1 : curve.value-1);

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

@ -662,12 +662,8 @@
#define TR_MODELNAME TR("Nom modèle", "Nom du modèle") #define TR_MODELNAME TR("Nom modèle", "Nom du modèle")
#define TR_PHASENAME "Nom phase" #define TR_PHASENAME "Nom phase"
#define TR_MIXNAME TR("Nom mix.", "Nom du mixeur") #define TR_MIXNAME TR("Nom mix.", "Nom du mixeur")
#define TR_INPUTNAME "Nom entrée" #define TR_INPUTNAME TR("Entrée", "Nom entrée")
#if defined(CPUARM) #define TR_EXPONAME TR("Nom", "Nom ligne")
#define TR_EXPONAME "Nom ligne"
#else
#define TR_EXPONAME "Nom expo"
#endif
#define TR_BITMAP "Image du modèle" #define TR_BITMAP "Image du modèle"
#define TR_TIMER "Chrono " #define TR_TIMER "Chrono "
#define TR_ELIMITS TR("Limites ét.", "Limites étendues") #define TR_ELIMITS TR("Limites ét.", "Limites étendues")
@ -704,7 +700,7 @@
#define TR_AILDIRECTION TR("Inv. latéral", "Inversion latéral") #define TR_AILDIRECTION TR("Inv. latéral", "Inversion latéral")
#define TR_COLDIRECTION TR("Inv. collectif", "Inversion collectif") #define TR_COLDIRECTION TR("Inv. collectif", "Inversion collectif")
#define TR_MODE INDENT "Mode" #define TR_MODE INDENT "Mode"
#define TR_SUBTYPE INDENT "Subtype" #define TR_SUBTYPE INDENT "Sous-type"
#define TR_NOFREEEXPO "Max expos atteint!" #define TR_NOFREEEXPO "Max expos atteint!"
#define TR_NOFREEMIXER "Max mixages atteint!" #define TR_NOFREEMIXER "Max mixages atteint!"
#define TR_SOURCE INDENT "Source" #define TR_SOURCE INDENT "Source"
@ -877,14 +873,14 @@
#define TR_RECEIVER_NUM "Récepteur" #define TR_RECEIVER_NUM "Récepteur"
#define TR_RECEIVER "Récepteur" #define TR_RECEIVER "Récepteur"
#endif #endif
#define TR_MULTI_RFTUNE INDENT "Ajustement fréq." #define TR_MULTI_RFTUNE TR(INDENT "Ajust.fréq", INDENT "Ajustement fréq.")
#define TR_MULTI_VIDFREQ INDENT "Fréquence vidéo" #define TR_MULTI_VIDFREQ TR(INDENT "Fréq. vidéo", INDENT "Fréquence vidéo")
#define TR_MULTI_RFPOWER INDENT "RF Power" #define TR_MULTI_RFPOWER TR(INDENT "Puiss. RF", INDENT "Puissance RF")
#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option perso") #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option perso")
#define TR_MULTI_AUTOBIND INDENT "Bind automatique" #define TR_MULTI_AUTOBIND TR(INDENT "Bind auto", INDENT "Bind automatique")
#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodét.", INDENT "Autodétection")
#define TR_MULTI_LOWPOWER TR( INDENT "low power", INDENT "Mode basse puiss.") #define TR_MULTI_LOWPOWER TR(INDENT "Basse puis.", INDENT "Mode basse puiss.")
#define TR_MULTI_SERVOFREQ TR(INDENT "Servo rate", INDENT "Servo update rate") #define TR_MULTI_SERVOFREQ TR(INDENT "Fréq.servo", INDENT "Fréquence servos")
#define TR_SYNCMENU "Sync [MENU]" #define TR_SYNCMENU "Sync [MENU]"
#define TR_LIMIT INDENT "Limite" #define TR_LIMIT INDENT "Limite"
#define TR_MINRSSI "RSSI Min." #define TR_MINRSSI "RSSI Min."
@ -929,9 +925,9 @@
#define TR_SWITCHWARN TR("INTERS","CONTROLES") #define TR_SWITCHWARN TR("INTERS","CONTROLES")
#define TR_FAILSAFEWARN "FAILSAFE" #define TR_FAILSAFEWARN "FAILSAFE"
#define TR_WRONG_SDCARDVERSION "Version requise: " #define TR_WRONG_SDCARDVERSION "Version requise: "
#define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_WRONG_PCBREV "PCB incorrect détecté"
#define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_EMERGENCY_MODE "MODE SECOURS"
#define TR_PCBREV_ERROR "PCB error" #define TR_PCBREV_ERROR "Erreur PCB"
#define TR_NO_FAILSAFE "Failsafe pas déf." #define TR_NO_FAILSAFE "Failsafe pas déf."
#define TR_KEYSTUCK "Touche bloquée" #define TR_KEYSTUCK "Touche bloquée"
#define TR_INVERT_THR "Inverser gaz?" #define TR_INVERT_THR "Inverser gaz?"
@ -945,7 +941,7 @@
#define TR_COPROC_TEMP "Temp. MB \016>" #define TR_COPROC_TEMP "Temp. MB \016>"
#define TR_CAPAWARNING INDENT "Capacité Basse" #define TR_CAPAWARNING INDENT "Capacité Basse"
#define TR_TEMPWARNING INDENT "Surchauffe" #define TR_TEMPWARNING INDENT "Surchauffe"
#define TR_FUNC TR("Fonc", "Fonction") #define TR_FUNC "Fonction"
#define TR_V1 "V1" #define TR_V1 "V1"
#define TR_V2 "V2" #define TR_V2 "V2"
#define TR_DURATION "Durée" #define TR_DURATION "Durée"
@ -1238,7 +1234,7 @@
#define TR_GPSSENSOR "Capteur GPS" #define TR_GPSSENSOR "Capteur GPS"
#define TR_CURRENTSENSOR "Capteur" #define TR_CURRENTSENSOR "Capteur"
#define TR_AUTOOFFSET "Offset auto" #define TR_AUTOOFFSET "Offset auto"
#define TR_ONLYPOSITIVE "Positive" #define TR_ONLYPOSITIVE "Positif"
#define TR_FILTER "Filtrage" #define TR_FILTER "Filtrage"
#define TR_TELEMETRYFULL "Plus de capteurs libres!" #define TR_TELEMETRYFULL "Plus de capteurs libres!"
#define TR_SERVOS_OK "Servos OK" #define TR_SERVOS_OK "Servos OK"