UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -147,8 +147,7 @@ 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.
-# 1.5.7   : Add support for dynamic portrait / landscape.
+VERSION="1.5.6"
-VERSION="1.5.7"
 # 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/mainwindow.cpp

@@ -12,9 +12,6 @@
 #include <QScrollBar>
 #include <QEvent>
 
-#include <QScreen>
-
-
 
 MainWindow::MainWindow(Worker *worker, QWidget *parent)
     : QMainWindow(parent)
@@ -33,7 +30,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     this->statusBar()->setFont(f);
 
     ui->setupUi(this);
-    checkOrientation();
 
     ui->updateProgress->setRange(0, 100);
     ui->updateProgress->reset();
@@ -102,56 +98,6 @@ 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,12 +66,6 @@ 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,12 +10,6 @@
     <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>
@@ -25,47 +19,55 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout">
+   <widget class="QWidget" name="layoutWidget">
-    <item>
+    <property name="geometry">
-     <layout class="QGridLayout" name="gridLayout">
+     <rect>
-      <item row="3" column="2">
+      <x>10</x>
-       <widget class="QPushButton" name="exit">
+      <y>10</y>
-        <property name="text">
+      <width>781</width>
-         <string>Exit</string>
+      <height>441</height>
-        </property>
+     </rect>
-       </widget>
+    </property>
-      </item>
+    <layout class="QGridLayout" name="gridLayout">
-      <item row="3" column="1">
+     <item row="3" column="2">
-       <widget class="QProgressBar" name="updateProgress">
+      <widget class="QPushButton" name="exit">
-        <property name="value">
+       <property name="text">
-         <number>1</number>
+        <string>Exit</string>
-        </property>
+       </property>
-       </widget>
+      </widget>
-      </item>
+     </item>
-      <item row="0" column="0" rowspan="3" colspan="3">
+     <item row="3" column="1">
-       <widget class="QTextEdit" name="updateStatus">
+      <widget class="QProgressBar" name="updateProgress">
-        <property name="enabled">
+       <property name="value">
-         <bool>true</bool>
+        <number>1</number>
-        </property>
+       </property>
-        <property name="font">
+      </widget>
-         <font>
+     </item>
-          <family>Misc Fixed</family>
+     <item row="0" column="0" rowspan="3" colspan="3">
-          <pointsize>11</pointsize>
+      <widget class="QTextEdit" name="updateStatus">
-          <weight>75</weight>
+       <property name="enabled">
-          <bold>true</bold>
+        <bool>true</bool>
-         </font>
+       </property>
-        </property>
+       <property name="font">
-        <property name="verticalScrollBarPolicy">
+        <font>
-         <enum>Qt::ScrollBarAsNeeded</enum>
+         <family>Misc Fixed</family>
-        </property>
+         <pointsize>11</pointsize>
-        <property name="horizontalScrollBarPolicy">
+         <bold>true</bold>
-         <enum>Qt::ScrollBarAsNeeded</enum>
+        </font>
-        </property>
+       </property>
-       </widget>
+       <property name="verticalScrollBarPolicy">
-      </item>
+        <enum>Qt::ScrollBarAsNeeded</enum>
-     </layout>
+       </property>
-    </item>
+       <property name="horizontalScrollBarPolicy">
-   </layout>
+        <enum>Qt::ScrollBarAsNeeded</enum>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QAbstractScrollArea::AdjustToContents</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
   </widget>
  </widget>
  <resources/>