diff --git a/rare/components/tabs/settings/about.py b/rare/components/tabs/settings/about.py index c00775f1..d9f52999 100644 --- a/rare/components/tabs/settings/about.py +++ b/rare/components/tabs/settings/about.py @@ -21,7 +21,7 @@ class About(QWidget, Ui_About): self.version.setText(__version__) - self.update_lbl.setVisible(False) + self.lbl_update.setVisible(False) self.update.setVisible(False) self.open_browser.setVisible(False) @@ -35,6 +35,6 @@ class About(QWidget, Ui_About): if self.update_available: print(f"Update available: {__version__} -> {latest_tag}") - self.update_lbl.setVisible(True) + self.lbl_update.setVisible(True) self.update.setVisible(True) self.open_browser.setVisible(True) diff --git a/rare/components/tabs/settings/about_ui.py b/rare/components/tabs/settings/about_ui.py index 7c4d28f5..3da76f71 100644 --- a/rare/components/tabs/settings/about_ui.py +++ b/rare/components/tabs/settings/about_ui.py @@ -17,120 +17,75 @@ class Ui_About(object): About.resize(499, 396) self.gridLayout = QtWidgets.QGridLayout(About) self.gridLayout.setObjectName("gridLayout") - self.title = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.title.sizePolicy().hasHeightForWidth()) - self.title.setSizePolicy(sizePolicy) - self.title.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.title.setObjectName("title") - self.gridLayout.addWidget(self.title, 0, 0, 1, 3) - self.version_lbl = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.version_lbl.sizePolicy().hasHeightForWidth()) - self.version_lbl.setSizePolicy(sizePolicy) - self.version_lbl.setObjectName("version_lbl") - self.gridLayout.addWidget(self.version_lbl, 1, 0, 1, 1) - self.license = QtWidgets.QLabel(About) - self.license.setObjectName("license") - self.gridLayout.addWidget(self.license, 7, 1, 1, 3) - self.license_lbl = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.license_lbl.sizePolicy().hasHeightForWidth()) - self.license_lbl.setSizePolicy(sizePolicy) - self.license_lbl.setObjectName("license_lbl") - self.gridLayout.addWidget(self.license_lbl, 7, 0, 1, 1) - spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.gridLayout.addItem(spacerItem, 14, 0, 1, 4) - self.dev_lbl = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.dev_lbl.sizePolicy().hasHeightForWidth()) - self.dev_lbl.setSizePolicy(sizePolicy) - self.dev_lbl.setObjectName("dev_lbl") - self.gridLayout.addWidget(self.dev_lbl, 5, 0, 1, 1) - self.lgd_dev_lbl = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lgd_dev_lbl.sizePolicy().hasHeightForWidth()) - self.lgd_dev_lbl.setSizePolicy(sizePolicy) - self.lgd_dev_lbl.setObjectName("lgd_dev_lbl") - self.gridLayout.addWidget(self.lgd_dev_lbl, 6, 0, 1, 1) - self.update_lbl = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.update_lbl.sizePolicy().hasHeightForWidth()) - self.update_lbl.setSizePolicy(sizePolicy) - self.update_lbl.setObjectName("update_lbl") - self.gridLayout.addWidget(self.update_lbl, 2, 0, 1, 1) - self.lgd_dev = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lgd_dev.sizePolicy().hasHeightForWidth()) - self.lgd_dev.setSizePolicy(sizePolicy) - self.lgd_dev.setOpenExternalLinks(True) - self.lgd_dev.setObjectName("lgd_dev") - self.gridLayout.addWidget(self.lgd_dev, 6, 1, 1, 3) - self.dev = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.dev.sizePolicy().hasHeightForWidth()) - self.dev.setSizePolicy(sizePolicy) - self.dev.setOpenExternalLinks(True) - self.dev.setObjectName("dev") - self.gridLayout.addWidget(self.dev, 5, 1, 1, 3) - self.update = QtWidgets.QLabel(About) - self.update.setObjectName("update") - self.gridLayout.addWidget(self.update, 2, 1, 1, 3) - self.version = QtWidgets.QLabel(About) - self.version.setObjectName("version") - self.gridLayout.addWidget(self.version, 1, 1, 1, 3) self.open_browser = QtWidgets.QPushButton(About) self.open_browser.setObjectName("open_browser") - self.gridLayout.addWidget(self.open_browser, 4, 0, 1, 4) + self.gridLayout.addWidget(self.open_browser, 4, 1, 1, 1) + self.lbl_version = QtWidgets.QLabel(About) + self.lbl_version.setObjectName("lbl_version") + self.gridLayout.addWidget(self.lbl_version, 2, 0, 1, 1, QtCore.Qt.AlignRight) + self.lbl_license = QtWidgets.QLabel(About) + self.lbl_license.setObjectName("lbl_license") + self.gridLayout.addWidget(self.lbl_license, 7, 0, 1, 1, QtCore.Qt.AlignRight) + self.lbl_lgd_dev = QtWidgets.QLabel(About) + self.lbl_lgd_dev.setObjectName("lbl_lgd_dev") + self.gridLayout.addWidget(self.lbl_lgd_dev, 6, 0, 1, 1) + self.dev = QtWidgets.QLabel(About) + self.dev.setOpenExternalLinks(True) + self.dev.setObjectName("dev") + self.gridLayout.addWidget(self.dev, 5, 1, 1, 1) + self.lbl_update = QtWidgets.QLabel(About) + self.lbl_update.setObjectName("lbl_update") + self.gridLayout.addWidget(self.lbl_update, 3, 0, 1, 1, QtCore.Qt.AlignRight) + self.version = QtWidgets.QLabel(About) + self.version.setObjectName("version") + self.gridLayout.addWidget(self.version, 2, 1, 1, 1) + self.lbl_dev = QtWidgets.QLabel(About) + self.lbl_dev.setObjectName("lbl_dev") + self.gridLayout.addWidget(self.lbl_dev, 5, 0, 1, 1, QtCore.Qt.AlignRight) + self.license = QtWidgets.QLabel(About) + self.license.setObjectName("license") + self.gridLayout.addWidget(self.license, 7, 1, 1, 1) + self.update = QtWidgets.QLabel(About) + self.update.setObjectName("update") + self.gridLayout.addWidget(self.update, 3, 1, 1, 1) + self.lgd_dev = QtWidgets.QLabel(About) + self.lgd_dev.setOpenExternalLinks(True) + self.lgd_dev.setObjectName("lgd_dev") + self.gridLayout.addWidget(self.lgd_dev, 6, 1, 1, 1) self.info_text = QtWidgets.QLabel(About) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.info_text.sizePolicy().hasHeightForWidth()) - self.info_text.setSizePolicy(sizePolicy) - self.info_text.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.info_text.setWordWrap(True) self.info_text.setOpenExternalLinks(True) self.info_text.setObjectName("info_text") - self.gridLayout.addWidget(self.info_text, 8, 0, 1, 4) + self.gridLayout.addWidget(self.info_text, 14, 0, 1, 3) + spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.gridLayout.addItem(spacerItem, 15, 0, 1, 3) + self.title = QtWidgets.QLabel(About) + self.title.setObjectName("title") + self.gridLayout.addWidget(self.title, 1, 0, 1, 3) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.gridLayout.addItem(spacerItem1, 2, 2, 6, 1) self.retranslateUi(About) QtCore.QMetaObject.connectSlotsByName(About) def retranslateUi(self, About): _translate = QtCore.QCoreApplication.translate - About.setWindowTitle(_translate("About", "Form")) - self.title.setText(_translate("About", "

About

")) - self.version_lbl.setText(_translate("About", "Version: ")) - self.license.setText(_translate("About", "GNU General Public License v3.0")) - self.license_lbl.setText(_translate("About", "License:")) - self.dev_lbl.setText(_translate("About", "Rare Developer:")) - self.lgd_dev_lbl.setText(_translate("About", "Legendary Developer:")) - self.update_lbl.setText(_translate("About", "Update available: ")) - self.lgd_dev.setToolTip(_translate("About", "Github")) - self.lgd_dev.setText(_translate("About", "derrod")) + About.setWindowTitle(_translate("About", "About")) + self.open_browser.setText(_translate("About", "Download latest release")) + self.lbl_version.setText(_translate("About", "Version:")) + self.lbl_license.setText(_translate("About", "License:")) + self.lbl_lgd_dev.setText(_translate("About", "Legendary Developer:")) self.dev.setToolTip(_translate("About", "Github")) self.dev.setText(_translate("About", "Dummerle")) - self.update.setText(_translate("About", "update")) + self.lbl_update.setText(_translate("About", "Update available:")) self.version.setText(_translate("About", "version")) - self.open_browser.setText(_translate("About", "Download latest release")) + self.lbl_dev.setText(_translate("About", "Rare Developer:")) + self.license.setText(_translate("About", "GNU General Public License v3.0")) + self.update.setText(_translate("About", "update")) + self.lgd_dev.setToolTip(_translate("About", "Github")) + self.lgd_dev.setText(_translate("About", "derrod")) self.info_text.setText(_translate("About", "This is a beta version, so you can get bugs. If you get a bug, please report it by creating an Issue on Github. You can also contact me on Discord (Dummerle#7419). Or you can join the Discord server")) + self.title.setText(_translate("About", "

About

")) if __name__ == "__main__":