diff --git a/src/testium/main_win/about_win/about_win.py b/src/testium/main_win/about_win/about_win.py index f3f6bf9..e477615 100644 --- a/src/testium/main_win/about_win/about_win.py +++ b/src/testium/main_win/about_win/about_win.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'about_win.ui' ## -## Created by: Qt User Interface Compiler version 6.11.0 +## Created by: Qt User Interface Compiler version 6.10.2 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -16,39 +16,50 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QImage, QKeySequence, QLinearGradient, QPainter, QPalette, QPixmap, QRadialGradient, QTransform) from PySide6.QtWidgets import (QAbstractButton, QApplication, QDialog, QDialogButtonBox, - QFrame, QLabel, QPlainTextEdit, QSizePolicy, - QWidget) + QLabel, QSizePolicy, QVBoxLayout, QWidget) import about_win_rc class Ui_About(object): def setupUi(self, About): if not About.objectName(): About.setObjectName(u"About") - About.resize(400, 247) - self.buttonBox = QDialogButtonBox(About) - self.buttonBox.setObjectName(u"buttonBox") - self.buttonBox.setGeometry(QRect(30, 200, 341, 32)) - self.buttonBox.setOrientation(Qt.Horizontal) - self.buttonBox.setStandardButtons(QDialogButtonBox.Ok) + About.resize(500, 220) + self.verticalLayout = QVBoxLayout(About) + self.verticalLayout.setSpacing(6) + self.verticalLayout.setObjectName(u"verticalLayout") + self.verticalLayout.setContentsMargins(20, 16, 20, 16) self.label = QLabel(About) self.label.setObjectName(u"label") - self.label.setGeometry(QRect(30, 20, 341, 31)) font = QFont() font.setPointSize(14) self.label.setFont(font) - self.label.setWordWrap(True) + + self.verticalLayout.addWidget(self.label) + self.labelVersion = QLabel(About) self.labelVersion.setObjectName(u"labelVersion") - self.labelVersion.setGeometry(QRect(30, 60, 341, 16)) - self.plainTextEdit = QPlainTextEdit(About) - self.plainTextEdit.setObjectName(u"plainTextEdit") - self.plainTextEdit.setGeometry(QRect(30, 100, 341, 91)) - self.plainTextEdit.setFrameShape(QFrame.NoFrame) - self.plainTextEdit.setFrameShadow(QFrame.Sunken) - self.plainTextEdit.setReadOnly(True) - self.labelCesUnitVersion = QLabel(About) - self.labelCesUnitVersion.setObjectName(u"labelCesUnitVersion") - self.labelCesUnitVersion.setGeometry(QRect(30, 70, 341, 16)) + self.labelVersion.setWordWrap(True) + + self.verticalLayout.addWidget(self.labelVersion) + + self.labelCopyright = QLabel(About) + self.labelCopyright.setObjectName(u"labelCopyright") + + self.verticalLayout.addWidget(self.labelCopyright) + + self.labelLicence = QLabel(About) + self.labelLicence.setObjectName(u"labelLicence") + self.labelLicence.setOpenExternalLinks(True) + + self.verticalLayout.addWidget(self.labelLicence) + + self.buttonBox = QDialogButtonBox(About) + self.buttonBox.setObjectName(u"buttonBox") + self.buttonBox.setOrientation(Qt.Horizontal) + self.buttonBox.setStandardButtons(QDialogButtonBox.Ok) + + self.verticalLayout.addWidget(self.buttonBox) + self.retranslateUi(About) self.buttonBox.accepted.connect(About.accept) @@ -57,10 +68,10 @@ class Ui_About(object): # setupUi def retranslateUi(self, About): - About.setWindowTitle(QCoreApplication.translate("About", u"A propos", None)) + About.setWindowTitle(QCoreApplication.translate("About", u"\u00c0 propos", None)) self.label.setText(QCoreApplication.translate("About", u"Testium", None)) - self.labelVersion.setText(QCoreApplication.translate("About", u"Version", None)) - self.plainTextEdit.setPlainText(QCoreApplication.translate("About", u"This gui was developed with the help of Qt by Fran\u00e7ois Dausseur.", None)) - self.labelCesUnitVersion.setText(QCoreApplication.translate("About", u"Version", None)) + self.labelVersion.setText("") + self.labelCopyright.setText(QCoreApplication.translate("About", u"\u00a9 2025-2026 Fran\u00e7ois Dausseur", None)) + self.labelLicence.setText(QCoreApplication.translate("About", u"Licensed under EUPL-1.2", None)) # retranslateUi diff --git a/src/testium/main_win/about_win/about_win.ui b/src/testium/main_win/about_win/about_win.ui index 5f8a7df..a8c2f1b 100644 --- a/src/testium/main_win/about_win/about_win.ui +++ b/src/testium/main_win/about_win/about_win.ui @@ -1,123 +1,104 @@ - - - About - - - - 0 - 0 - 400 - 247 - - - - A propos - - - - - 30 - 200 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - - - 30 - 20 - 341 - 31 - - - - - 14 - - - - Testium - - - true - - - - - - 30 - 60 - 341 - 16 - - - - Version - - - - - - 30 - 100 - 341 - 91 - - - - QFrame::NoFrame - - - QFrame::Sunken - - - true - - - This gui was developed with the help of Qt by François Dausseur. - - - - - - 30 - 70 - 341 - 16 - - - - Version - - - - - - - - - buttonBox - accepted() - About - accept() - - - 248 - 254 - - - 157 - 274 - - - - - + + + About + + + + 0 + 0 + 500 + 220 + + + + À propos + + + + 20 + + + 16 + + + 20 + + + 16 + + + 6 + + + + + + 14 + + + + Testium + + + + + + + + + + true + + + + + + + © 2025-2026 François Dausseur + + + + + + + Licensed under <a href="https://eupl.eu/1.2/en/">EUPL-1.2</a> + + + true + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + + + + + + + + + buttonBox + accepted() + About + accept() + + + 248 + 254 + + + 157 + 274 + + + + + diff --git a/src/testium/main_win/testium_win.py b/src/testium/main_win/testium_win.py index 8672e29..f51a2f8 100755 --- a/src/testium/main_win/testium_win.py +++ b/src/testium/main_win/testium_win.py @@ -40,11 +40,11 @@ from main_win.test_run.test_run import ThreadTestStatus import interpreter.utils.settings as prefs from lib.stdout_redirect import stdio_redir import libs.testium as tm -from interpreter.utils.version import get_testium_version from interpreter.utils.test_init import ( env_init, locate_report_file, ) +from interpreter.utils.version import get_testium_version from lib.tum_except import ETUMFileError, ETUMRuntimeError from main_win.test_controller_service import TestControllerService from main_win.test_runner import TestRunner, TestState @@ -206,8 +206,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.d_about_win = QDialog() self.about_win = Ui_About() self.about_win.setupUi(self.d_about_win) - self.about_win.labelVersion.setText("testium - " + get_testium_version()) - self.about_win.labelCesUnitVersion.setText("") + self.about_win.labelVersion.setText(get_testium_version()) self.d_about_win.setModal(True) self.d_f1_win = DialogF1(self)