From 64bd228e8e2f7120bb73b5ed58c4232381fb874d Mon Sep 17 00:00:00 2001 From: CodeByMrFinchum Date: Sat, 1 Feb 2025 18:40:26 +0100 Subject: [PATCH] minor ui changed for dev mode --- src/OptimaLab35/ui/updater_window.py | 83 ++++++++++----------- src/OptimaLab35/ui/updater_window.ui | 106 ++++++++++++--------------- 2 files changed, 86 insertions(+), 103 deletions(-) diff --git a/src/OptimaLab35/ui/updater_window.py b/src/OptimaLab35/ui/updater_window.py index cd61ba0..ce1de3c 100644 --- a/src/OptimaLab35/ui/updater_window.py +++ b/src/OptimaLab35/ui/updater_window.py @@ -23,7 +23,7 @@ class Ui_Updater_Window(object): if not Updater_Window.objectName(): Updater_Window.setObjectName(u"Updater_Window") Updater_Window.setEnabled(True) - Updater_Window.resize(372, 251) + Updater_Window.resize(372, 196) self.centralwidget = QWidget(Updater_Window) self.centralwidget.setObjectName(u"centralwidget") self.gridLayout_2 = QGridLayout(self.centralwidget) @@ -43,6 +43,34 @@ class Ui_Updater_Window(object): self.widget_2.setObjectName(u"widget_2") self.gridLayout = QGridLayout(self.widget_2) self.gridLayout.setObjectName(u"gridLayout") + self.label = QLabel(self.widget_2) + self.label.setObjectName(u"label") + + self.gridLayout.addWidget(self.label, 1, 0, 1, 1) + + self.label_optima35_localversion = QLabel(self.widget_2) + self.label_optima35_localversion.setObjectName(u"label_optima35_localversion") + self.label_optima35_localversion.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_optima35_localversion, 2, 1, 1, 1) + + self.label_9 = QLabel(self.widget_2) + self.label_9.setObjectName(u"label_9") + + self.gridLayout.addWidget(self.label_9, 0, 0, 1, 1) + + self.label_optima35_latestversion = QLabel(self.widget_2) + self.label_optima35_latestversion.setObjectName(u"label_optima35_latestversion") + self.label_optima35_latestversion.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_optima35_latestversion, 2, 2, 1, 1) + + self.label_optimalab35_localversion = QLabel(self.widget_2) + self.label_optimalab35_localversion.setObjectName(u"label_optimalab35_localversion") + self.label_optimalab35_localversion.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + + self.gridLayout.addWidget(self.label_optimalab35_localversion, 1, 1, 1, 1) + self.label_6 = QLabel(self.widget_2) self.label_6.setObjectName(u"label_6") self.label_6.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) @@ -55,50 +83,16 @@ class Ui_Updater_Window(object): self.gridLayout.addWidget(self.label_optimalab35_latestversion, 1, 2, 1, 1) - self.label_2 = QLabel(self.widget_2) - self.label_2.setObjectName(u"label_2") - - self.gridLayout.addWidget(self.label_2, 3, 0, 1, 1) - - self.label_optima35_latestversion = QLabel(self.widget_2) - self.label_optima35_latestversion.setObjectName(u"label_optima35_latestversion") - self.label_optima35_latestversion.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.label_optima35_latestversion, 3, 2, 1, 1) - self.label_latest_version = QLabel(self.widget_2) self.label_latest_version.setObjectName(u"label_latest_version") self.label_latest_version.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) self.gridLayout.addWidget(self.label_latest_version, 0, 2, 1, 1) - self.label = QLabel(self.widget_2) - self.label.setObjectName(u"label") + self.label_2 = QLabel(self.widget_2) + self.label_2.setObjectName(u"label_2") - self.gridLayout.addWidget(self.label, 1, 0, 1, 1) - - self.label_9 = QLabel(self.widget_2) - self.label_9.setObjectName(u"label_9") - - self.gridLayout.addWidget(self.label_9, 0, 0, 1, 1) - - self.label_optimalab35_localversion = QLabel(self.widget_2) - self.label_optimalab35_localversion.setObjectName(u"label_optimalab35_localversion") - self.label_optimalab35_localversion.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.label_optimalab35_localversion, 1, 1, 1, 1) - - self.label_optima35_localversion = QLabel(self.widget_2) - self.label_optima35_localversion.setObjectName(u"label_optima35_localversion") - self.label_optima35_localversion.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) - - self.gridLayout.addWidget(self.label_optima35_localversion, 3, 1, 1, 1) - - self.label_dev = QLabel(self.widget_2) - self.label_dev.setObjectName(u"label_dev") - self.label_dev.setAlignment(Qt.AlignCenter) - - self.gridLayout.addWidget(self.label_dev, 2, 0, 1, 3) + self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) self.gridLayout_2.addWidget(self.widget_2, 1, 0, 1, 2) @@ -131,16 +125,15 @@ class Ui_Updater_Window(object): Updater_Window.setWindowTitle(QCoreApplication.translate("Updater_Window", u"Updater", None)) self.label_last_check.setText(QCoreApplication.translate("Updater_Window", u"Last update check:", None)) self.label_last_check_2.setText(QCoreApplication.translate("Updater_Window", u"TextLabel", None)) + self.label.setText(QCoreApplication.translate("Updater_Window", u"OptimaLab35", None)) + self.label_optima35_localversion.setText(QCoreApplication.translate("Updater_Window", u"0.0.0", None)) + self.label_9.setText(QCoreApplication.translate("Updater_Window", u"Package", None)) + self.label_optima35_latestversion.setText(QCoreApplication.translate("Updater_Window", u"unknown", None)) + self.label_optimalab35_localversion.setText(QCoreApplication.translate("Updater_Window", u"0.0.0", None)) self.label_6.setText(QCoreApplication.translate("Updater_Window", u"Local Version", None)) self.label_optimalab35_latestversion.setText(QCoreApplication.translate("Updater_Window", u"unknown", None)) - self.label_2.setText(QCoreApplication.translate("Updater_Window", u"optima35", None)) - self.label_optima35_latestversion.setText(QCoreApplication.translate("Updater_Window", u"unknown", None)) self.label_latest_version.setText(QCoreApplication.translate("Updater_Window", u"Latest version", None)) - self.label.setText(QCoreApplication.translate("Updater_Window", u"OptimaLab35", None)) - self.label_9.setText(QCoreApplication.translate("Updater_Window", u"Package", None)) - self.label_optimalab35_localversion.setText(QCoreApplication.translate("Updater_Window", u"0.0.0", None)) - self.label_optima35_localversion.setText(QCoreApplication.translate("Updater_Window", u"0.0.0", None)) - self.label_dev.setText(QCoreApplication.translate("Updater_Window", u"Detected dev env. updater disabled", None)) + self.label_2.setText(QCoreApplication.translate("Updater_Window", u"optima35", None)) self.check_for_update_Button.setText(QCoreApplication.translate("Updater_Window", u"Check for update", None)) self.update_and_restart_Button.setText(QCoreApplication.translate("Updater_Window", u"Update and restart", None)) # retranslateUi diff --git a/src/OptimaLab35/ui/updater_window.ui b/src/OptimaLab35/ui/updater_window.ui index b1fb75e..9a8d2de 100644 --- a/src/OptimaLab35/ui/updater_window.ui +++ b/src/OptimaLab35/ui/updater_window.ui @@ -10,7 +10,7 @@ 0 0 372 - 251 + 196 @@ -38,6 +38,50 @@ + + + + OptimaLab35 + + + + + + + 0.0.0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Package + + + + + + + unknown + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + 0.0.0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -58,23 +102,6 @@ - - - - optima35 - - - - - - - unknown - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -85,47 +112,10 @@ - - + + - OptimaLab35 - - - - - - - Package - - - - - - - 0.0.0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 0.0.0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Detected dev env. updater disabled - - - Qt::AlignCenter + optima35