set version to 1.5.8

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -147,7 +147,9 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.5.5   : Call into binary ptuPackageVersion to get installed package
 #           versions.
 # 1.5.6   : Show additional update progress info in status bar.
-VERSION="1.5.6"
+# 1.5.7   : Add support for dynamic portrait / landscape.
+# 1.5.8   : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
+VERSION="1.5.8"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 #   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu

UpdatePTUDevCtrl/ismas/ismas_client.cpp

@@ -21,6 +21,7 @@
 #include <QThread>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QCoreApplication>
 
 #if 0
 ########################
@@ -380,7 +381,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
         "{"
             "\"REASON\":\"SW_UP\","
             "\"TIMESTAMP\":\"%s\","
-            "\"EVENT_ID\":\"0\","
+            "\"EVENT_ID\":\"%d\","
             "\"EVENT\":\"%s\","
             "\"EVENTSTATE\":1,"
             "\"PARAMETER\": {"
@@ -390,7 +391,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
                 "\"STEP_RESULT\" : \"%s\","
                 "\"VERSION\" : \"%s\""
             "}"
-        "}", ts.toStdString().c_str(), event, percent, resultCode,
+        "}", ts.toStdString().c_str(), static_cast<int>(QCoreApplication::applicationPid()), event, percent, resultCode,
              step, step_result, version);
     return buf;
 }

UpdatePTUDevCtrl/mainwindow.cpp

@@ -128,7 +128,6 @@ void MainWindow::checkOrientation()
         break;
     }
 
-    this->setPortraitLayout10Inch();
     this->currentOrientation = orientation;
 }
 
@@ -141,24 +140,11 @@ void MainWindow::setPortraitLayout()
     ui->centralwidget->setFixedSize(480, 800);
 }
 
-void MainWindow::setPortraitLayout10Inch()
-{
-    // Adjust layout for portrait mode (480x800)
-    this->setFixedSize(800, 1280);
-    ui->centralwidget->setFixedSize(800, 1280);
-}
-
-
 void MainWindow::setLandscapeLayout()
 {
     // Adjust layout for landscape mode (800x480)
-    /*
     this->setFixedSize(800, 480);
     ui->centralwidget->setFixedSize(800, 480);
-    */
-    this->setFixedSize(480, 800);
-    ui->centralwidget->setFixedSize(480, 800);
-
 }
 
 

UpdatePTUDevCtrl/mainwindow.h

@@ -68,7 +68,6 @@ private:
     Ui::MainWindow *ui;
     void checkOrientation();
     void setPortraitLayout();
-    void setPortraitLayout10Inch();
     void setLandscapeLayout();
     Qt::ScreenOrientation currentOrientation;
 

UpdatePTUDevCtrl/mainwindow.ui

@@ -7,19 +7,18 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>1280</height>
+    <height>480</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>800</width>
+    <width>480</width>
-    <height>1280</height>
+    <height>480</height>
    </size>
   </property>
   <property name="font">
    <font>
-    <family>Liberation Sans</family>
+    <family>Source Code Pro</family>
-    <pointsize>18</pointsize>
    </font>
   </property>
   <property name="windowTitle">
@@ -27,87 +26,31 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
-     <number>16</number>
-    </property>
-    <property name="leftMargin">
-     <number>20</number>
-    </property>
-    <property name="topMargin">
-     <number>20</number>
-    </property>
-    <property name="rightMargin">
-     <number>20</number>
-    </property>
-    <property name="bottomMargin">
-     <number>20</number>
-    </property>
     <item>
-     <layout class="QGridLayout" name="gridLayout" rowstretch="1,0" columnstretch="1,1,0">
+     <layout class="QGridLayout" name="gridLayout">
-      <property name="horizontalSpacing">
+      <item row="3" column="2">
-       <number>16</number>
-      </property>
-      <property name="verticalSpacing">
-       <number>16</number>
-      </property>
-      <item row="1" column="2">
        <widget class="QPushButton" name="exit">
-        <property name="minimumSize">
-         <size>
-          <width>180</width>
-          <height>80</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>260</width>
-          <height>80</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>22</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
         <property name="text">
          <string>Exit</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2">
+      <item row="3" column="1">
        <widget class="QProgressBar" name="updateProgress">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>80</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>18</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
         <property name="value">
          <number>1</number>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="3">
+      <item row="0" column="0" rowspan="3" colspan="3">
        <widget class="QTextEdit" name="updateStatus">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="font">
          <font>
-          <family>Source Code Pro</family>
+          <family>Misc Fixed</family>
-          <pointsize>18</pointsize>
+          <pointsize>11</pointsize>
           <weight>75</weight>
           <bold>true</bold>
          </font>