From 7027d809c1bda737af6e72b2e9f9d51dc49ed3b9 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sun, 4 May 2014 18:21:03 +0200
Subject: [PATCH] Logical switches print improvement

---
 companion/src/eeprominterface.cpp | 12 ++++++------
 companion/src/printdialog.cpp     |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index d927be13d..1e3868830 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -507,13 +507,13 @@ QString LogicalSwitchData::toString(const ModelData & model)
   }
   switch (getFunctionFamily()) {
     case LS_FAMILY_STAY:
-      result = QObject::tr("STAY( %1, [%2:%3])").arg(RawSwitch(val1).toString()).arg(ValToTim(val2)).arg(ValToTim(val2+val3));
+      result += QObject::tr("Edge(%1, [%2:%3])").arg(RawSwitch(val1).toString()).arg(ValToTim(val2)).arg(ValToTim(val2+val3));
       break;
     case LS_FAMILY_STICKY:
-      result = QObject::tr("STICKY( %1, %2)").arg(RawSwitch(val1).toString()).arg(RawSwitch(val2).toString());
+      result += QObject::tr("Sticky(%1, %2)").arg(RawSwitch(val1).toString()).arg(RawSwitch(val2).toString());
       break;
     case LS_FAMILY_TIMER:
-      result = QObject::tr("TIMER( %1, %2)").arg(ValToTim(val1)).arg(ValToTim(val2));
+      result += QObject::tr("Timer(%1, %2)").arg(ValToTim(val1)).arg(ValToTim(val2));
       break;
     case LS_FAMILY_VOFS: {
       RawSource source = RawSource(val1, &model);
@@ -603,10 +603,10 @@ QString LogicalSwitchData::toString(const ModelData & model)
   }
 
   if (GetCurrentFirmware()->getCapability(LogicalSwitchesExt)) {
-    if (delay)
-      result += QObject::tr(" Delay %1 sec").arg(delay/10.0);
     if (duration)
-      result += QObject::tr(" Duration %1 sec").arg(duration/10.0);
+      result += QObject::tr(" Duration (%1s)").arg(duration/10.0);
+    if (delay)
+      result += QObject::tr(" Delay (%1s)").arg(delay/10.0);
   }
 
   return result;
diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp
index 9c15efcee..da230afc9 100644
--- a/companion/src/printdialog.cpp
+++ b/companion/src/printdialog.cpp
@@ -613,10 +613,9 @@ void PrintDialog::printSwitches()
     for (int i=0; i<firmware->getCapability(LogicalSwitches); i++) {
       if (g_model->customSw[i].func) {
         str.append("<tr>");
-        str.append("<td width=\"60\" align=\"center\"><b>"+tr("L")+QString("%1</b></td>").arg(i+1));
-        if (i < 9) str += " ";
+        str.append("<td width=\"60\"><b>"+tr("L")+QString("%1</b></td>").arg(i+1));
         QString tstr = g_model->customSw[i].toString(*g_model);
-        str.append(doTC(tstr,"green"));
+        str.append(doTL(tstr,"green"));
         str.append("</tr>");
         sc++;
       }