Merge pull request #194 from loathingKernel/ui_fixes

A bunch of minor UI fixes

misc/rare.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Rare
 Type=Application
-Categories=Game;
+Categories=Games;Multimedia;
 Icon=rare
 Exec=rare
 Comment=A GUI for legendary, an open source replacement for Epic Games Launcher

rare/components/tabs/settings/__init__.py

@@ -17,7 +17,7 @@ class SettingsTab(SideTabWidget):
 
         self.addTab(LegendarySettings(), "Legendary")
 
-        self.addTab(DefaultGameSettings(True, self), self.tr("Games"), self.tr("Default game settings"))
+        self.addTab(DefaultGameSettings(True, self), self.tr("Default Settings"))
 
         self.about = About()
         self.addTab(self.about, "About", "About")

rare/components/tabs/settings/default_game_settings.py

@@ -38,8 +38,7 @@ class DefaultGameSettings(QWidget, Ui_GameSettings):
         if platform.system() != "Windows":
             self.linux_settings = LinuxAppSettings()
             self.proton_settings = ProtonSettings(self.linux_settings, self.wrapper_settings)
-            self.game_settings_layout.replaceWidget(self.proton_placeholder, self.proton_settings)
+            self.proton_layout.addWidget(self.proton_settings)
-            self.proton_placeholder.deleteLater()
 
             # FIXME: Remove the spacerItem and margins from the linux settings
             # FIXME: This should be handled differently at soem point in the future

rare/components/tabs/settings/widgets/env_vars.py

@@ -1,12 +1,11 @@
 from logging import getLogger
 
 import qtawesome
-
 from PyQt5.QtCore import Qt, QFileSystemWatcher
 from PyQt5.QtWidgets import QGroupBox, QTableWidgetItem, QMessageBox, QPushButton
 
 from rare.shared import LegendaryCoreSingleton
-from rare.ui.components.tabs.games.env_vars import Ui_EnvVars
+from rare.ui.components.tabs.settings.widgets.env_vars import Ui_EnvVars
 from rare.utils import config_helper
 
 logger = getLogger("EnvVars")

rare/components/tabs/settings/widgets/proton.py

@@ -14,6 +14,7 @@ from rare.shared import LegendaryCoreSingleton
 
 logger = getLogger("Proton")
 
+
 def find_proton_combos():
     possible_proton_combos = []
     compatibilitytools_dirs = [
@@ -60,8 +61,7 @@ class ProtonSettings(QGroupBox, Ui_ProtonSettings):
             save_func=self.proton_prefix_save,
             placeholder=self.tr("Please select path for proton prefix")
         )
-        self.layout().replaceWidget(self.placeholder_prefix_edit, self.proton_prefix)
+        self.prefix_layout.addWidget(self.proton_prefix)
-        self.placeholder_prefix_edit.deleteLater()
 
     def change_proton(self, i):
         if not self.changeable:

rare/ui/components/tabs/games/game_info/game_settings.py

@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_GameSettings(object):
     def setupUi(self, GameSettings):
         GameSettings.setObjectName("GameSettings")
-        GameSettings.resize(558, 357)
+        GameSettings.resize(448, 310)
         self.game_settings_layout = QtWidgets.QVBoxLayout(GameSettings)
         self.game_settings_layout.setObjectName("game_settings_layout")
         self.launch_settings_group = QtWidgets.QGroupBox(GameSettings)
@@ -59,7 +59,6 @@ class Ui_GameSettings(object):
         self.launch_params_label.setObjectName("launch_params_label")
         self.launch_settings_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.launch_params_label)
         self.launch_params = QtWidgets.QLineEdit(self.launch_settings_group)
-        self.launch_params.setMinimumSize(QtCore.QSize(400, 0))
         self.launch_params.setObjectName("launch_params")
         self.launch_settings_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.launch_params)
         self.override_exe_label = QtWidgets.QLabel(self.launch_settings_group)
@@ -82,12 +81,9 @@ class Ui_GameSettings(object):
         self.cloud_sync.setObjectName("cloud_sync")
         self.cloud_layout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cloud_sync)
         self.game_settings_layout.addWidget(self.cloud_group)
-        self.proton_placeholder = QtWidgets.QWidget(GameSettings)
+        self.proton_layout = QtWidgets.QVBoxLayout()
-        self.proton_placeholder.setObjectName("proton_placeholder")
-        self.proton_layout = QtWidgets.QFormLayout(self.proton_placeholder)
-        self.proton_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.proton_layout.setObjectName("proton_layout")
-        self.game_settings_layout.addWidget(self.proton_placeholder)
+        self.game_settings_layout.addLayout(self.proton_layout)
         self.linux_settings_widget = QtWidgets.QWidget(GameSettings)
         self.linux_settings_widget.setObjectName("linux_settings_widget")
         self.linux_settings_layout = QtWidgets.QVBoxLayout(self.linux_settings_widget)

rare/ui/components/tabs/games/game_info/game_settings.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>558</width>
+    <width>448</width>
-    <height>357</height>
+    <height>310</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -102,12 +102,6 @@
       </item>
       <item row="2" column="1">
        <widget class="QLineEdit" name="launch_params">
-        <property name="minimumSize">
-         <size>
-          <width>400</width>
-          <height>0</height>
-         </size>
-        </property>
         <property name="placeholderText">
          <string>parameters</string>
         </property>
@@ -157,13 +151,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QWidget" name="proton_placeholder" native="true">
+    <layout class="QVBoxLayout" name="proton_layout"/>
-     <layout class="QFormLayout" name="proton_layout">
-      <property name="labelAlignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </layout>
-    </widget>
    </item>
    <item>
     <widget class="QWidget" name="linux_settings_widget" native="true">

rare/ui/components/tabs/settings/dxvk.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/dxvk.ui'
-#
-# 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.
-
-

rare/ui/components/tabs/settings/eos_widget.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/eos_widget.ui'
-#
-# 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.
-
-

rare/ui/components/tabs/settings/legendary.py

@@ -14,52 +14,10 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_LegendarySettings(object):
     def setupUi(self, LegendarySettings):
         LegendarySettings.setObjectName("LegendarySettings")
-        LegendarySettings.resize(654, 498)
+        LegendarySettings.resize(552, 334)
         LegendarySettings.setWindowTitle("LegendarySettings")
-        self.gridLayout = QtWidgets.QGridLayout(LegendarySettings)
+        self.legendary_layout = QtWidgets.QHBoxLayout(LegendarySettings)
-        self.gridLayout.setObjectName("gridLayout")
+        self.legendary_layout.setObjectName("legendary_layout")
-        self.right_layout = QtWidgets.QVBoxLayout()
-        self.right_layout.setObjectName("right_layout")
-        self.locale_group = QtWidgets.QGroupBox(LegendarySettings)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.locale_group.sizePolicy().hasHeightForWidth())
-        self.locale_group.setSizePolicy(sizePolicy)
-        self.locale_group.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.locale_group.setObjectName("locale_group")
-        self.locale_layout = QtWidgets.QVBoxLayout(self.locale_group)
-        self.locale_layout.setObjectName("locale_layout")
-        self.right_layout.addWidget(self.locale_group, 0, QtCore.Qt.AlignTop)
-        self.cleanup_group = QtWidgets.QGroupBox(LegendarySettings)
-        self.cleanup_group.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.cleanup_group.setObjectName("cleanup_group")
-        self.cleanup_layout = QtWidgets.QVBoxLayout(self.cleanup_group)
-        self.cleanup_layout.setObjectName("cleanup_layout")
-        self.clean_keep_manifests_button = QtWidgets.QPushButton(self.cleanup_group)
-        self.clean_keep_manifests_button.setObjectName("clean_keep_manifests_button")
-        self.cleanup_layout.addWidget(self.clean_keep_manifests_button)
-        self.clean_button = QtWidgets.QPushButton(self.cleanup_group)
-        self.clean_button.setObjectName("clean_button")
-        self.cleanup_layout.addWidget(self.clean_button)
-        self.right_layout.addWidget(self.cleanup_group, 0, QtCore.Qt.AlignTop)
-        self.meta_group = QtWidgets.QGroupBox(LegendarySettings)
-        self.meta_group.setObjectName("meta_group")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.meta_group)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.win32_cb = QtWidgets.QCheckBox(self.meta_group)
-        self.win32_cb.setObjectName("win32_cb")
-        self.verticalLayout_2.addWidget(self.win32_cb)
-        self.mac_cb = QtWidgets.QCheckBox(self.meta_group)
-        self.mac_cb.setObjectName("mac_cb")
-        self.verticalLayout_2.addWidget(self.mac_cb)
-        self.refresh_game_meta_btn = QtWidgets.QPushButton(self.meta_group)
-        self.refresh_game_meta_btn.setObjectName("refresh_game_meta_btn")
-        self.verticalLayout_2.addWidget(self.refresh_game_meta_btn)
-        self.right_layout.addWidget(self.meta_group)
-        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.right_layout.addItem(spacerItem)
-        self.gridLayout.addLayout(self.right_layout, 0, 1, 1, 1)
         self.left_layout = QtWidgets.QVBoxLayout()
         self.left_layout.setObjectName("left_layout")
         self.install_dir_group = QtWidgets.QGroupBox(LegendarySettings)
@@ -146,23 +104,57 @@ class Ui_LegendarySettings(object):
         self.verticalLayout = QtWidgets.QVBoxLayout(self.ubisoft_gb)
         self.verticalLayout.setObjectName("verticalLayout")
         self.left_layout.addWidget(self.ubisoft_gb, 0, QtCore.Qt.AlignTop)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.left_layout.addItem(spacerItem)
+        self.legendary_layout.addLayout(self.left_layout)
+        self.right_layout = QtWidgets.QVBoxLayout()
+        self.right_layout.setObjectName("right_layout")
+        self.locale_group = QtWidgets.QGroupBox(LegendarySettings)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.locale_group.sizePolicy().hasHeightForWidth())
+        self.locale_group.setSizePolicy(sizePolicy)
+        self.locale_group.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.locale_group.setObjectName("locale_group")
+        self.locale_layout = QtWidgets.QVBoxLayout(self.locale_group)
+        self.locale_layout.setObjectName("locale_layout")
+        self.right_layout.addWidget(self.locale_group, 0, QtCore.Qt.AlignTop)
+        self.cleanup_group = QtWidgets.QGroupBox(LegendarySettings)
+        self.cleanup_group.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.cleanup_group.setObjectName("cleanup_group")
+        self.cleanup_layout = QtWidgets.QVBoxLayout(self.cleanup_group)
+        self.cleanup_layout.setObjectName("cleanup_layout")
+        self.clean_keep_manifests_button = QtWidgets.QPushButton(self.cleanup_group)
+        self.clean_keep_manifests_button.setObjectName("clean_keep_manifests_button")
+        self.cleanup_layout.addWidget(self.clean_keep_manifests_button)
+        self.clean_button = QtWidgets.QPushButton(self.cleanup_group)
+        self.clean_button.setObjectName("clean_button")
+        self.cleanup_layout.addWidget(self.clean_button)
+        self.right_layout.addWidget(self.cleanup_group, 0, QtCore.Qt.AlignTop)
+        self.meta_group = QtWidgets.QGroupBox(LegendarySettings)
+        self.meta_group.setObjectName("meta_group")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.meta_group)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.win32_cb = QtWidgets.QCheckBox(self.meta_group)
+        self.win32_cb.setObjectName("win32_cb")
+        self.verticalLayout_2.addWidget(self.win32_cb)
+        self.mac_cb = QtWidgets.QCheckBox(self.meta_group)
+        self.mac_cb.setObjectName("mac_cb")
+        self.verticalLayout_2.addWidget(self.mac_cb)
+        self.refresh_game_meta_btn = QtWidgets.QPushButton(self.meta_group)
+        self.refresh_game_meta_btn.setObjectName("refresh_game_meta_btn")
+        self.verticalLayout_2.addWidget(self.refresh_game_meta_btn)
+        self.right_layout.addWidget(self.meta_group)
         spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.left_layout.addItem(spacerItem1)
+        self.right_layout.addItem(spacerItem1)
-        self.gridLayout.addLayout(self.left_layout, 0, 0, 1, 1)
+        self.legendary_layout.addLayout(self.right_layout)
 
         self.retranslateUi(LegendarySettings)
         QtCore.QMetaObject.connectSlotsByName(LegendarySettings)
 
     def retranslateUi(self, LegendarySettings):
         _translate = QtCore.QCoreApplication.translate
-        self.locale_group.setTitle(_translate("LegendarySettings", "Locale"))
-        self.cleanup_group.setTitle(_translate("LegendarySettings", "Cleanup"))
-        self.clean_keep_manifests_button.setText(_translate("LegendarySettings", "Clean, but keep manifests"))
-        self.clean_button.setText(_translate("LegendarySettings", "Remove everything"))
-        self.meta_group.setTitle(_translate("LegendarySettings", "Game metadata"))
-        self.win32_cb.setText(_translate("LegendarySettings", "Load 32 bit data"))
-        self.mac_cb.setText(_translate("LegendarySettings", "Load MacOS data"))
-        self.refresh_game_meta_btn.setText(_translate("LegendarySettings", "Refresh game meta"))
         self.install_dir_group.setTitle(_translate("LegendarySettings", "Default Installation Directory"))
         self.download_group.setTitle(_translate("LegendarySettings", "Download Settings"))
         self.max_workers_label.setText(_translate("LegendarySettings", "Max Workers"))
@@ -174,6 +166,14 @@ class Ui_LegendarySettings(object):
         self.preferred_cdn_line.setPlaceholderText(_translate("LegendarySettings", "Default"))
         self.disable_https_label.setText(_translate("LegendarySettings", "Disable HTTPS"))
         self.ubisoft_gb.setTitle(_translate("LegendarySettings", "Link Ubisoft Games"))
+        self.locale_group.setTitle(_translate("LegendarySettings", "Locale"))
+        self.cleanup_group.setTitle(_translate("LegendarySettings", "Cleanup"))
+        self.clean_keep_manifests_button.setText(_translate("LegendarySettings", "Clean, but keep manifests"))
+        self.clean_button.setText(_translate("LegendarySettings", "Remove everything"))
+        self.meta_group.setTitle(_translate("LegendarySettings", "Game metadata"))
+        self.win32_cb.setText(_translate("LegendarySettings", "Load 32bit data"))
+        self.mac_cb.setText(_translate("LegendarySettings", "Load MacOS data"))
+        self.refresh_game_meta_btn.setText(_translate("LegendarySettings", "Refresh game meta"))
 
 
 if __name__ == "__main__":

rare/ui/components/tabs/settings/legendary.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>552</width>
-                <height>312</height>
+    <height>334</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,65 +15,6 @@
   </property>
   <layout class="QHBoxLayout" name="legendary_layout">
    <item>
-                <widget class="QPushButton" name="clean_keep_manifests_button">
-                    <property name="text">
-                        <string>Clean, but keep manifests</string>
-                    </property>
-                </widget>
-            </item>
-            <item>
-                <widget class="QPushButton" name="clean_button">
-                    <property name="text">
-                        <string>Remove everything</string>
-                    </property>
-                </widget>
-            </item>
-        </layout>
-    </widget>
-    <item>
-        <widget class="QGroupBox" name="meta_group">
-            <property name="title">
-                <string>Game metadata</string>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayout_2">
-                <item>
-                    <widget class="QCheckBox" name="win32_cb">
-                        <property name="text">
-                            <string>Load 32 bit data</string>
-                        </property>
-                    </widget>
-                </item>
-                <item>
-                    <widget class="QCheckBox" name="mac_cb">
-                        <property name="text">
-                            <string>Load MacOS data</string>
-                        </property>
-                    </widget>
-                </item>
-                <item>
-                    <widget class="QPushButton" name="refresh_game_meta_btn">
-                        <property name="text">
-                            <string>Refresh game meta</string>
-                        </property>
-                    </widget>
-                </item>
-            </layout>
-        </widget>
-    </item>
-    <item>
-        <spacer name="right_vspacer">
-            <property name="orientation">
-                <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-                <size>
-                    <width>20</width>
-                    <height>40</height>
-                </size>
-            </property>
-        </spacer>
-    </item>
-    <item row="0" column="0">
     <layout class="QVBoxLayout" name="left_layout">
      <item alignment="Qt::AlignTop">
       <widget class="QGroupBox" name="install_dir_group">
@@ -293,6 +234,29 @@
           </property>
          </widget>
         </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="meta_group">
+       <property name="title">
+        <string>Game metadata</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QCheckBox" name="win32_cb">
+          <property name="text">
+           <string>Load 32bit data</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="mac_cb">
+          <property name="text">
+           <string>Load MacOS data</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QPushButton" name="refresh_game_meta_btn">
           <property name="text">
@@ -318,6 +282,8 @@
      </item>
     </layout>
    </item>
+  </layout>
+ </widget>
  <resources/>
  <connections/>
 </ui>

rare/ui/components/tabs/settings/overlay.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/overlay.ui'
-#
-# 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.
-
-

rare/ui/components/tabs/settings/proton.py

@@ -14,13 +14,14 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_ProtonSettings(object):
     def setupUi(self, ProtonSettings):
         ProtonSettings.setObjectName("ProtonSettings")
-        ProtonSettings.resize(400, 300)
+        ProtonSettings.resize(190, 86)
-        ProtonSettings.setWindowTitle("GroupBox")
+        ProtonSettings.setWindowTitle("ProtonSettings")
-        self.formLayout = QtWidgets.QFormLayout(ProtonSettings)
+        self.proton_settings_layout = QtWidgets.QFormLayout(ProtonSettings)
-        self.formLayout.setObjectName("formLayout")
+        self.proton_settings_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.proton_settings_layout.setObjectName("proton_settings_layout")
         self.proton_wrapper_label = QtWidgets.QLabel(ProtonSettings)
         self.proton_wrapper_label.setObjectName("proton_wrapper_label")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.proton_wrapper_label)
+        self.proton_settings_layout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.proton_wrapper_label)
         self.proton_combo = QtWidgets.QComboBox(ProtonSettings)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -29,13 +30,13 @@ class Ui_ProtonSettings(object):
         self.proton_combo.setSizePolicy(sizePolicy)
         self.proton_combo.setObjectName("proton_combo")
         self.proton_combo.addItem("")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.proton_combo)
+        self.proton_settings_layout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.proton_combo)
         self.proton_prefix_label = QtWidgets.QLabel(ProtonSettings)
         self.proton_prefix_label.setObjectName("proton_prefix_label")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.proton_prefix_label)
+        self.proton_settings_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.proton_prefix_label)
-        self.placeholder_prefix_edit = QtWidgets.QLineEdit(ProtonSettings)
+        self.prefix_layout = QtWidgets.QHBoxLayout()
-        self.placeholder_prefix_edit.setObjectName("placeholder_prefix_edit")
+        self.prefix_layout.setObjectName("prefix_layout")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.placeholder_prefix_edit)
+        self.proton_settings_layout.setLayout(1, QtWidgets.QFormLayout.FieldRole, self.prefix_layout)
 
         self.retranslateUi(ProtonSettings)
         QtCore.QMetaObject.connectSlotsByName(ProtonSettings)

rare/ui/components/tabs/settings/proton.ui

@@ -6,17 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>190</width>
-    <height>300</height>
+    <height>86</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string notr="true">GroupBox</string>
+   <string notr="true">ProtonSettings</string>
   </property>
   <property name="title">
    <string>Proton Settings</string>
   </property>
-  <layout class="QFormLayout" name="formLayout">
+  <layout class="QFormLayout" name="proton_settings_layout">
+   <property name="labelAlignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
    <item row="0" column="0">
     <widget class="QLabel" name="proton_wrapper_label">
      <property name="text">
@@ -47,7 +50,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QLineEdit" name="placeholder_prefix_edit"/>
+    <layout class="QHBoxLayout" name="prefix_layout"/>
    </item>
   </layout>
  </widget>

rare/ui/components/tabs/settings/rpc.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/rpc.ui'
-#
-# 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.
-
-

rare/ui/components/tabs/settings/wrapper.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'rare/ui/components/tabs/settings/wrapper.ui'
-#
-# 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.
-
-

rare/utils/extra_widgets.py

@@ -418,7 +418,10 @@ class SideTabContainer(QWidget):
             widget.layout().setContentsMargins(0, 0, 9, 0)
         widget.title = self.title
         widget.title.setTitle = self.setTitle
-        self.scroll.setMinimumWidth(widget.sizeHint().width())
+        self.scroll.setMinimumWidth(
+            widget.sizeHint().width()
+            + self.scroll.verticalScrollBar().sizeHint().width()
+        )
         self.scroll.setWidget(widget)
 
         layout = QVBoxLayout()