GerhardHoffmann/ATBUpdateTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set version to 1.5.8

Browse Source
This commit is contained in:
Gerhard Hoffmann
2025-05-16 08:42:50 +02:00
parent c49ff5045b 1ea1cdc3e6
commit 9c6dab977c
4 changed files with 110 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro
View File

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

54
UpdatePTUDevCtrl/mainwindow.cpp
View File

@@ -12,6 +12,9 @@
#include <QScrollBar> #include <QScrollBar>
#include <QEvent> #include <QEvent>
#include <QScreen>
MainWindow::MainWindow(Worker *worker, QWidget *parent) MainWindow::MainWindow(Worker *worker, QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
@@ -30,6 +33,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
this->statusBar()->setFont(f); this->statusBar()->setFont(f);
ui->setupUi(this); ui->setupUi(this);
checkOrientation();
ui->updateProgress->setRange(0, 100); ui->updateProgress->setRange(0, 100);
ui->updateProgress->reset(); ui->updateProgress->reset();
@@ -98,6 +102,56 @@ MainWindow::~MainWindow() {
delete ui; 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) { void MainWindow::customEvent(QEvent *event) {
if (event->type() == ProgressEvent::type()) { if (event->type() == ProgressEvent::type()) {
ProgressEvent *pevent = (ProgressEvent *)event; ProgressEvent *pevent = (ProgressEvent *)event;

6
UpdatePTUDevCtrl/mainwindow.h
View File

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

96
UpdatePTUDevCtrl/mainwindow.ui
View File

@@ -10,6 +10,12 @@
<height>480</height> <height>480</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>480</width>
<height>480</height>
</size>
</property>
<property name="font"> <property name="font">
<font> <font>
<family>Source Code Pro</family> <family>Source Code Pro</family>
@@ -19,55 +25,47 @@
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <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>
</widget> </widget>
<resources/> <resources/>