From 174cc164c5d581c523a18d5463c6a7923bfe2e7c Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Thu, 28 Aug 2014 16:29:21 +0200
Subject: [PATCH] Companion part for #1646

---
 companion/src/modeledit/logicalswitches.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp
index 49ea54fd3..245670df8 100644
--- a/companion/src/modeledit/logicalswitches.cpp
+++ b/companion/src/modeledit/logicalswitches.cpp
@@ -239,6 +239,7 @@ void LogicalSwitchesPanel::edited()
         updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.1);
         break;
       case LS_FAMILY_EDGE:
+        cswitchOffset2[i]->setSpecialValueText(tr("(no release)"));
         if (sender() == cswitchOffset[i]) {
           model.customSw[i].val2 = TimToVal(cswitchOffset[i]->value());
           updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.0);
@@ -246,10 +247,12 @@ void LogicalSwitchesPanel::edited()
         else {
           model.customSw[i].val3 = TimToVal(cswitchOffset2[i]->value()) - model.customSw[i].val2;
         }
-        updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, cswitchOffset[i]->value());
+        updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, cswitchOffset[i]->value()-0.1);
         if (model.customSw[i].val3 == 0) {
-          cswitchOffset2[i]->setSuffix(tr("(infinite)"));
-          cswitchOffset2[i]->clear();
+          cswitchOffset2[i]->setSuffix("(infinite)");
+        }
+        else {
+          cswitchOffset2[i]->setSuffix("");
         }
         break;
       default:
@@ -274,7 +277,6 @@ void LogicalSwitchesPanel::updateTimerParam(QDoubleSpinBox *sb, int timer, doubl
   else
     sb->setSingleStep(0.1);
   sb->setValue(value);
-  sb->setSuffix("");
 }
 
 #define SOURCE1_VISIBLE  0x1
@@ -331,10 +333,13 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
       mask &= ~DELAY_ENABLED;
       populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext);
       updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.0);
-      updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, cswitchOffset[i]->value());
+      updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, cswitchOffset[i]->value()-0.1);
+      cswitchOffset2[i]->setSpecialValueText(tr("(no release)"));
       if (model.customSw[i].val3 == 0) {
         cswitchOffset2[i]->setSuffix(tr("(infinite)"));
-        cswitchOffset2[i]->clear();
+      }
+      else {
+        cswitchOffset2[i]->setSuffix("");
       }
       break;
     case LS_FAMILY_VCOMP: