From 56f79fb5944986e555c5ad773796ac881e50106a Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Sat, 22 May 2021 23:18:58 +0300
Subject: [PATCH] Make shortcuts align top properly

---
 rare/ui/components/tabs/settings/rare.py | 19 +++++++---------
 rare/ui/components/tabs/settings/rare.ui | 29 ++++--------------------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/rare/ui/components/tabs/settings/rare.py b/rare/ui/components/tabs/settings/rare.py
index abbd889e..6e948018 100644
--- a/rare/ui/components/tabs/settings/rare.py
+++ b/rare/ui/components/tabs/settings/rare.py
@@ -14,7 +14,6 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_RareSettings(object):
     def setupUi(self, RareSettings):
         RareSettings.setObjectName("RareSettings")
-        RareSettings.resize(526, 486)
         self.rare_layout = QtWidgets.QGridLayout(RareSettings)
         self.rare_layout.setObjectName("rare_layout")
         self.rpc_layout = QtWidgets.QVBoxLayout()
@@ -30,15 +29,13 @@ class Ui_RareSettings(object):
         self.startmenu_link = QtWidgets.QPushButton(self.groupBox)
         self.startmenu_link.setObjectName("startmenu_link")
         self.verticalLayout.addWidget(self.startmenu_link)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem)
-        self.rare_layout.addWidget(self.groupBox, 2, 1, 1, 1)
+        self.rare_layout.addWidget(self.groupBox, 2, 1, 1, 1, QtCore.Qt.AlignTop)
         self.settings_group = QtWidgets.QGroupBox(RareSettings)
         self.settings_group.setObjectName("settings_group")
         self.behavior_layout = QtWidgets.QGridLayout(self.settings_group)
         self.behavior_layout.setObjectName("behavior_layout")
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.behavior_layout.addItem(spacerItem1, 2, 1, 2, 1)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.behavior_layout.addItem(spacerItem, 2, 1, 2, 1)
         self.save_size = QtWidgets.QCheckBox(self.settings_group)
         self.save_size.setObjectName("save_size")
         self.behavior_layout.addWidget(self.save_size, 5, 0, 1, 1)
@@ -57,7 +54,7 @@ class Ui_RareSettings(object):
         self.sys_tray = QtWidgets.QCheckBox(self.settings_group)
         self.sys_tray.setObjectName("sys_tray")
         self.behavior_layout.addWidget(self.sys_tray, 0, 0, 1, 1)
-        self.rare_layout.addWidget(self.settings_group, 2, 0, 1, 1)
+        self.rare_layout.addWidget(self.settings_group, 2, 0, 1, 1, QtCore.Qt.AlignTop)
         self.log_dir_group = QtWidgets.QGroupBox(RareSettings)
         self.log_dir_group.setObjectName("log_dir_group")
         self.log_dir_layout = QtWidgets.QVBoxLayout(self.log_dir_group)
@@ -94,8 +91,8 @@ class Ui_RareSettings(object):
         self.style_select.setObjectName("style_select")
         self.style_select.addItem("")
         self.interface_layout.addWidget(self.style_select, 2, 1, 1, 1)
-        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.interface_layout.addItem(spacerItem2, 1, 2, 1, 1)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.interface_layout.addItem(spacerItem1, 1, 2, 1, 1)
         self.interface_info = QtWidgets.QLabel(self.interface_group)
         font = QtGui.QFont()
         font.setItalic(True)
@@ -118,8 +115,8 @@ class Ui_RareSettings(object):
         self.img_dir_layout = QtWidgets.QVBoxLayout(self.img_dir_group)
         self.img_dir_layout.setObjectName("img_dir_layout")
         self.rare_layout.addWidget(self.img_dir_group, 0, 0, 1, 1, QtCore.Qt.AlignTop)
-        spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.rare_layout.addItem(spacerItem3, 3, 0, 1, 1)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.rare_layout.addItem(spacerItem2, 3, 0, 1, 2)
 
         self.retranslateUi(RareSettings)
         QtCore.QMetaObject.connectSlotsByName(RareSettings)
diff --git a/rare/ui/components/tabs/settings/rare.ui b/rare/ui/components/tabs/settings/rare.ui
index 78c43ff8..377f874c 100644
--- a/rare/ui/components/tabs/settings/rare.ui
+++ b/rare/ui/components/tabs/settings/rare.ui
@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>RareSettings</class>
  <widget class="QWidget" name="RareSettings">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>526</width>
-    <height>486</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>RareSettings</string>
   </property>
@@ -17,7 +9,7 @@
    <item row="1" column="1">
     <layout class="QVBoxLayout" name="rpc_layout"/>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="1" alignment="Qt::AlignTop">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Shortcuts</string>
@@ -37,23 +29,10 @@
         </property>
        </widget>
       </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="2" column="0" alignment="Qt::AlignTop">
     <widget class="QGroupBox" name="settings_group">
      <property name="title">
       <string>Behavior</string>
@@ -243,8 +222,8 @@
      <layout class="QVBoxLayout" name="img_dir_layout"/>
     </widget>
    </item>
-   <item row="3" column="0">
-    <spacer name="verticalSpacer_2">
+   <item row="3" column="0" colspan="2">
+    <spacer name="rare_vspacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>