CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-29 11:40:37 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #194 from loathingKernel/ui_fixes

Browse source 
A bunch of minor UI fixes
This commit is contained in:
Dummerle 2022-03-30 21:35:47 +02:00 committed by GitHub
parent ab385f334d 6249bd19bb
commit 0ba2ce8fdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 372 additions and 467 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
misc/rare.desktop
View file

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

2
rare/components/tabs/settings/__init__.py
View file

@ -17,7 +17,7 @@ class SettingsTab(SideTabWidget):
self.addTab(LegendarySettings(), "Legendary") 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.about = About()
self.addTab(self.about, "About", "About") self.addTab(self.about, "About", "About")

3
rare/components/tabs/settings/default_game_settings.py
View file

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

3
rare/components/tabs/settings/widgets/env_vars.py
View file

@ -1,12 +1,11 @@
from logging import getLogger from logging import getLogger
import qtawesome import qtawesome
from PyQt5.QtCore import Qt, QFileSystemWatcher from PyQt5.QtCore import Qt, QFileSystemWatcher
from PyQt5.QtWidgets import QGroupBox, QTableWidgetItem, QMessageBox, QPushButton from PyQt5.QtWidgets import QGroupBox, QTableWidgetItem, QMessageBox, QPushButton
from rare.shared import LegendaryCoreSingleton 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 from rare.utils import config_helper
logger = getLogger("EnvVars") logger = getLogger("EnvVars")

4
rare/components/tabs/settings/widgets/proton.py
View file

@ -14,6 +14,7 @@ from rare.shared import LegendaryCoreSingleton
logger = getLogger("Proton") logger = getLogger("Proton")
def find_proton_combos(): def find_proton_combos():
possible_proton_combos = [] possible_proton_combos = []
compatibilitytools_dirs = [ compatibilitytools_dirs = [
@ -60,8 +61,7 @@ class ProtonSettings(QGroupBox, Ui_ProtonSettings):
save_func=self.proton_prefix_save, save_func=self.proton_prefix_save,
placeholder=self.tr("Please select path for proton prefix") 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): def change_proton(self, i):
if not self.changeable: if not self.changeable:

10
rare/ui/components/tabs/games/game_info/game_settings.py
View file

@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_GameSettings(object): class Ui_GameSettings(object):
def setupUi(self, GameSettings): def setupUi(self, GameSettings):
GameSettings.setObjectName("GameSettings") GameSettings.setObjectName("GameSettings")
GameSettings.resize(558, 357) GameSettings.resize(448, 310)
self.game_settings_layout = QtWidgets.QVBoxLayout(GameSettings) self.game_settings_layout = QtWidgets.QVBoxLayout(GameSettings)
self.game_settings_layout.setObjectName("game_settings_layout") self.game_settings_layout.setObjectName("game_settings_layout")
self.launch_settings_group = QtWidgets.QGroupBox(GameSettings) 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_params_label.setObjectName("launch_params_label")
self.launch_settings_layout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.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 = QtWidgets.QLineEdit(self.launch_settings_group)
self.launch_params.setMinimumSize(QtCore.QSize(400, 0))
self.launch_params.setObjectName("launch_params") self.launch_params.setObjectName("launch_params")
self.launch_settings_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.launch_params) self.launch_settings_layout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.launch_params)
self.override_exe_label = QtWidgets.QLabel(self.launch_settings_group) 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_sync.setObjectName("cloud_sync")
self.cloud_layout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cloud_sync) self.cloud_layout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.cloud_sync)
self.game_settings_layout.addWidget(self.cloud_group) 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.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 = QtWidgets.QWidget(GameSettings)
self.linux_settings_widget.setObjectName("linux_settings_widget") self.linux_settings_widget.setObjectName("linux_settings_widget")
self.linux_settings_layout = QtWidgets.QVBoxLayout(self.linux_settings_widget) self.linux_settings_layout = QtWidgets.QVBoxLayout(self.linux_settings_widget)

18
rare/ui/components/tabs/games/game_info/game_settings.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>558</width> <width>448</width>
<height>357</height> <height>310</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -102,12 +102,6 @@
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="launch_params"> <widget class="QLineEdit" name="launch_params">
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<property name="placeholderText"> <property name="placeholderText">
<string>parameters</string> <string>parameters</string>
</property> </property>
@ -157,13 +151,7 @@
</widget> </widget>
</item> </item>
<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>
<item> <item>
<widget class="QWidget" name="linux_settings_widget" native="true"> <widget class="QWidget" name="linux_settings_widget" native="true">

10
rare/ui/components/tabs/settings/dxvk.py
View file

@ -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.

10
rare/ui/components/tabs/settings/eos_widget.py
View file

@ -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.

110
rare/ui/components/tabs/settings/legendary.py
View file

@ -14,52 +14,10 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_LegendarySettings(object): class Ui_LegendarySettings(object):
def setupUi(self, LegendarySettings): def setupUi(self, LegendarySettings):
LegendarySettings.setObjectName("LegendarySettings") LegendarySettings.setObjectName("LegendarySettings")
LegendarySettings.resize(654, 498) LegendarySettings.resize(552, 334)
LegendarySettings.setWindowTitle("LegendarySettings") 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 = QtWidgets.QVBoxLayout()
self.left_layout.setObjectName("left_layout") self.left_layout.setObjectName("left_layout")
self.install_dir_group = QtWidgets.QGroupBox(LegendarySettings) self.install_dir_group = QtWidgets.QGroupBox(LegendarySettings)
@ -146,23 +104,57 @@ class Ui_LegendarySettings(object):
self.verticalLayout = QtWidgets.QVBoxLayout(self.ubisoft_gb) self.verticalLayout = QtWidgets.QVBoxLayout(self.ubisoft_gb)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName("verticalLayout")
self.left_layout.addWidget(self.ubisoft_gb, 0, QtCore.Qt.AlignTop) 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) 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) self.retranslateUi(LegendarySettings)
QtCore.QMetaObject.connectSlotsByName(LegendarySettings) QtCore.QMetaObject.connectSlotsByName(LegendarySettings)
def retranslateUi(self, LegendarySettings): def retranslateUi(self, LegendarySettings):
_translate = QtCore.QCoreApplication.translate _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.install_dir_group.setTitle(_translate("LegendarySettings", "Default Installation Directory"))
self.download_group.setTitle(_translate("LegendarySettings", "Download Settings")) self.download_group.setTitle(_translate("LegendarySettings", "Download Settings"))
self.max_workers_label.setText(_translate("LegendarySettings", "Max Workers")) 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.preferred_cdn_line.setPlaceholderText(_translate("LegendarySettings", "Default"))
self.disable_https_label.setText(_translate("LegendarySettings", "Disable HTTPS")) self.disable_https_label.setText(_translate("LegendarySettings", "Disable HTTPS"))
self.ubisoft_gb.setTitle(_translate("LegendarySettings", "Link Ubisoft Games")) 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__": if __name__ == "__main__":

598
rare/ui/components/tabs/settings/legendary.ui
View file

@ -1,323 +1,289 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>LegendarySettings</class> <class>LegendarySettings</class>
<widget class="QWidget" name="LegendarySettings"> <widget class="QWidget" name="LegendarySettings">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>552</width> <width>552</width>
<height>312</height> <height>334</height>
</rect> </rect>
</property>
<property name="windowTitle">
<string notr="true">LegendarySettings</string>
</property>
<layout class="QHBoxLayout" name="legendary_layout">
<item>
<layout class="QVBoxLayout" name="left_layout">
<item alignment="Qt::AlignTop">
<widget class="QGroupBox" name="install_dir_group">
<property name="title">
<string>Default Installation Directory</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<layout class="QVBoxLayout" name="install_dir_layout"/>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QGroupBox" name="download_group">
<property name="title">
<string>Download Settings</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<layout class="QFormLayout" name="download_layout">
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="windowTitle"> <item row="0" column="0">
<string notr="true">LegendarySettings</string> <widget class="QLabel" name="max_workers_label">
</property> <property name="sizePolicy">
<layout class="QHBoxLayout" name="legendary_layout"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<item> <horstretch>0</horstretch>
<widget class="QPushButton" name="clean_keep_manifests_button"> <verstretch>0</verstretch>
<property name="text"> </sizepolicy>
<string>Clean, but keep manifests</string> </property>
</property> <property name="text">
</widget> <string>Max Workers</string>
</item> </property>
<item> </widget>
<widget class="QPushButton" name="clean_button"> </item>
<property name="text"> <item row="0" column="1">
<string>Remove everything</string> <layout class="QHBoxLayout" name="max_workers_layout">
</property> <item>
</widget> <widget class="QSpinBox" name="max_worker_spin">
</item> <property name="sizePolicy">
</layout> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
</widget> <horstretch>0</horstretch>
<item> <verstretch>0</verstretch>
<widget class="QGroupBox" name="meta_group"> </sizepolicy>
<property name="title">
<string>Game metadata</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <property name="minimum">
<item> <number>0</number>
<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>
<property name="sizeHint" stdset="0"> <property name="maximum">
<size> <number>16</number>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer> <property name="value">
</item> <number>0</number>
<item row="0" column="0"> </property>
<layout class="QVBoxLayout" name="left_layout"> </widget>
<item alignment="Qt::AlignTop"> </item>
<widget class="QGroupBox" name="install_dir_group"> <item>
<property name="title"> <widget class="QLabel" name="max_workers_info_label">
<string>Default Installation Directory</string> <property name="font">
</property> <font>
<property name="alignment"> <italic>true</italic>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> </font>
</property> </property>
<layout class="QVBoxLayout" name="install_dir_layout"/> <property name="text">
</widget> <string>Less is slower (0: Default)</string>
</item> </property>
<item alignment="Qt::AlignTop"> </widget>
<widget class="QGroupBox" name="download_group"> </item>
<property name="title"> </layout>
<string>Download Settings</string> </item>
</property> <item row="1" column="0">
<property name="alignment"> <widget class="QLabel" name="max_memory_label">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <property name="text">
</property> <string>Max Memory</string>
<layout class="QFormLayout" name="download_layout"> </property>
<property name="labelAlignment"> </widget>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </item>
</property> <item row="1" column="1">
<item row="0" column="0"> <layout class="QHBoxLayout" name="max_memory_layout">
<widget class="QLabel" name="max_workers_label"> <item>
<property name="sizePolicy"> <widget class="QSpinBox" name="max_memory_spin">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <property name="sizePolicy">
<horstretch>0</horstretch> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<verstretch>0</verstretch> <horstretch>0</horstretch>
</sizepolicy> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="text"> </property>
<string>Max Workers</string> <property name="suffix">
</property> <string>MiB</string>
</widget> </property>
</item> <property name="minimum">
<item row="0" column="1"> <number>0</number>
<layout class="QHBoxLayout" name="max_workers_layout"> </property>
<item> <property name="maximum">
<widget class="QSpinBox" name="max_worker_spin"> <number>10240</number>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <property name="singleStep">
<horstretch>0</horstretch> <number>128</number>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="value">
</property> <number>1024</number>
<property name="minimum"> </property>
<number>0</number> </widget>
</property> </item>
<property name="maximum"> <item>
<number>16</number> <widget class="QLabel" name="max_memory_info_label">
</property> <property name="font">
<property name="value"> <font>
<number>0</number> <italic>true</italic>
</property> </font>
</widget> </property>
</item> <property name="text">
<item> <string>Less is slower (0: Default)</string>
<widget class="QLabel" name="max_workers_info_label"> </property>
<property name="font"> </widget>
<font> </item>
<italic>true</italic> </layout>
</font> </item>
</property> <item row="2" column="0">
<property name="text"> <widget class="QLabel" name="preferred_cdn_label">
<string>Less is slower (0: Default)</string> <property name="text">
</property> <string>Preferred CDN</string>
</widget> </property>
</item> </widget>
</layout> </item>
</item> <item row="2" column="1">
<item row="1" column="0"> <widget class="QLineEdit" name="preferred_cdn_line">
<widget class="QLabel" name="max_memory_label"> <property name="placeholderText">
<property name="text"> <string>Default</string>
<string>Max Memory</string> </property>
</property> </widget>
</widget> </item>
</item> <item row="3" column="0">
<item row="1" column="1"> <widget class="QLabel" name="disable_https_label">
<layout class="QHBoxLayout" name="max_memory_layout"> <property name="text">
<item> <string>Disable HTTPS</string>
<widget class="QSpinBox" name="max_memory_spin"> </property>
<property name="sizePolicy"> </widget>
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> </item>
<horstretch>0</horstretch> <item row="3" column="1">
<verstretch>0</verstretch> <widget class="QCheckBox" name="disable_https_check">
</sizepolicy> <property name="text">
</property> <string/>
<property name="suffix"> </property>
<string>MiB</string> </widget>
</property> </item>
<property name="minimum"> </layout>
<number>0</number> </widget>
</property> </item>
<property name="maximum"> <item alignment="Qt::AlignTop">
<number>10240</number> <widget class="QGroupBox" name="ubisoft_gb">
</property> <property name="title">
<property name="singleStep"> <string>Link Ubisoft Games</string>
<number>128</number> </property>
</property> <property name="alignment">
<property name="value"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<number>1024</number> </property>
</property> <layout class="QVBoxLayout" name="verticalLayout"/>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="max_memory_info_label"> <spacer name="left_vspacer">
<property name="font"> <property name="orientation">
<font> <enum>Qt::Vertical</enum>
<italic>true</italic> </property>
</font> <property name="sizeHint" stdset="0">
</property> <size>
<property name="text"> <width>20</width>
<string>Less is slower (0: Default)</string> <height>40</height>
</property> </size>
</widget> </property>
</item> </spacer>
</layout> </item>
</item> </layout>
<item row="2" column="0"> </item>
<widget class="QLabel" name="preferred_cdn_label"> <item>
<property name="text"> <layout class="QVBoxLayout" name="right_layout">
<string>Preferred CDN</string> <item alignment="Qt::AlignTop">
</property> <widget class="QGroupBox" name="locale_group">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<item row="2" column="1"> <horstretch>0</horstretch>
<widget class="QLineEdit" name="preferred_cdn_line"> <verstretch>0</verstretch>
<property name="placeholderText"> </sizepolicy>
<string>Default</string> </property>
</property> <property name="title">
</widget> <string>Locale</string>
</item> </property>
<item row="3" column="0"> <property name="alignment">
<widget class="QLabel" name="disable_https_label"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<property name="text"> </property>
<string>Disable HTTPS</string> <layout class="QVBoxLayout" name="locale_layout"/>
</property> </widget>
</widget> </item>
</item> <item alignment="Qt::AlignTop">
<item row="3" column="1"> <widget class="QGroupBox" name="cleanup_group">
<widget class="QCheckBox" name="disable_https_check"> <property name="title">
<property name="text"> <string>Cleanup</string>
<string/> </property>
</property> <property name="alignment">
</widget> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</item> </property>
</layout> <layout class="QVBoxLayout" name="cleanup_layout">
</widget> <item>
</item> <widget class="QPushButton" name="clean_keep_manifests_button">
<item alignment="Qt::AlignTop"> <property name="text">
<widget class="QGroupBox" name="ubisoft_gb"> <string>Clean, but keep manifests</string>
<property name="title"> </property>
<string>Link Ubisoft Games</string> </widget>
</property> </item>
<property name="alignment"> <item>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <widget class="QPushButton" name="clean_button">
</property> <property name="text">
<layout class="QVBoxLayout" name="verticalLayout"/> <string>Remove everything</string>
</widget> </property>
</item> </widget>
<item> </item>
<spacer name="left_vspacer"> </layout>
<property name="orientation"> </widget>
<enum>Qt::Vertical</enum> </item>
</property> <item>
<property name="sizeHint" stdset="0"> <widget class="QGroupBox" name="meta_group">
<size> <property name="title">
<width>20</width> <string>Game metadata</string>
<height>40</height> </property>
</size> <layout class="QVBoxLayout" name="verticalLayout_2">
</property> <item>
</spacer> <widget class="QCheckBox" name="win32_cb">
</item> <property name="text">
</layout> <string>Load 32bit data</string>
</item> </property>
<item> </widget>
<layout class="QVBoxLayout" name="right_layout"> </item>
<item alignment="Qt::AlignTop"> <item>
<widget class="QGroupBox" name="locale_group"> <widget class="QCheckBox" name="mac_cb">
<property name="sizePolicy"> <property name="text">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <string>Load MacOS data</string>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> </widget>
</sizepolicy> </item>
</property> <item>
<property name="title"> <widget class="QPushButton" name="refresh_game_meta_btn">
<string>Locale</string> <property name="text">
</property> <string>Refresh game meta</string>
<property name="alignment"> </property>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> </widget>
</property> </item>
<layout class="QVBoxLayout" name="locale_layout"/> </layout>
</widget> </widget>
</item> </item>
<item alignment="Qt::AlignTop"> <item>
<widget class="QGroupBox" name="cleanup_group"> <spacer name="right_vspacer">
<property name="title"> <property name="orientation">
<string>Cleanup</string> <enum>Qt::Vertical</enum>
</property> </property>
<property name="alignment"> <property name="sizeHint" stdset="0">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <size>
</property> <width>20</width>
<layout class="QVBoxLayout" name="cleanup_layout"> <height>40</height>
<item> </size>
<widget class="QPushButton" name="clean_keep_manifests_button"> </property>
<property name="text"> </spacer>
<string>Clean, but keep manifests</string> </item>
</property> </layout>
</widget> </item>
</item> </layout>
<item> </widget>
<widget class="QPushButton" name="clean_button"> <resources/>
<property name="text"> <connections/>
<string>Remove everything</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>
</layout>
</item>
<resources/>
<connections/>
</ui> </ui>

10
rare/ui/components/tabs/settings/overlay.py
View file

@ -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.

21
rare/ui/components/tabs/settings/proton.py
View file

@ -14,13 +14,14 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_ProtonSettings(object): class Ui_ProtonSettings(object):
def setupUi(self, ProtonSettings): def setupUi(self, ProtonSettings):
ProtonSettings.setObjectName("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 = QtWidgets.QLabel(ProtonSettings)
self.proton_wrapper_label.setObjectName("proton_wrapper_label") 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) self.proton_combo = QtWidgets.QComboBox(ProtonSettings)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
@ -29,13 +30,13 @@ class Ui_ProtonSettings(object):
self.proton_combo.setSizePolicy(sizePolicy) self.proton_combo.setSizePolicy(sizePolicy)
self.proton_combo.setObjectName("proton_combo") self.proton_combo.setObjectName("proton_combo")
self.proton_combo.addItem("") 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 = QtWidgets.QLabel(ProtonSettings)
self.proton_prefix_label.setObjectName("proton_prefix_label") 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) self.retranslateUi(ProtonSettings)
QtCore.QMetaObject.connectSlotsByName(ProtonSettings) QtCore.QMetaObject.connectSlotsByName(ProtonSettings)

13
rare/ui/components/tabs/settings/proton.ui
View file

@ -6,17 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>190</width>
<height>300</height> <height>86</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string notr="true">GroupBox</string> <string notr="true">ProtonSettings</string>
</property> </property>
<property name="title"> <property name="title">
<string>Proton Settings</string> <string>Proton Settings</string>
</property> </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"> <item row="0" column="0">
<widget class="QLabel" name="proton_wrapper_label"> <widget class="QLabel" name="proton_wrapper_label">
<property name="text"> <property name="text">
@ -47,7 +50,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="placeholder_prefix_edit"/> <layout class="QHBoxLayout" name="prefix_layout"/>
</item> </item>
</layout> </layout>
</widget> </widget>

10
rare/ui/components/tabs/settings/rpc.py
View file

@ -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.

0
rare/ui/components/tabs/games/env_vars.py → rare/ui/components/tabs/settings/widgets/env_vars.py
View file

0
rare/ui/components/tabs/games/env_vars.ui → rare/ui/components/tabs/settings/widgets/env_vars.ui
View file

10
rare/ui/components/tabs/settings/wrapper.py
View file

@ -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.

5
rare/utils/extra_widgets.py
View file

@ -418,7 +418,10 @@ class SideTabContainer(QWidget):
widget.layout().setContentsMargins(0, 0, 9, 0) widget.layout().setContentsMargins(0, 0, 9, 0)
widget.title = self.title widget.title = self.title
widget.title.setTitle = self.setTitle 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) self.scroll.setWidget(widget)
layout = QVBoxLayout() layout = QVBoxLayout()