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

@@ -12,6 +12,9 @@
 #include <QScrollBar>
 #include <QEvent>
 
+#include <QScreen>
+
+
 
 MainWindow::MainWindow(Worker *worker, QWidget *parent)
     : QMainWindow(parent)
@@ -30,6 +33,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     this->statusBar()->setFont(f);
 
     ui->setupUi(this);
+    checkOrientation();
 
     ui->updateProgress->setRange(0, 100);
     ui->updateProgress->reset();
@@ -98,6 +102,56 @@ MainWindow::~MainWindow() {
     delete ui;
 }
 
+
+// ----------------------------- Ui::LAYOUT setting -------------------------------------
+
+void MainWindow::checkOrientation()
+{
+    QScreen *screen = QGuiApplication::primaryScreen();
+    Qt::ScreenOrientation orientation = screen->orientation();
+
+    switch (orientation) {
+    case Qt::PrimaryOrientation:
+        this->setLandscapeLayout();
+        break;
+    case Qt::LandscapeOrientation:
+        this->setLandscapeLayout();
+        break;
+    case Qt::PortraitOrientation:
+        this->setPortraitLayout();
+        break;
+    case Qt::InvertedLandscapeOrientation:
+        this->setLandscapeLayout();
+        break;
+    case Qt::InvertedPortraitOrientation:
+        this->setPortraitLayout();
+        break;
+    }
+
+    this->currentOrientation = orientation;
+}
+
+
+
+void MainWindow::setPortraitLayout()
+{
+    // Adjust layout for portrait mode (480x800)
+    this->setFixedSize(480, 800);
+    ui->centralwidget->setFixedSize(480, 800);
+}
+
+void MainWindow::setLandscapeLayout()
+{
+    // Adjust layout for landscape mode (800x480)
+    this->setFixedSize(800, 480);
+    ui->centralwidget->setFixedSize(800, 480);
+}
+
+
+
+
+
+
 void MainWindow::customEvent(QEvent *event) {
     if (event->type() == ProgressEvent::type()) {
         ProgressEvent *pevent = (ProgressEvent *)event;

UpdatePTUDevCtrl/mainwindow.h

@@ -66,6 +66,12 @@ private:
     void onShowMessage(QString, QString);
 
     Ui::MainWindow *ui;
+    void checkOrientation();
+    void setPortraitLayout();
+    void setLandscapeLayout();
+    Qt::ScreenOrientation currentOrientation;
+
+
     Worker *m_worker;
     int const m_width;
     QTimer *m_startTimer;

UpdatePTUDevCtrl/mainwindow.ui

@@ -10,6 +10,12 @@
     <height>480</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>480</width>
+    <height>480</height>
+   </size>
+  </property>
   <property name="font">
    <font>
     <family>Source Code Pro</family>
@@ -19,55 +25,47 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QWidget" name="layoutWidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="geometry">
+    <item>
-     <rect>
+     <layout class="QGridLayout" name="gridLayout">
-      <x>10</x>
+      <item row="3" column="2">
-      <y>10</y>
+       <widget class="QPushButton" name="exit">
-      <width>781</width>
+        <property name="text">
-      <height>441</height>
+         <string>Exit</string>
-     </rect>
+        </property>
-    </property>
+       </widget>
-    <layout class="QGridLayout" name="gridLayout">
+      </item>
-     <item row="3" column="2">
+      <item row="3" column="1">
-      <widget class="QPushButton" name="exit">
+       <widget class="QProgressBar" name="updateProgress">
-       <property name="text">
+        <property name="value">
-        <string>Exit</string>
+         <number>1</number>
-       </property>
+        </property>
-      </widget>
+       </widget>
-     </item>
+      </item>
-     <item row="3" column="1">
+      <item row="0" column="0" rowspan="3" colspan="3">
-      <widget class="QProgressBar" name="updateProgress">
+       <widget class="QTextEdit" name="updateStatus">
-       <property name="value">
+        <property name="enabled">
-        <number>1</number>
+         <bool>true</bool>
-       </property>
+        </property>
-      </widget>
+        <property name="font">
-     </item>
+         <font>
-     <item row="0" column="0" rowspan="3" colspan="3">
+          <family>Misc Fixed</family>
-      <widget class="QTextEdit" name="updateStatus">
+          <pointsize>11</pointsize>
-       <property name="enabled">
+          <weight>75</weight>
-        <bool>true</bool>
+          <bold>true</bold>
-       </property>
+         </font>
-       <property name="font">
+        </property>
-        <font>
+        <property name="verticalScrollBarPolicy">
-         <family>Misc Fixed</family>
+         <enum>Qt::ScrollBarAsNeeded</enum>
-         <pointsize>11</pointsize>
+        </property>
-         <bold>true</bold>
+        <property name="horizontalScrollBarPolicy">
-        </font>
+         <enum>Qt::ScrollBarAsNeeded</enum>
-       </property>
+        </property>
-       <property name="verticalScrollBarPolicy">
+       </widget>
-        <enum>Qt::ScrollBarAsNeeded</enum>
+      </item>
-       </property>
+     </layout>
-       <property name="horizontalScrollBarPolicy">
+    </item>
-        <enum>Qt::ScrollBarAsNeeded</enum>
+   </layout>
-       </property>
-       <property name="sizeAdjustPolicy">
-        <enum>QAbstractScrollArea::AdjustToContents</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
   </widget>
  </widget>
  <resources/>