From 303bd0fd200d662a2e7062be0a5782bd23c491ae Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Tue, 29 Mar 2022 00:14:11 +0300 Subject: [PATCH 1/2] A bunch of minor UI fixes --- misc/rare.desktop | 2 +- rare/components/tabs/settings/__init__.py | 2 +- .../tabs/settings/default_game_settings.py | 3 +- .../tabs/settings/widgets/proton.py | 4 +- .../tabs/games/game_info/game_settings.py | 10 +- .../tabs/games/game_info/game_settings.ui | 18 +- rare/ui/components/tabs/settings/legendary.py | 110 ++-- rare/ui/components/tabs/settings/legendary.ui | 598 +++++++++--------- rare/ui/components/tabs/settings/proton.py | 21 +- rare/ui/components/tabs/settings/proton.ui | 13 +- rare/utils/extra_widgets.py | 5 +- 11 files changed, 371 insertions(+), 415 deletions(-) diff --git a/misc/rare.desktop b/misc/rare.desktop index 47e1954f..bd3f94e7 100644 --- a/misc/rare.desktop +++ b/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 diff --git a/rare/components/tabs/settings/__init__.py b/rare/components/tabs/settings/__init__.py index eeb1e101..a4596e12 100644 --- a/rare/components/tabs/settings/__init__.py +++ b/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") diff --git a/rare/components/tabs/settings/default_game_settings.py b/rare/components/tabs/settings/default_game_settings.py index 3fbca800..6e0c631a 100644 --- a/rare/components/tabs/settings/default_game_settings.py +++ b/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_placeholder.deleteLater() + self.proton_layout.addWidget(self.proton_settings) # FIXME: Remove the spacerItem and margins from the linux settings # FIXME: This should be handled differently at soem point in the future diff --git a/rare/components/tabs/settings/widgets/proton.py b/rare/components/tabs/settings/widgets/proton.py index 96145c5b..2f55fed0 100644 --- a/rare/components/tabs/settings/widgets/proton.py +++ b/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.placeholder_prefix_edit.deleteLater() + self.prefix_layout.addWidget(self.proton_prefix) def change_proton(self, i): if not self.changeable: diff --git a/rare/ui/components/tabs/games/game_info/game_settings.py b/rare/ui/components/tabs/games/game_info/game_settings.py index 8d15aa57..1eb36ad6 100644 --- a/rare/ui/components/tabs/games/game_info/game_settings.py +++ b/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_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 = QtWidgets.QVBoxLayout() 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) diff --git a/rare/ui/components/tabs/games/game_info/game_settings.ui b/rare/ui/components/tabs/games/game_info/game_settings.ui index 9e28ab37..eaf6f46d 100644 --- a/rare/ui/components/tabs/games/game_info/game_settings.ui +++ b/rare/ui/components/tabs/games/game_info/game_settings.ui @@ -6,8 +6,8 @@ 0 0 - 558 - 357 + 448 + 310 @@ -102,12 +102,6 @@ - - - 400 - 0 - - parameters @@ -157,13 +151,7 @@ - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + diff --git a/rare/ui/components/tabs/settings/legendary.py b/rare/ui/components/tabs/settings/legendary.py index f98146af..ca1ca9f0 100644 --- a/rare/ui/components/tabs/settings/legendary.py +++ b/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.gridLayout.setObjectName("gridLayout") - 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.legendary_layout = QtWidgets.QHBoxLayout(LegendarySettings) + self.legendary_layout.setObjectName("legendary_layout") 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.gridLayout.addLayout(self.left_layout, 0, 0, 1, 1) + self.right_layout.addItem(spacerItem1) + 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__": diff --git a/rare/ui/components/tabs/settings/legendary.ui b/rare/ui/components/tabs/settings/legendary.ui index ee6dc545..1ab099f8 100644 --- a/rare/ui/components/tabs/settings/legendary.ui +++ b/rare/ui/components/tabs/settings/legendary.ui @@ -1,323 +1,289 @@ - LegendarySettings - - - - 0 - 0 - 552 - 312 - + LegendarySettings + + + + 0 + 0 + 552 + 334 + + + + LegendarySettings + + + + + + + + Default Installation Directory + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + Download Settings + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - LegendarySettings - - - - - - Clean, but keep manifests - - - - - - - Remove everything - - - - - - - - - Game metadata + + + + + 0 + 0 + + + + Max Workers + + + + + + + + + + 0 + 0 + - - - - - Load 32 bit data - - - - - - - Load MacOS data - - - - - - - Refresh game meta - - - - - - - - - - Qt::Vertical + + 0 - - - 20 - 40 - + + 16 - - - - - - - - Default Installation Directory - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - Download Settings - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 0 - 0 - - - - Max Workers - - - - - - - - - - 0 - 0 - - - - 0 - - - 16 - - - 0 - - - - - - - - true - - - - Less is slower (0: Default) - - - - - - - - - Max Memory - - - - - - - - - - 0 - 0 - - - - MiB - - - 0 - - - 10240 - - - 128 - - - 1024 - - - - - - - - true - - - - Less is slower (0: Default) - - - - - - - - - Preferred CDN - - - - - - - Default - - - - - - - Disable HTTPS - - - - - - - - - - - - - - - - - Link Ubisoft Games - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - 0 - 0 - - - - Locale - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - Cleanup - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - Clean, but keep manifests - - - - - - - Remove everything - - - - - - - Refresh game meta - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - + + 0 + + + + + + + + true + + + + Less is slower (0: Default) + + + + + + + + + Max Memory + + + + + + + + + + 0 + 0 + + + + MiB + + + 0 + + + 10240 + + + 128 + + + 1024 + + + + + + + + true + + + + Less is slower (0: Default) + + + + + + + + + Preferred CDN + + + + + + + Default + + + + + + + Disable HTTPS + + + + + + + + + + + + + + + + + Link Ubisoft Games + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + 0 + 0 + + + + Locale + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + Cleanup + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + Clean, but keep manifests + + + + + + + Remove everything + + + + + + + + + + Game metadata + + + + + + Load 32bit data + + + + + + + Load MacOS data + + + + + + + Refresh game meta + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + diff --git a/rare/ui/components/tabs/settings/proton.py b/rare/ui/components/tabs/settings/proton.py index cb81927c..8a400f33 100644 --- a/rare/ui/components/tabs/settings/proton.py +++ b/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.setWindowTitle("GroupBox") - self.formLayout = QtWidgets.QFormLayout(ProtonSettings) - self.formLayout.setObjectName("formLayout") + ProtonSettings.resize(190, 86) + ProtonSettings.setWindowTitle("ProtonSettings") + self.proton_settings_layout = QtWidgets.QFormLayout(ProtonSettings) + 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.placeholder_prefix_edit = QtWidgets.QLineEdit(ProtonSettings) - self.placeholder_prefix_edit.setObjectName("placeholder_prefix_edit") - self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.placeholder_prefix_edit) + self.proton_settings_layout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.proton_prefix_label) + self.prefix_layout = QtWidgets.QHBoxLayout() + self.prefix_layout.setObjectName("prefix_layout") + self.proton_settings_layout.setLayout(1, QtWidgets.QFormLayout.FieldRole, self.prefix_layout) self.retranslateUi(ProtonSettings) QtCore.QMetaObject.connectSlotsByName(ProtonSettings) diff --git a/rare/ui/components/tabs/settings/proton.ui b/rare/ui/components/tabs/settings/proton.ui index 1a627552..6b850d17 100644 --- a/rare/ui/components/tabs/settings/proton.ui +++ b/rare/ui/components/tabs/settings/proton.ui @@ -6,17 +6,20 @@ 0 0 - 400 - 300 + 190 + 86 - GroupBox + ProtonSettings Proton Settings - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -47,7 +50,7 @@ - + diff --git a/rare/utils/extra_widgets.py b/rare/utils/extra_widgets.py index d0611fef..117f0516 100644 --- a/rare/utils/extra_widgets.py +++ b/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() From 6249bd19bbb7f2469c0d23b5ec646ee09a2170dc Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Wed, 30 Mar 2022 01:51:23 +0300 Subject: [PATCH 2/2] Remove py files for the settings widgets from the old location --- rare/components/tabs/settings/widgets/env_vars.py | 3 +-- rare/ui/components/tabs/settings/dxvk.py | 10 ---------- rare/ui/components/tabs/settings/eos_widget.py | 10 ---------- rare/ui/components/tabs/settings/overlay.py | 10 ---------- rare/ui/components/tabs/settings/rpc.py | 10 ---------- .../tabs/{games => settings/widgets}/env_vars.py | 0 .../tabs/{games => settings/widgets}/env_vars.ui | 0 rare/ui/components/tabs/settings/wrapper.py | 10 ---------- 8 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 rare/ui/components/tabs/settings/dxvk.py delete mode 100644 rare/ui/components/tabs/settings/eos_widget.py delete mode 100644 rare/ui/components/tabs/settings/overlay.py delete mode 100644 rare/ui/components/tabs/settings/rpc.py rename rare/ui/components/tabs/{games => settings/widgets}/env_vars.py (100%) rename rare/ui/components/tabs/{games => settings/widgets}/env_vars.ui (100%) delete mode 100644 rare/ui/components/tabs/settings/wrapper.py diff --git a/rare/components/tabs/settings/widgets/env_vars.py b/rare/components/tabs/settings/widgets/env_vars.py index 0d556ea3..b1ab3216 100644 --- a/rare/components/tabs/settings/widgets/env_vars.py +++ b/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") diff --git a/rare/ui/components/tabs/settings/dxvk.py b/rare/ui/components/tabs/settings/dxvk.py deleted file mode 100644 index 45fa48ea..00000000 --- a/rare/ui/components/tabs/settings/dxvk.py +++ /dev/null @@ -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. - - diff --git a/rare/ui/components/tabs/settings/eos_widget.py b/rare/ui/components/tabs/settings/eos_widget.py deleted file mode 100644 index f59e5b24..00000000 --- a/rare/ui/components/tabs/settings/eos_widget.py +++ /dev/null @@ -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. - - diff --git a/rare/ui/components/tabs/settings/overlay.py b/rare/ui/components/tabs/settings/overlay.py deleted file mode 100644 index 80696c6d..00000000 --- a/rare/ui/components/tabs/settings/overlay.py +++ /dev/null @@ -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. - - diff --git a/rare/ui/components/tabs/settings/rpc.py b/rare/ui/components/tabs/settings/rpc.py deleted file mode 100644 index 3292fe36..00000000 --- a/rare/ui/components/tabs/settings/rpc.py +++ /dev/null @@ -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. - - diff --git a/rare/ui/components/tabs/games/env_vars.py b/rare/ui/components/tabs/settings/widgets/env_vars.py similarity index 100% rename from rare/ui/components/tabs/games/env_vars.py rename to rare/ui/components/tabs/settings/widgets/env_vars.py diff --git a/rare/ui/components/tabs/games/env_vars.ui b/rare/ui/components/tabs/settings/widgets/env_vars.ui similarity index 100% rename from rare/ui/components/tabs/games/env_vars.ui rename to rare/ui/components/tabs/settings/widgets/env_vars.ui diff --git a/rare/ui/components/tabs/settings/wrapper.py b/rare/ui/components/tabs/settings/wrapper.py deleted file mode 100644 index 04e80baf..00000000 --- a/rare/ui/components/tabs/settings/wrapper.py +++ /dev/null @@ -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. - -