From f55cb0570369304121cdbe3a47f872f29e76337e Mon Sep 17 00:00:00 2001 From: yeah-its-gloria <32610623+yeah-its-gloria@users.noreply.github.com> Date: Tue, 22 Oct 2024 09:46:58 +0200 Subject: [PATCH] Apply UI fixes --- qt/py/ui_MainMenu.py | 123 ++++++++++++++++++++++++++----------------- qt/ui/MainMenu.ui | 113 +++++++++++++++++++++++++++++++++------ 2 files changed, 172 insertions(+), 64 deletions(-) mode change 100644 => 100755 qt/ui/MainMenu.ui diff --git a/qt/py/ui_MainMenu.py b/qt/py/ui_MainMenu.py index 58e8640..9454195 100644 --- a/qt/py/ui_MainMenu.py +++ b/qt/py/ui_MainMenu.py @@ -25,16 +25,14 @@ class Ui_MainWindow(object): def setupUi(self, MainWindow): if not MainWindow.objectName(): MainWindow.setObjectName(u"MainWindow") - MainWindow.resize(1077, 784) - sizePolicy = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth()) - MainWindow.setSizePolicy(sizePolicy) + MainWindow.resize(1010, 625) + MainWindow.setMinimumSize(QSize(1010, 625)) + MainWindow.setMaximumSize(QSize(1010, 625)) self.centralwidget = QWidget(MainWindow) self.centralwidget.setObjectName(u"centralwidget") self.horizontalLayout_3 = QHBoxLayout(self.centralwidget) self.horizontalLayout_3.setObjectName(u"horizontalLayout_3") + self.horizontalLayout_3.setSizeConstraint(QLayout.SizeConstraint.SetDefaultConstraint) self.vertical_layout_trees = QVBoxLayout() self.vertical_layout_trees.setObjectName(u"vertical_layout_trees") self.label_2 = QLabel(self.centralwidget) @@ -47,11 +45,11 @@ class Ui_MainWindow(object): self.platform_tabs = QTabWidget(self.centralwidget) self.platform_tabs.setObjectName(u"platform_tabs") - sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Expanding) - sizePolicy1.setHorizontalStretch(0) - sizePolicy1.setVerticalStretch(0) - sizePolicy1.setHeightForWidth(self.platform_tabs.sizePolicy().hasHeightForWidth()) - self.platform_tabs.setSizePolicy(sizePolicy1) + sizePolicy = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.platform_tabs.sizePolicy().hasHeightForWidth()) + self.platform_tabs.setSizePolicy(sizePolicy) self.platform_tabs.setMinimumSize(QSize(410, 0)) self.platform_tabs.setMaximumSize(QSize(410, 16777215)) self.wii_tab = QWidget() @@ -152,21 +150,21 @@ class Ui_MainWindow(object): self.horizontalLayout.setObjectName(u"horizontalLayout") self.download_btn = QPushButton(self.centralwidget) self.download_btn.setObjectName(u"download_btn") - sizePolicy2 = QSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Fixed) - sizePolicy2.setHorizontalStretch(0) - sizePolicy2.setVerticalStretch(0) - sizePolicy2.setHeightForWidth(self.download_btn.sizePolicy().hasHeightForWidth()) - self.download_btn.setSizePolicy(sizePolicy2) + sizePolicy1 = QSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Fixed) + sizePolicy1.setHorizontalStretch(0) + sizePolicy1.setVerticalStretch(0) + sizePolicy1.setHeightForWidth(self.download_btn.sizePolicy().hasHeightForWidth()) + self.download_btn.setSizePolicy(sizePolicy1) self.horizontalLayout.addWidget(self.download_btn) self.script_btn = QPushButton(self.centralwidget) self.script_btn.setObjectName(u"script_btn") - sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed) - sizePolicy3.setHorizontalStretch(0) - sizePolicy3.setVerticalStretch(0) - sizePolicy3.setHeightForWidth(self.script_btn.sizePolicy().hasHeightForWidth()) - self.script_btn.setSizePolicy(sizePolicy3) + sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed) + sizePolicy2.setHorizontalStretch(0) + sizePolicy2.setVerticalStretch(0) + sizePolicy2.setHeightForWidth(self.script_btn.sizePolicy().hasHeightForWidth()) + self.script_btn.setSizePolicy(sizePolicy2) self.horizontalLayout.addWidget(self.script_btn) @@ -175,10 +173,11 @@ class Ui_MainWindow(object): self.horizontalLayout_5 = QHBoxLayout() self.horizontalLayout_5.setObjectName(u"horizontalLayout_5") + self.horizontalLayout_5.setSizeConstraint(QLayout.SizeConstraint.SetMinimumSize) self.verticalLayout_7 = QVBoxLayout() - self.verticalLayout_7.setSpacing(10) + self.verticalLayout_7.setSpacing(5) self.verticalLayout_7.setObjectName(u"verticalLayout_7") - self.verticalLayout_7.setSizeConstraint(QLayout.SizeConstraint.SetNoConstraint) + self.verticalLayout_7.setSizeConstraint(QLayout.SizeConstraint.SetMinimumSize) self.label_3 = QLabel(self.centralwidget) self.label_3.setObjectName(u"label_3") self.label_3.setFont(font) @@ -186,20 +185,26 @@ class Ui_MainWindow(object): self.verticalLayout_7.addWidget(self.label_3) self.pack_archive_row = QHBoxLayout() + self.pack_archive_row.setSpacing(10) self.pack_archive_row.setObjectName(u"pack_archive_row") self.pack_archive_chkbox = QCheckBox(self.centralwidget) self.pack_archive_chkbox.setObjectName(u"pack_archive_chkbox") - sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Fixed) - sizePolicy4.setHorizontalStretch(0) - sizePolicy4.setVerticalStretch(0) - sizePolicy4.setHeightForWidth(self.pack_archive_chkbox.sizePolicy().hasHeightForWidth()) - self.pack_archive_chkbox.setSizePolicy(sizePolicy4) + sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Fixed) + sizePolicy3.setHorizontalStretch(0) + sizePolicy3.setVerticalStretch(0) + sizePolicy3.setHeightForWidth(self.pack_archive_chkbox.sizePolicy().hasHeightForWidth()) + self.pack_archive_chkbox.setSizePolicy(sizePolicy3) self.pack_archive_chkbox.setText(u"") self.pack_archive_row.addWidget(self.pack_archive_chkbox) self.label_7 = QLabel(self.centralwidget) self.label_7.setObjectName(u"label_7") + sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.MinimumExpanding) + sizePolicy4.setHorizontalStretch(0) + sizePolicy4.setVerticalStretch(0) + sizePolicy4.setHeightForWidth(self.label_7.sizePolicy().hasHeightForWidth()) + self.label_7.setSizePolicy(sizePolicy4) self.label_7.setWordWrap(True) self.pack_archive_row.addWidget(self.label_7) @@ -214,11 +219,12 @@ class Ui_MainWindow(object): self.verticalLayout_7.addWidget(self.archive_file_entry) self.keep_enc_row = QHBoxLayout() + self.keep_enc_row.setSpacing(10) self.keep_enc_row.setObjectName(u"keep_enc_row") self.keep_enc_chkbox = QCheckBox(self.centralwidget) self.keep_enc_chkbox.setObjectName(u"keep_enc_chkbox") - sizePolicy4.setHeightForWidth(self.keep_enc_chkbox.sizePolicy().hasHeightForWidth()) - self.keep_enc_chkbox.setSizePolicy(sizePolicy4) + sizePolicy3.setHeightForWidth(self.keep_enc_chkbox.sizePolicy().hasHeightForWidth()) + self.keep_enc_chkbox.setSizePolicy(sizePolicy3) self.keep_enc_chkbox.setText(u"") self.keep_enc_chkbox.setChecked(True) @@ -226,6 +232,8 @@ class Ui_MainWindow(object): self.label_6 = QLabel(self.centralwidget) self.label_6.setObjectName(u"label_6") + sizePolicy4.setHeightForWidth(self.label_6.sizePolicy().hasHeightForWidth()) + self.label_6.setSizePolicy(sizePolicy4) self.label_6.setWordWrap(True) self.keep_enc_row.addWidget(self.label_6) @@ -234,17 +242,20 @@ class Ui_MainWindow(object): self.verticalLayout_7.addLayout(self.keep_enc_row) self.create_dec_row = QHBoxLayout() + self.create_dec_row.setSpacing(10) self.create_dec_row.setObjectName(u"create_dec_row") self.create_dec_chkbox = QCheckBox(self.centralwidget) self.create_dec_chkbox.setObjectName(u"create_dec_chkbox") - sizePolicy4.setHeightForWidth(self.create_dec_chkbox.sizePolicy().hasHeightForWidth()) - self.create_dec_chkbox.setSizePolicy(sizePolicy4) + sizePolicy3.setHeightForWidth(self.create_dec_chkbox.sizePolicy().hasHeightForWidth()) + self.create_dec_chkbox.setSizePolicy(sizePolicy3) self.create_dec_chkbox.setText(u"") self.create_dec_row.addWidget(self.create_dec_chkbox) self.create_dec_chkbox_lbl = QLabel(self.centralwidget) self.create_dec_chkbox_lbl.setObjectName(u"create_dec_chkbox_lbl") + sizePolicy4.setHeightForWidth(self.create_dec_chkbox_lbl.sizePolicy().hasHeightForWidth()) + self.create_dec_chkbox_lbl.setSizePolicy(sizePolicy4) self.create_dec_chkbox_lbl.setWordWrap(True) self.create_dec_row.addWidget(self.create_dec_chkbox_lbl) @@ -253,18 +264,21 @@ class Ui_MainWindow(object): self.verticalLayout_7.addLayout(self.create_dec_row) self.use_local_row = QHBoxLayout() + self.use_local_row.setSpacing(10) self.use_local_row.setObjectName(u"use_local_row") self.use_local_chkbox = QCheckBox(self.centralwidget) self.use_local_chkbox.setObjectName(u"use_local_chkbox") self.use_local_chkbox.setEnabled(True) - sizePolicy4.setHeightForWidth(self.use_local_chkbox.sizePolicy().hasHeightForWidth()) - self.use_local_chkbox.setSizePolicy(sizePolicy4) + sizePolicy3.setHeightForWidth(self.use_local_chkbox.sizePolicy().hasHeightForWidth()) + self.use_local_chkbox.setSizePolicy(sizePolicy3) self.use_local_chkbox.setText(u"") self.use_local_row.addWidget(self.use_local_chkbox) self.use_local_chkbox_lbl = QLabel(self.centralwidget) self.use_local_chkbox_lbl.setObjectName(u"use_local_chkbox_lbl") + sizePolicy4.setHeightForWidth(self.use_local_chkbox_lbl.sizePolicy().hasHeightForWidth()) + self.use_local_chkbox_lbl.setSizePolicy(sizePolicy4) self.use_local_chkbox_lbl.setWordWrap(True) self.use_local_row.addWidget(self.use_local_chkbox_lbl) @@ -273,14 +287,13 @@ class Ui_MainWindow(object): self.verticalLayout_7.addLayout(self.use_local_row) self.use_wiiu_nus_row = QHBoxLayout() + self.use_wiiu_nus_row.setSpacing(10) self.use_wiiu_nus_row.setObjectName(u"use_wiiu_nus_row") + self.use_wiiu_nus_row.setSizeConstraint(QLayout.SizeConstraint.SetDefaultConstraint) self.use_wiiu_nus_chkbox = QCheckBox(self.centralwidget) self.use_wiiu_nus_chkbox.setObjectName(u"use_wiiu_nus_chkbox") - sizePolicy5 = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Preferred) - sizePolicy5.setHorizontalStretch(0) - sizePolicy5.setVerticalStretch(0) - sizePolicy5.setHeightForWidth(self.use_wiiu_nus_chkbox.sizePolicy().hasHeightForWidth()) - self.use_wiiu_nus_chkbox.setSizePolicy(sizePolicy5) + sizePolicy.setHeightForWidth(self.use_wiiu_nus_chkbox.sizePolicy().hasHeightForWidth()) + self.use_wiiu_nus_chkbox.setSizePolicy(sizePolicy) self.use_wiiu_nus_chkbox.setLayoutDirection(Qt.LayoutDirection.LeftToRight) self.use_wiiu_nus_chkbox.setText(u"") self.use_wiiu_nus_chkbox.setChecked(True) @@ -289,6 +302,8 @@ class Ui_MainWindow(object): self.use_wiiu_nus_chkbox_lbl = QLabel(self.centralwidget) self.use_wiiu_nus_chkbox_lbl.setObjectName(u"use_wiiu_nus_chkbox_lbl") + sizePolicy4.setHeightForWidth(self.use_wiiu_nus_chkbox_lbl.sizePolicy().hasHeightForWidth()) + self.use_wiiu_nus_chkbox_lbl.setSizePolicy(sizePolicy4) self.use_wiiu_nus_chkbox_lbl.setWordWrap(True) self.use_wiiu_nus_row.addWidget(self.use_wiiu_nus_chkbox_lbl) @@ -297,12 +312,13 @@ class Ui_MainWindow(object): self.verticalLayout_7.addLayout(self.use_wiiu_nus_row) self.patch_ios_row = QHBoxLayout() + self.patch_ios_row.setSpacing(10) self.patch_ios_row.setObjectName(u"patch_ios_row") self.patch_ios_chkbox = QCheckBox(self.centralwidget) self.patch_ios_chkbox.setObjectName(u"patch_ios_chkbox") self.patch_ios_chkbox.setEnabled(False) - sizePolicy4.setHeightForWidth(self.patch_ios_chkbox.sizePolicy().hasHeightForWidth()) - self.patch_ios_chkbox.setSizePolicy(sizePolicy4) + sizePolicy3.setHeightForWidth(self.patch_ios_chkbox.sizePolicy().hasHeightForWidth()) + self.patch_ios_chkbox.setSizePolicy(sizePolicy3) self.patch_ios_chkbox.setText(u"") self.patch_ios_row.addWidget(self.patch_ios_chkbox) @@ -310,6 +326,8 @@ class Ui_MainWindow(object): self.patch_ios_lbl = QLabel(self.centralwidget) self.patch_ios_lbl.setObjectName(u"patch_ios_lbl") self.patch_ios_lbl.setEnabled(True) + sizePolicy4.setHeightForWidth(self.patch_ios_lbl.sizePolicy().hasHeightForWidth()) + self.patch_ios_lbl.setSizePolicy(sizePolicy4) self.patch_ios_lbl.setWordWrap(True) self.patch_ios_row.addWidget(self.patch_ios_lbl) @@ -317,11 +335,11 @@ class Ui_MainWindow(object): self.verticalLayout_7.addLayout(self.patch_ios_row) - self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred) + self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Ignored) self.verticalLayout_7.addItem(self.verticalSpacer_2) - self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Minimum) + self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum) self.verticalLayout_7.addItem(self.horizontalSpacer) @@ -330,6 +348,7 @@ class Ui_MainWindow(object): self.verticalLayout_8 = QVBoxLayout() self.verticalLayout_8.setObjectName(u"verticalLayout_8") + self.verticalLayout_8.setSizeConstraint(QLayout.SizeConstraint.SetMinimumSize) self.label_4 = QLabel(self.centralwidget) self.label_4.setObjectName(u"label_4") self.label_4.setFont(font) @@ -341,8 +360,8 @@ class Ui_MainWindow(object): self.pack_vwii_mode_chkbox = QCheckBox(self.centralwidget) self.pack_vwii_mode_chkbox.setObjectName(u"pack_vwii_mode_chkbox") self.pack_vwii_mode_chkbox.setEnabled(False) - sizePolicy4.setHeightForWidth(self.pack_vwii_mode_chkbox.sizePolicy().hasHeightForWidth()) - self.pack_vwii_mode_chkbox.setSizePolicy(sizePolicy4) + sizePolicy3.setHeightForWidth(self.pack_vwii_mode_chkbox.sizePolicy().hasHeightForWidth()) + self.pack_vwii_mode_chkbox.setSizePolicy(sizePolicy3) self.pack_vwii_mode_chkbox.setText(u"") self.pack_vwii_mode_row.addWidget(self.pack_vwii_mode_chkbox) @@ -350,6 +369,11 @@ class Ui_MainWindow(object): self.pack_vwii_mode_lbl = QLabel(self.centralwidget) self.pack_vwii_mode_lbl.setObjectName(u"pack_vwii_mode_lbl") self.pack_vwii_mode_lbl.setEnabled(True) + sizePolicy5 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) + sizePolicy5.setHorizontalStretch(0) + sizePolicy5.setVerticalStretch(0) + sizePolicy5.setHeightForWidth(self.pack_vwii_mode_lbl.sizePolicy().hasHeightForWidth()) + self.pack_vwii_mode_lbl.setSizePolicy(sizePolicy5) self.pack_vwii_mode_lbl.setWordWrap(True) self.pack_vwii_mode_row.addWidget(self.pack_vwii_mode_lbl) @@ -357,7 +381,7 @@ class Ui_MainWindow(object): self.verticalLayout_8.addLayout(self.pack_vwii_mode_row) - self.verticalSpacer = QSpacerItem(20, 50, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) + self.verticalSpacer = QSpacerItem(20, 50, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.MinimumExpanding) self.verticalLayout_8.addItem(self.verticalSpacer) @@ -383,7 +407,7 @@ class Ui_MainWindow(object): MainWindow.setCentralWidget(self.centralwidget) self.menubar = QMenuBar(MainWindow) self.menubar.setObjectName(u"menubar") - self.menubar.setGeometry(QRect(0, 0, 1077, 24)) + self.menubar.setGeometry(QRect(0, 0, 1010, 30)) MainWindow.setMenuBar(self.menubar) self.retranslateUi(MainWindow) @@ -421,8 +445,11 @@ class Ui_MainWindow(object): self.pack_vwii_mode_lbl.setText(QCoreApplication.translate("MainWindow", u"Re-encrypt title using the Wii Common Key", None)) self.log_text_browser.setMarkdown("") self.log_text_browser.setHtml(QCoreApplication.translate("MainWindow", u"\n" -"\n" "


", None)) # retranslateUi diff --git a/qt/ui/MainMenu.ui b/qt/ui/MainMenu.ui old mode 100644 new mode 100755 index 09afa9c..8b900c7 --- a/qt/ui/MainMenu.ui +++ b/qt/ui/MainMenu.ui @@ -6,21 +6,30 @@ 0 0 - 1077 - 784 + 1010 + 625 - - - 0 - 0 - + + + 1010 + 625 + + + + + 1010 + 625 + MainWindow + + QLayout::SizeConstraint::SetDefaultConstraint + @@ -246,13 +255,16 @@ + + QLayout::SizeConstraint::SetMinimumSize + - 10 + 5 - QLayout::SizeConstraint::SetNoConstraint + QLayout::SizeConstraint::SetMinimumSize @@ -268,6 +280,9 @@ + + 10 + @@ -283,6 +298,12 @@ + + + 0 + 0 + + Pack installable archive (WAD/TAD) @@ -305,6 +326,9 @@ + + 10 + @@ -323,6 +347,12 @@ + + + 0 + 0 + + Keep encrypted contents @@ -335,6 +365,9 @@ + + 10 + @@ -350,6 +383,12 @@ + + + 0 + 0 + + Create decrypted contents (*.app) @@ -362,6 +401,9 @@ + + 10 + @@ -380,6 +422,12 @@ + + + 0 + 0 + + Use local files, if they exist @@ -392,10 +440,16 @@ + + 10 + + + QLayout::SizeConstraint::SetDefaultConstraint + - + 0 0 @@ -413,6 +467,12 @@ + + + 0 + 0 + + Use the Wii U NUS (faster, only effects Wii/vWii) @@ -425,6 +485,9 @@ + + 10 + @@ -446,6 +509,12 @@ true + + + 0 + 0 + + Apply patches to IOS (Applies to WADs only) @@ -462,7 +531,7 @@ Qt::Orientation::Vertical - QSizePolicy::Policy::Preferred + QSizePolicy::Policy::Ignored @@ -478,7 +547,7 @@ Qt::Orientation::Horizontal - QSizePolicy::Policy::Preferred + QSizePolicy::Policy::MinimumExpanding @@ -492,6 +561,9 @@ + + QLayout::SizeConstraint::SetMinimumSize + @@ -527,6 +599,12 @@ true + + + 0 + 0 + + Re-encrypt title using the Wii Common Key @@ -543,7 +621,7 @@ Qt::Orientation::Vertical - QSizePolicy::Policy::Expanding + QSizePolicy::Policy::MinimumExpanding @@ -586,8 +664,11 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> p, li { white-space: pre-wrap; } +hr { height: 1px; border-width: 0; } +li.unchecked::marker { content: "\2610"; } +li.checked::marker { content: "\2612"; } </style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> @@ -602,8 +683,8 @@ p, li { white-space: pre-wrap; } 0 0 - 1077 - 24 + 1010 + 30