From 9ae7aea7bb493d5216bc7e6101ed4674deb3ab32 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 13 Oct 2015 15:46:37 +0200 Subject: [PATCH] Fixes #2837 --- companion/src/modeledit/logicalswitches.cpp | 4 ++-- companion/src/modelprinter.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp index 60a2e5dab..8dd1bf8df 100644 --- a/companion/src/modeledit/logicalswitches.cpp +++ b/companion/src/modeledit/logicalswitches.cpp @@ -240,7 +240,7 @@ void LogicalSwitchesPanel::edited() updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.1); break; case LS_FAMILY_EDGE: - cswitchOffset2[i]->setSpecialValueText(tr("(no release)")); + cswitchOffset2[i]->setSpecialValueText(tr("(instant)")); if (sender() == cswitchOffset[i]) { model->logicalSw[i].val2 = TimToVal(cswitchOffset[i]->value()); updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0); @@ -339,7 +339,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i) populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext); updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0); updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1)); - cswitchOffset2[i]->setSpecialValueText(tr("(no release)")); + cswitchOffset2[i]->setSpecialValueText(tr("(instant)")); if (model->logicalSw[i].val3 == 0) { cswitchOffset2[i]->setSuffix(tr("(infinite)")); } diff --git a/companion/src/modelprinter.cpp b/companion/src/modelprinter.cpp index 021ecdd02..fd4c851ab 100644 --- a/companion/src/modelprinter.cpp +++ b/companion/src/modelprinter.cpp @@ -443,7 +443,7 @@ QString ModelPrinter::printLogicalSwitchLine(int idx) } switch (ls.getFunctionFamily()) { case LS_FAMILY_EDGE: - result += tr("Edge(%1, [%2:%3])").arg(RawSwitch(ls.val1).toString()).arg(ValToTim(ls.val2)).arg(ValToTim(ls.val2+ls.val3)); + result += tr("Edge(%1, [%2:%3])").arg(RawSwitch(ls.val1).toString()).arg(ValToTim(ls.val2)).arg(ls.val3<0 ? tr("instant") : QString("%1").arg(ValToTim(ls.val2+ls.val3))); break; case LS_FAMILY_STICKY: result += tr("Sticky(%1, %2)").arg(RawSwitch(ls.val1).toString()).arg(RawSwitch(ls.val2).toString());