From be624c6856dd5908542e81a5cff50a5fd4c8cfe4 Mon Sep 17 00:00:00 2001 From: Mathijs van Gorcum Date: Mon, 27 Mar 2023 21:49:10 +0200 Subject: [PATCH] preparing for v1.0.0 --- drop_analysis/About.py | 4 ++-- drop_analysis/About.ui | 2 +- drop_analysis/gui.py | 2 ++ help.py | 10 ---------- 4 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 help.py diff --git a/drop_analysis/About.py b/drop_analysis/About.py index ef79620..f94e613 100644 --- a/drop_analysis/About.py +++ b/drop_analysis/About.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'About.ui' # -# Created by: PyQt5 UI code generator 5.15.7 +# Created by: PyQt5 UI code generator 5.15.6 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -24,7 +24,7 @@ def setupUi(self, About): self.verticalLayout.addWidget(self.label_3) self.versionLabel = QtWidgets.QLabel(About) self.versionLabel.setText("") - self.versionLabel.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.versionLabel.setAlignment(QtCore.Qt.AlignCenter) self.versionLabel.setObjectName("versionLabel") self.verticalLayout.addWidget(self.versionLabel) self.label_2 = QtWidgets.QLabel(About) diff --git a/drop_analysis/About.ui b/drop_analysis/About.ui index 266fd0c..86e3b2d 100644 --- a/drop_analysis/About.ui +++ b/drop_analysis/About.ui @@ -36,7 +36,7 @@ - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignCenter diff --git a/drop_analysis/gui.py b/drop_analysis/gui.py index 4f3a180..f372493 100644 --- a/drop_analysis/gui.py +++ b/drop_analysis/gui.py @@ -19,6 +19,7 @@ from drop_analysis.edge_analysis import analysis from drop_analysis.Help import Ui_Help from drop_analysis.About import Ui_About +from drop_analysis import version pg.setConfigOptions(imageAxisOrder='row-major') @@ -122,6 +123,7 @@ def __init__(self, *args, **kwargs): self.aboutwidget=QtWidgets.QDialog() self.aboutUI=Ui_About() self.aboutUI.setupUi(self.aboutwidget) + self.aboutUI.versionLabel.setText(f"Version: {version.__version__}") self.actionHelp.triggered.connect(self.helpwidget.show) self.actionAbout.triggered.connect(self.aboutwidget.show) diff --git a/help.py b/help.py deleted file mode 100644 index 166f9d7..0000000 --- a/help.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'Help.ui' -# -# Created by: PyQt5 UI code generator 5.15.7 -# -# WARNING: Any manual changes made to this file will be lost when pyuic5 is -# run again. Do not edit this file unless you know what you are doing. - -