From 33b30b4aa59cbddcd7dab6cea3762a2df70b5e71 Mon Sep 17 00:00:00 2001
From: yeah-its-gloria <32610623+yeah-its-gloria@users.noreply.github.com>
Date: Mon, 21 Oct 2024 23:44:27 +0200
Subject: [PATCH] Clean up the UI

---
 NUSGet.py            |  4 +++
 qt/py/ui_MainMenu.py | 85 +++++++++++++++++++++++---------------------
 qt/ui/MainMenu.ui    | 28 ++++++---------
 3 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/NUSGet.py b/NUSGet.py
index d100eff..fe90675 100644
--- a/NUSGet.py
+++ b/NUSGet.py
@@ -125,6 +125,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             tree[0].insertTopLevelItems(0, self.tree_categories)
             # Connect the double click signal for handling when titles are selected.
             tree[0].itemDoubleClicked.connect(self.onItemClicked)
+
+        # Prevent resizing, Qt makes us look stupid here
+        self.setFixedSize(self.size())
+
         # Do a quick check to see if there's a newer release available, and inform the user if there is.
         worker = Worker(check_nusget_updates, app, nusget_version)
         worker.signals.result.connect(self.prompt_for_update)
diff --git a/qt/py/ui_MainMenu.py b/qt/py/ui_MainMenu.py
index 42ef40d..58e8640 100644
--- a/qt/py/ui_MainMenu.py
+++ b/qt/py/ui_MainMenu.py
@@ -25,9 +25,12 @@ class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         if not MainWindow.objectName():
             MainWindow.setObjectName(u"MainWindow")
-        MainWindow.resize(1010, 625)
-        MainWindow.setMinimumSize(QSize(1010, 625))
-        MainWindow.setMaximumSize(QSize(1010, 625))
+        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)
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         self.horizontalLayout_3 = QHBoxLayout(self.centralwidget)
@@ -44,11 +47,11 @@ class Ui_MainWindow(object):
 
         self.platform_tabs = QTabWidget(self.centralwidget)
         self.platform_tabs.setObjectName(u"platform_tabs")
-        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)
+        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)
         self.platform_tabs.setMinimumSize(QSize(410, 0))
         self.platform_tabs.setMaximumSize(QSize(410, 16777215))
         self.wii_tab = QWidget()
@@ -149,21 +152,21 @@ class Ui_MainWindow(object):
         self.horizontalLayout.setObjectName(u"horizontalLayout")
         self.download_btn = QPushButton(self.centralwidget)
         self.download_btn.setObjectName(u"download_btn")
-        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)
+        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)
 
         self.horizontalLayout.addWidget(self.download_btn)
 
         self.script_btn = QPushButton(self.centralwidget)
         self.script_btn.setObjectName(u"script_btn")
-        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)
+        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)
 
         self.horizontalLayout.addWidget(self.script_btn)
 
@@ -186,11 +189,11 @@ class Ui_MainWindow(object):
         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")
-        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)
+        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)
         self.pack_archive_chkbox.setText(u"")
 
         self.pack_archive_row.addWidget(self.pack_archive_chkbox)
@@ -214,8 +217,8 @@ class Ui_MainWindow(object):
         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")
-        sizePolicy3.setHeightForWidth(self.keep_enc_chkbox.sizePolicy().hasHeightForWidth())
-        self.keep_enc_chkbox.setSizePolicy(sizePolicy3)
+        sizePolicy4.setHeightForWidth(self.keep_enc_chkbox.sizePolicy().hasHeightForWidth())
+        self.keep_enc_chkbox.setSizePolicy(sizePolicy4)
         self.keep_enc_chkbox.setText(u"")
         self.keep_enc_chkbox.setChecked(True)
 
@@ -234,8 +237,8 @@ class Ui_MainWindow(object):
         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")
-        sizePolicy3.setHeightForWidth(self.create_dec_chkbox.sizePolicy().hasHeightForWidth())
-        self.create_dec_chkbox.setSizePolicy(sizePolicy3)
+        sizePolicy4.setHeightForWidth(self.create_dec_chkbox.sizePolicy().hasHeightForWidth())
+        self.create_dec_chkbox.setSizePolicy(sizePolicy4)
         self.create_dec_chkbox.setText(u"")
 
         self.create_dec_row.addWidget(self.create_dec_chkbox)
@@ -254,8 +257,8 @@ class Ui_MainWindow(object):
         self.use_local_chkbox = QCheckBox(self.centralwidget)
         self.use_local_chkbox.setObjectName(u"use_local_chkbox")
         self.use_local_chkbox.setEnabled(True)
-        sizePolicy3.setHeightForWidth(self.use_local_chkbox.sizePolicy().hasHeightForWidth())
-        self.use_local_chkbox.setSizePolicy(sizePolicy3)
+        sizePolicy4.setHeightForWidth(self.use_local_chkbox.sizePolicy().hasHeightForWidth())
+        self.use_local_chkbox.setSizePolicy(sizePolicy4)
         self.use_local_chkbox.setText(u"")
 
         self.use_local_row.addWidget(self.use_local_chkbox)
@@ -273,11 +276,11 @@ class Ui_MainWindow(object):
         self.use_wiiu_nus_row.setObjectName(u"use_wiiu_nus_row")
         self.use_wiiu_nus_chkbox = QCheckBox(self.centralwidget)
         self.use_wiiu_nus_chkbox.setObjectName(u"use_wiiu_nus_chkbox")
-        sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Preferred)
-        sizePolicy4.setHorizontalStretch(0)
-        sizePolicy4.setVerticalStretch(0)
-        sizePolicy4.setHeightForWidth(self.use_wiiu_nus_chkbox.sizePolicy().hasHeightForWidth())
-        self.use_wiiu_nus_chkbox.setSizePolicy(sizePolicy4)
+        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)
         self.use_wiiu_nus_chkbox.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
         self.use_wiiu_nus_chkbox.setText(u"")
         self.use_wiiu_nus_chkbox.setChecked(True)
@@ -298,8 +301,8 @@ class Ui_MainWindow(object):
         self.patch_ios_chkbox = QCheckBox(self.centralwidget)
         self.patch_ios_chkbox.setObjectName(u"patch_ios_chkbox")
         self.patch_ios_chkbox.setEnabled(False)
-        sizePolicy3.setHeightForWidth(self.patch_ios_chkbox.sizePolicy().hasHeightForWidth())
-        self.patch_ios_chkbox.setSizePolicy(sizePolicy3)
+        sizePolicy4.setHeightForWidth(self.patch_ios_chkbox.sizePolicy().hasHeightForWidth())
+        self.patch_ios_chkbox.setSizePolicy(sizePolicy4)
         self.patch_ios_chkbox.setText(u"")
 
         self.patch_ios_row.addWidget(self.patch_ios_chkbox)
@@ -314,7 +317,7 @@ class Ui_MainWindow(object):
 
         self.verticalLayout_7.addLayout(self.patch_ios_row)
 
-        self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Ignored)
+        self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Preferred)
 
         self.verticalLayout_7.addItem(self.verticalSpacer_2)
 
@@ -338,8 +341,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)
-        sizePolicy3.setHeightForWidth(self.pack_vwii_mode_chkbox.sizePolicy().hasHeightForWidth())
-        self.pack_vwii_mode_chkbox.setSizePolicy(sizePolicy3)
+        sizePolicy4.setHeightForWidth(self.pack_vwii_mode_chkbox.sizePolicy().hasHeightForWidth())
+        self.pack_vwii_mode_chkbox.setSizePolicy(sizePolicy4)
         self.pack_vwii_mode_chkbox.setText(u"")
 
         self.pack_vwii_mode_row.addWidget(self.pack_vwii_mode_chkbox)
@@ -358,7 +361,7 @@ class Ui_MainWindow(object):
 
         self.verticalLayout_8.addItem(self.verticalSpacer)
 
-        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Minimum)
+        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum)
 
         self.verticalLayout_8.addItem(self.horizontalSpacer_2)
 
@@ -380,7 +383,7 @@ class Ui_MainWindow(object):
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QMenuBar(MainWindow)
         self.menubar.setObjectName(u"menubar")
-        self.menubar.setGeometry(QRect(0, 0, 1010, 30))
+        self.menubar.setGeometry(QRect(0, 0, 1077, 24))
         MainWindow.setMenuBar(self.menubar)
 
         self.retranslateUi(MainWindow)
diff --git a/qt/ui/MainMenu.ui b/qt/ui/MainMenu.ui
index 9c1cc4b..09afa9c 100644
--- a/qt/ui/MainMenu.ui
+++ b/qt/ui/MainMenu.ui
@@ -6,21 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1010</width>
-    <height>625</height>
+    <width>1077</width>
+    <height>784</height>
    </rect>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>1010</width>
-    <height>625</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>1010</width>
-    <height>625</height>
-   </size>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
@@ -468,7 +462,7 @@
              <enum>Qt::Orientation::Vertical</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Policy::Ignored</enum>
+             <enum>QSizePolicy::Policy::Preferred</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -565,7 +559,7 @@
              <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Policy::Preferred</enum>
+             <enum>QSizePolicy::Policy::MinimumExpanding</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -608,8 +602,8 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1010</width>
-     <height>30</height>
+     <width>1077</width>
+     <height>24</height>
     </rect>
    </property>
   </widget>