piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Companion] Radio data translation/strings (#5554)

Browse Source 
* [Companion] Add Qt tr() functions to all radio data classes instead of using generic QObject type.  (no functional changes)

* Small fix for gcc.

* Move more element name string generation to individual classes; settle on nameToString as function name.

* Also put firmware build options translations into Firmware scope.
This commit is contained in:
Max Paperno
2017-12-21 18:26:11 +01:00
committed by Bertrand Songis
parent 7806c2096d
commit a951292f27
34 changed files with 606 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/io_data.cpp
+14 -9
View File
@@ -29,8 +29,8 @@
void ExpoData::convert(RadioDataConversionState & cstate)
{
cstate.setComponent(QObject::tr("INP"), 3);
cstate.setSubComp(RawSource(SOURCE_TYPE_VIRTUAL_INPUT, chn).toString(cstate.fromModel(), cstate.fromGS(), cstate.fromType) % QObject::tr(" (@%1)").arg(cstate.subCompIdx));
cstate.setComponent(tr("INP"), 3);
cstate.setSubComp(RawSource(SOURCE_TYPE_VIRTUAL_INPUT, chn).toString(cstate.fromModel(), cstate.fromGS(), cstate.fromType) % tr(" (@%1)").arg(cstate.subCompIdx));
srcRaw.convert(cstate);
swtch.convert(cstate);
}
@@ -42,8 +42,8 @@ void ExpoData::convert(RadioDataConversionState & cstate)
void MixData::convert(RadioDataConversionState & cstate)
{
cstate.setComponent(QObject::tr("MIX"), 4);
cstate.setSubComp(RawSource(SOURCE_TYPE_CH, destCh-1).toString(cstate.fromModel(), cstate.fromGS(), cstate.fromType) % QObject::tr(" (@%1)").arg(cstate.subCompIdx));
cstate.setComponent(tr("MIX"), 4);
cstate.setSubComp(RawSource(SOURCE_TYPE_CH, destCh-1).toString(cstate.fromModel(), cstate.fromGS(), cstate.fromType) % tr(" (@%1)").arg(cstate.subCompIdx));
srcRaw.convert(cstate);
swtch.convert(cstate);
}
@@ -65,7 +65,12 @@ QString LimitData::maxToString() const
QString LimitData::revertToString() const
{
return revert ? QObject::tr("INV") : QObject::tr("NOR");
return revert ? tr("INV") : tr("NOR");
}
QString LimitData::nameToString(int index) const
{
return RadioData::getElementName(tr("CH"), index + 1, name);
}
QString LimitData::offsetToString() const
@@ -108,7 +113,7 @@ bool CurveData::isEmpty() const
QString CurveData::nameToString(const int idx) const
{
return RadioData::getElementName(QCoreApplication::translate("Curve", "CV"), idx + 1, name);
return RadioData::getElementName(tr("CV"), idx + 1, name);
}
@@ -129,14 +134,14 @@ void FlightModeData::clear(const int phase)
}
}
QString FlightModeData::toString(int index) const
QString FlightModeData::nameToString(int index) const
{
return RadioData::getElementName(QObject::tr("FM"), index, name, true);
return RadioData::getElementName(tr("FM"), index, name); // names are zero-based, FM0, FM1, etc
}
void FlightModeData::convert(RadioDataConversionState & cstate)
{
cstate.setComponent("FMD", 2);
cstate.setSubComp(toString(cstate.subCompIdx));
cstate.setSubComp(nameToString(cstate.subCompIdx));
swtch.convert(cstate);
}