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

Warning when Multiply used on first mix of a channel, fix #4525 (#4647)

Browse Source 
* Proposal to fix #4525

* Clearer text

* Companion side

* Translation not needed
This commit is contained in:
Bertrand Songis
2017-03-22 11:39:09 +01:00
committed by Andre Bernet
parent 618345a2ef
commit 76f5d029a0
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modelprinter.cpp
+4 -1
View File
@@ -429,7 +429,10 @@ QString ModelPrinter::printMixerLine(const MixData & mix, bool showMultiplex, in
}
str += " " + source;
str += " " + tr("Weight(%1)").arg(getGVarString(mix.weight, true)).toHtmlEscaped();
if (mix.mltpx == MLTPX_MUL && !showMultiplex)
str += " " + QString("MULT!").toHtmlEscaped();
else
str += " " + tr("Weight(%1)").arg(getGVarString(mix.weight, true)).toHtmlEscaped();
QString flightModesStr = printFlightModes(mix.flightModes);
if (!flightModesStr.isEmpty())
radio/src/gui/480x272/model_mixes.cpp
+4 -1
View File
@@ -555,7 +555,10 @@ bool menuModelMixAll(event_t event)
drawSource(MIX_LINE_SRC_POS, y, md->srcRaw);
gvarWeightItem(MIX_LINE_WEIGHT_POS, y, md, RIGHT | attr | (isMixActive(i) ? BOLD : 0), event);
if (mixCnt == 0 && md->mltpx == 1)
lcdDrawText(MIX_LINE_WEIGHT_POS, y, "MULT!", RIGHT | attr | (isMixActive(i) ? BOLD : 0));
else
gvarWeightItem(MIX_LINE_WEIGHT_POS, y, md, RIGHT | attr | (isMixActive(i) ? BOLD : 0), event);
displayMixLine(y, md);
radio/src/gui/common/stdlcd/model_mixes.cpp
+7 -1
View File
@@ -441,7 +441,13 @@ void menuModelMixAll(event_t event)
drawSource(MIX_LINE_SRC_POS, y, md->srcRaw, 0);
gvarWeightItem(MIX_LINE_WEIGHT_POS, y, md, RIGHT | attr | (isMixActive(i) ? BOLD : 0), 0);
if (mixCnt == 0 && md->mltpx == 1) {
lcdDrawText(MIX_LINE_WEIGHT_POS, y, "MULT!", RIGHT | attr | (isMixActive(i) ? BOLD : 0));
}
else {
gvarWeightItem(MIX_LINE_WEIGHT_POS, y, md, RIGHT | attr | (isMixActive(i) ? BOLD : 0), 0);
}
#if LCD_W >= 212
displayMixLine(y, md);
#else