Many improvements of print dialog. Some minor changes in mixes and inputs formatting.

This commit is contained in:
Damjan Adamic
2014-05-04 10:37:49 +02:00
parent 667453d48c
commit 8787dd05cd
6 changed files with 163 additions and 181 deletions
+11 -11
View File
@@ -155,16 +155,6 @@ QString InputsPanel::getInputText(int dest, bool * new_ch)
str = " ";
}
if (firmware->getCapability(VirtualInputs)) {
str += " " + tr("Source(%1)").arg(md->srcRaw.toString());
if (md->carryTrim>0) {
str += " " + tr("No Trim");
}
else if (md->carryTrim<0) {
str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
}
}
switch (md->mode) {
case (1): str += " <-"; break;
case (2): str += " ->"; break;
@@ -173,7 +163,17 @@ QString InputsPanel::getInputText(int dest, bool * new_ch)
str += " " + tr("Weight(%1)").arg(getGVarString(md->weight));
if (md->curve.value) str += " " + md->curve.toString();
if (firmware->getCapability(VirtualInputs)) {
str += " " + tr("Source(%1)").arg(md->srcRaw.toString());
if (md->carryTrim>0) {
str += " " + tr("NoTrim");
}
else if (md->carryTrim<0) {
str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
}
}
if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
QString phasesStr = getPhasesStr(md->phases, model);
if (!phasesStr.isEmpty()) str += " " + phasesStr;
+3 -6
View File
@@ -191,11 +191,8 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
str += " " + Qt::escape(tr("Switch(%1)").arg(md->swtch.toString()));
}
if (md->carryTrim>0) {
str += " " + Qt::escape(tr("No Trim"));
}
else if (md->carryTrim<0) {
str += " " + Qt::escape(RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString());
if (md->carryTrim) {
str += " " + Qt::escape(tr("NoTrim"));
}
if (md->noExpo) str += " " + Qt::escape(tr("No DR/Expo"));
@@ -214,7 +211,7 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
QString MixerName;
MixerName.append(md->name);
if (!MixerName.isEmpty()) {
str += Qt::escape(QString("(%1)").arg(MixerName));
str += " " + Qt::escape(QString("(%1)").arg(MixerName));
}
}
}