diff --git a/rare/components/dialogs/launch.py b/rare/components/dialogs/launch.py index 63119f50ca..8e3522569a 100644 --- a/rare/components/dialogs/launch.py +++ b/rare/components/dialogs/launch.py @@ -1,4 +1,5 @@ from PySide6.QtCore import Qt, Signal, Slot +from PySide6.QtWidgets import QLabel from requests.exceptions import ConnectionError, HTTPError from rare.shared import RareCore @@ -31,7 +32,18 @@ def __init__(self, rcore: RareCore, parent=None): self.progress_info = ElideLabel(parent=self) self.progress_info.setFixedHeight(False) - self.ui.launch_layout.addWidget(self.progress_info) + self.progress_info.setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop) + self.ui.launch_layout.insertWidget( + self.ui.launch_layout.indexOf(self.ui.progress_bar) + 1, self.progress_info + ) + self.ui.info_label.setObjectName('InfoLabel') + + self.ui.launch_layout.setStretch( + self.ui.launch_layout.indexOf(self.ui.title_label), 2 + ) + self.ui.launch_layout.setStretch( + self.ui.launch_layout.indexOf(self.progress_info), 2 + ) self.rcore = rcore self.rcore.progress.connect(self.__on_progress) diff --git a/rare/components/dialogs/login/__init__.py b/rare/components/dialogs/login/__init__.py index d75a5d2342..45600367ae 100644 --- a/rare/components/dialogs/login/__init__.py +++ b/rare/components/dialogs/login/__init__.py @@ -20,6 +20,8 @@ def __init__(self, parent=None): self.setFrameStyle(QFrame.Shape.StyledPanel) self.ui = Ui_LandingPage() self.ui.setupUi(self) + self.ui.login_browser_label.setObjectName('InfoLabel') + self.ui.login_import_label.setObjectName('InfoLabel') class LoginDialog(BaseDialog): @@ -76,6 +78,7 @@ def __init__(self, args: Namespace, core: LegendaryCore, parent=None): ), } self.ui.info_label.setText(self.info_message[self.landing_index]) + self.ui.info_label.setObjectName('InfoLabel') self.login_stack.setMinimumWidth(640) self.login_stack.setMinimumHeight(180) diff --git a/rare/components/tabs/integrations/egl_sync_group.py b/rare/components/tabs/integrations/egl_sync_group.py index 516a4b71a7..3eab72dfe6 100644 --- a/rare/components/tabs/integrations/egl_sync_group.py +++ b/rare/components/tabs/integrations/egl_sync_group.py @@ -7,7 +7,7 @@ from legendary.models.egl import EGLManifest from legendary.models.game import InstalledGame from PySide6.QtCore import QRunnable, Qt, QThreadPool, Signal, Slot -from PySide6.QtGui import QShowEvent +from PySide6.QtGui import QFont, QShowEvent from PySide6.QtWidgets import ( QFileDialog, QFormLayout, @@ -97,13 +97,15 @@ def showEvent(self, a0: QShowEvent) -> None: super().showEvent(a0) def __run_wine_resolver(self): + font = QFont() + font.setItalic(True) + self.egl_path_info.setFont(font) self.egl_path_info.setText(self.tr('Updating...')) wine_resolver = WinePathResolver(self.core, 'default', str(PathSpec.egl_programdata())) wine_resolver.signals.result_ready.connect(self.__on_wine_resolver_result) QThreadPool.globalInstance().start(wine_resolver) def __on_wine_resolver_result(self, path): - self.egl_path_info.setText(path) if not path: self.egl_path_info.setText( self.tr('Default Wine prefix is unset, or path does not exist. Create it or configure it in Settings -> Linux.') @@ -116,6 +118,8 @@ def __on_wine_resolver_result(self, path): ) ) else: + self.egl_path_info.setFont(QFont('monospace')) + self.egl_path_info.setText(path) self.egl_path_edit.setText(path) @staticmethod diff --git a/rare/components/tabs/integrations/eos_group.py b/rare/components/tabs/integrations/eos_group.py index 95e7e1814a..7a94c62c84 100644 --- a/rare/components/tabs/integrations/eos_group.py +++ b/rare/components/tabs/integrations/eos_group.py @@ -72,6 +72,7 @@ def __init__(self, overlay: RareEosOverlay, prefix: str | None, parent=None): self.overlay_label = ElideLabel(parent=self) self.overlay_label.setDisabled(True) self.overlay_label.setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter) + self.overlay_label.setObjectName('InfoLabel') self.path_select = QComboBox(self) self.path_select.setMaximumWidth(150) diff --git a/rare/components/tabs/integrations/import_group.py b/rare/components/tabs/integrations/import_group.py index 3e3b0301f2..2c80557de5 100644 --- a/rare/components/tabs/integrations/import_group.py +++ b/rare/components/tabs/integrations/import_group.py @@ -156,6 +156,7 @@ def __init__(self, rcore: RareCore, parent=None): self.ui = Ui_ImportGroup() self.ui.setupUi(self) + self.ui.platform_info.setObjectName('InfoLabel') self.worker: ImportWorker | None = None self.threadpool = QThreadPool.globalInstance() diff --git a/rare/components/tabs/settings/legendary.py b/rare/components/tabs/settings/legendary.py index 6c01ab9420..903a0c16aa 100644 --- a/rare/components/tabs/settings/legendary.py +++ b/rare/components/tabs/settings/legendary.py @@ -45,6 +45,9 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent=None): self.ui = Ui_LegendarySettings() self.ui.setupUi(self) + self.ui.max_workers_info_label.setObjectName('InfoLabel') + self.ui.max_memory_info_label.setObjectName('InfoLabel') + self.ui.metadata_info.setObjectName('InfoLabel') self.settings = settings self.rcore = rcore diff --git a/rare/components/tabs/settings/rare.py b/rare/components/tabs/settings/rare.py index fd75774324..7ae4f75084 100644 --- a/rare/components/tabs/settings/rare.py +++ b/rare/components/tabs/settings/rare.py @@ -37,6 +37,7 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent=None): self.ui = Ui_RareSettings() self.ui.setupUi(self) + self.ui.interface_info.setObjectName('InfoLabel') # Select lang self.ui.lang_select.addItem(self.tr('System default'), app_settings.language.default) diff --git a/rare/resources/static_css/__init__.py b/rare/resources/static_css/__init__.py index ee46889d01..f097927e19 100644 --- a/rare/resources/static_css/__init__.py +++ b/rare/resources/static_css/__init__.py @@ -6,65 +6,65 @@ from PySide6 import QtCore qt_resource_data = b"\ -\x00\x00\x03\x82\ +\x00\x00\x03\x88\ \x00\ -\x00\x0f\xa5x\x9c\xbdW]\x8f\xd2@\x14}\xe7W\xcc\ -BH\xdc\x8d`?h\x81\x1a_V\x8d1q]7\ -\xa0>\x18\x1f\xa6\x9dK;\xd92\xd3L\xa7\x02\x1a\xff\ -\xbbSZ\xa0\x85v@\xa3n\x08t\xe7\xe3\x9c{\xcf\ -\xbd\xbdw\xe6\xd9\x0d\x9aG4E\x0b\x1a\x03R\xbf8\ -\x93|\x10\x02\x03\x81%\x10\xb4\x10|\x89\xba\xa9\xdc\xc4\ -\x90F\x00r\x98l\xbaC\xf4\xea\x1e\xbd\xbf\x9f\xa3\xd7\ -\xaf\xde\xce\xaf\xae\xae\xd0\xcd\xb3N\xe7\xe1C\x96F\xb7\ -\x99\x94\x9c\xa1\x1f\x1d\xa4\xfe\x96\x94\x0d\x22\xa0a$=\ -d\x0d\xc7\x0e\xac\x9fw~\xaau\x82\x87\x02\xd2\xf4\x16\ -\x0b\xfd\xc2YB\xd9-_\xeb\x17\xcd9\x8f/a}\ -G\x19\xbc&T\xeaW\xbd\xe4K\x9f\x9f\xe5\x19\ -k\xd1G\xee9tBS\xec\xc7*o[\x08\xec@\ -K`MN\x09>2z^\x98\x5c\x16\x0d\xb2[N\ -k\x91u\xd2\xe4\xc2h\xf0sa\xce\xe3\xeb\xc5\xc9\xa5\ -\xd1P\xe4\xd2\x9cR|\x02A\x17\x1b\x9d2\xae\xef\x8c\ -\xad\xa0\x15\xd6v\xac\xc0tu\xb0:YFc\x1b\x9b\ -\xa4\xddf\xdf\xb2MS\x0b~F\x93\xd2\xba6\xfc\x91\ -I\x0c8\xc6\xbfS\xf6\xea\x14\xb1\x0c\xd7q\xdb\x151\ -\x0d\xdb\xb2O\x149\x80\xea\xf40\xdd\x91=\x9a\xb4'\ -8\xb1&\x96\xaf\x81\xd6\xab\xb1\xb3\xac\x0d\xdd\xb7,k\ -T)V\x0f\x19d\xf0\x99\x8bG\x10\xd5\x9aU\xa2\xae\ -(\x91\x91\x87\xcc\xa32Y\xd6\xae\x94\xc7\x944\xd6O\ -;Yk8\xbe\xac\xb6\xcfr\x93\xc0\x8bn\x11\xe9b\ -\xf6\xa8>\xffA~^@\x98K\xa9\xa7\xbb<\xf8\x17\ -\xd0\xbd\x8cyFf\x1b\x16\x9cq\x91\xb8S\xb7=+\ -\xec\xb1\xed\xd8\xd5\xb8\xed:\xf4\xe5A\xdb\xf7\xb6~C\ -\xb7\xf1yL\xaa\xcd\x89~W\xf15\xddDV\xfbZ\ -\xc0\xd9gJB\x903\x89eV\xa3n\x01+\xcd_\ -ET\x82\xb6\xa1\x1aOQ\xf1q\xb7\xbdTcv9\ -,y2\x88a!\xf7\xf3\xa6y\xba@\xe4\xf6\xd4W\ -(o\x0a\x1f*\xee\xdcQF\x8b\xa7z\xc7V\x96=\ -\xb1\xec\x89j\xf2\xe5\xd7\xf5\xdf\xf5\xc1\xe7\xea\x85^\xd6\ -\xdd\x986.\xa9;2\xed7FeNe\x0c\xff$\ -(F\xfd|s`T\x07;I\x93\x86\xc3\xce\x1f\x80\ -W\xcf\x0b{\x86\x86\x1a\xbd\xcd\xec\xa2\xf6 ?V\xe0\ -\x8dR\x9bF\xffw\x82\xa5\xe7\xd7\x94\xf3P\xe0ME\ -\x9bw4\x95\x97G\xa3a\xdb?|\xb5\xc6Gi\xb9\ -=\xfe\x9e\x15\xd2\xde\x95\x91\x04\x13BY\xb8MW\xb5\ -uh\xc3\xb2>!\x0a\x13\xcb\x99&I\xfeF\xba\xfc\ -w/*yqp\xa5\x96\x97\x12\xd6r\xa0\x8e\xf1!\ -\xf3P\x8e\xdb\xe8\xbc\xf6V\x90_\x92\xb0\xafn[\xbd\ -;LY\xf1\xe8y\x12\xfb\xcd\xdd\xbezq9\x91K\ -\x0a\xcc\xd2\x04\x0b`\xf2\xd8\xfe\x19\xc4\x10\xc8O\x14V\ -\x9a\xb7\x8bq\xd6\x1a\x0a\x0dv\xf1\xb3\xbb\xc2\xd5\x91\xf5\ -8\x8d~\x95\xe1(G\xf2k_\x04\xc1\xa3\xba\xf6\xf5\ -\xde\xe0%\xccq\xb8\xfb\x7fw\x0d\xc4\x22\xa4\xec\xb4\xeb\ -\xfd\xee\x09\xa64\xf0\xf2L\xda\x1fv~\x01\xd3a\xec\ -\xde\ +\x00\x0f\xffx\x9c\xbdWmo\xda0\x10\xfe\xde_\xe1\ +R!\xadS\xa1y!\x012\xf5K\xb7i\xaa\xd4n\ +\xab\xca\xb6\x0f\xd5>8\xf1\x91X\x0dv\xe48\xa3l\ +\xda\x7f\x9fC\x02$\x90\x18Z\xb5C\x88\x04\xbf\x7f\x99\xa0\ +\x8f\x1f\xae&\xc7\xc7\xc7\xe8\xed\xf9\xd1\xd1\xed\xd7,\x8d\ +.3)9C\x7f\x8e\x90\xfa\xcc(\xebE@\xc3H\ +z\xc8\xea\x0f\x1dx|w\xf4W\xad\x13<\x14\x90\xa6\ +\x97X\xe8\x17\xde%\x94]\xf2G\xfd\xa2\x09\xe7\xf1!\ +R\xaf)\x83\x8f\x84J\xfd\xaa\xf7|\xe6\xf3\xbd27\ +\x96\xdeOc,/:Rd\xd0\xf9Yn\xf2\xb9 \ + \x94?\xa7/k\x83\xcf\xd5\x81\x9e\xd5\xcd\x18\ +7.\xa9\x1b2\xee6zeBe\x0c\xaf\xe2\x14\xa3\ +\xde9m$\xaa\x96Q\xd2\xa4\xa1\xd9y\x06x\xb5_\ +XKh\xc8\xd1\xcb\xc8.r\x0f\xf2c\x05\xdeH\xb5\ +it\x9f\xe2,\xbd|M:\x0f\x05^T\xb8\xb9\xa6\ +\xa9<\xdc\x1b\x0d\xdb^\xf1h\x0d\xb7\xc2r\xd9X\xef\ +%\xd2^\xa5\x91\x04\x13BY\xb8\x0cW\xb5\xb5o\xc3\ +\xac>!\x0a\x15\xcb\x99&J^\x22\x5c\xfe\xbb\x15\x95\ +\xb8\xd8\x98R\x8bK\x09\x8f\xb2\xa7\xda\xf8\x90y(\xc7\ +m4^{+\xc8\xaf_\xd8W\xf7\xb8\x93\x1bLY\ +\xf1\xeay\x12\xfb\xcd\xd5\xbez%\xda\xa1K\x0a\xcc\xd2\ +\x04\x0b`r[\xff;\x88!\x90\xdf)\xcc5\xa7\x8b\ +q\xd6\xea\x0a\x0dv\xf1X]\x0e\xeb\xc8z\x9cF\xbb\ +Jw\x94#\xd5\xeb\xd5'<\x83\x09\x0eW\xffW\x17\ +L,B\xcav\xab\xdeS;\x98R\xc1\xc3#i\xdd\ +\xec\xfc\x03\x95\x03\x08\xca\ " qt_resource_name = b"\ @@ -84,7 +84,7 @@ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x1a\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x9c]y\xf9\xe9\ +\x00\x00\x01\x9d\xc9~\xe1\xf2\ " def qInitResources(): diff --git a/rare/resources/static_css/stylesheet.py b/rare/resources/static_css/stylesheet.py index 0b3a86c35b..b1a15aa067 100644 --- a/rare/resources/static_css/stylesheet.py +++ b/rare/resources/static_css/stylesheet.py @@ -41,10 +41,16 @@ def css_name(widget: wrappertype | QObject | type, subwidget: str = ''): # InfoLabel +info_label_props = { + 'color': '#999', + 'fontStyle': 'italic', + 'fontWeight': 'normal', +} style.QLabel['#InfoLabel'].setValues( - color='#999', - fontStyle='italic', - fontWeight='normal', + **info_label_props +) +style.QCheckBox['#InfoLabel'].setValues( + **info_label_props ) diff --git a/rare/resources/static_css/stylesheet.qss b/rare/resources/static_css/stylesheet.qss index f9f70906e5..e1d60499f0 100644 --- a/rare/resources/static_css/stylesheet.qss +++ b/rare/resources/static_css/stylesheet.qss @@ -28,6 +28,11 @@ QLabel#InfoLabel { font-style: italic; font-weight: normal; } +QCheckBox#InfoLabel { + color: #999; + font-style: italic; + font-weight: normal; +} QPushButton#InstallButton { border-color: #00b400; background-color: #006400; diff --git a/rare/ui/components/dialogs/launch_dialog.py b/rare/ui/components/dialogs/launch_dialog.py index b7a4795430..28113a8736 100644 --- a/rare/ui/components/dialogs/launch_dialog.py +++ b/rare/ui/components/dialogs/launch_dialog.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- ################################################################################ ## Form generated from reading UI file 'launch_dialog.ui' ## -## Created by: Qt User Interface Compiler version 6.9.1 +## Created by: Qt User Interface Compiler version 6.10.1 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ from PySide6.QtCore import QCoreApplication, QSize +from PySide6.QtGui import QFont from PySide6.QtWidgets import QLabel, QProgressBar, QSizePolicy, QVBoxLayout -class Ui_LaunchDialog(object): +class Ui_LaunchDialog: def setupUi(self, LaunchDialog): if not LaunchDialog.objectName(): - LaunchDialog.setObjectName(u"LaunchDialog") + LaunchDialog.setObjectName("LaunchDialog") LaunchDialog.resize(400, 160) sizePolicy = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -25,24 +25,33 @@ def setupUi(self, LaunchDialog): LaunchDialog.setMinimumSize(QSize(400, 160)) LaunchDialog.setMaximumSize(QSize(400, 160)) self.launch_layout = QVBoxLayout(LaunchDialog) - self.launch_layout.setObjectName(u"launch_layout") + self.launch_layout.setObjectName("launch_layout") self.title_label = QLabel(LaunchDialog) - self.title_label.setObjectName(u"title_label") + self.title_label.setObjectName("title_label") self.launch_layout.addWidget(self.title_label) self.progress_bar = QProgressBar(LaunchDialog) - self.progress_bar.setObjectName(u"progress_bar") + self.progress_bar.setObjectName("progress_bar") self.progress_bar.setValue(0) self.launch_layout.addWidget(self.progress_bar) + self.info_label = QLabel(LaunchDialog) + self.info_label.setObjectName("info_label") + font = QFont() + font.setItalic(True) + self.info_label.setFont(font) + + self.launch_layout.addWidget(self.info_label) + self.retranslateUi(LaunchDialog) # setupUi def retranslateUi(self, LaunchDialog): - LaunchDialog.setWindowTitle(QCoreApplication.translate("LaunchDialog", u"Launching", None)) - self.title_label.setText(QCoreApplication.translate("LaunchDialog", u"

Launching Rare

", None)) + LaunchDialog.setWindowTitle(QCoreApplication.translate("LaunchDialog", "Launching", None)) + self.title_label.setText(QCoreApplication.translate("LaunchDialog", "

Launching Rare

", None)) + self.info_label.setText(QCoreApplication.translate("LaunchDialog", "Progress might look stuck when launching for the first time.", None)) # retranslateUi diff --git a/rare/ui/components/dialogs/launch_dialog.ui b/rare/ui/components/dialogs/launch_dialog.ui index ff9f6d34bf..20cc901aca 100644 --- a/rare/ui/components/dialogs/launch_dialog.ui +++ b/rare/ui/components/dialogs/launch_dialog.ui @@ -46,6 +46,18 @@ + + + + + true + + + + Progress might look stuck when launching for the first time. + + + diff --git a/rare/ui/components/tabs/integrations/import_group.py b/rare/ui/components/tabs/integrations/import_group.py index 6ab2bf980a..13ba62ef59 100644 --- a/rare/ui/components/tabs/integrations/import_group.py +++ b/rare/ui/components/tabs/integrations/import_group.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- ################################################################################ ## Form generated from reading UI file 'import_group.ui' ## -## Created by: Qt User Interface Compiler version 6.9.1 +## Created by: Qt User Interface Compiler version 6.10.1 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -13,33 +12,33 @@ from PySide6.QtWidgets import QCheckBox, QComboBox, QFormLayout, QHBoxLayout, QLabel, QPushButton, QSizePolicy -class Ui_ImportGroup(object): +class Ui_ImportGroup: def setupUi(self, ImportGroup): if not ImportGroup.objectName(): - ImportGroup.setObjectName(u"ImportGroup") + ImportGroup.setObjectName("ImportGroup") ImportGroup.resize(651, 232) - ImportGroup.setWindowTitle(u"ImportGroup") - ImportGroup.setWindowFilePath(u"") + ImportGroup.setWindowTitle("ImportGroup") + ImportGroup.setWindowFilePath("") self.import_layout = QFormLayout(ImportGroup) - self.import_layout.setObjectName(u"import_layout") - self.import_layout.setLabelAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter) + self.import_layout.setObjectName("import_layout") + self.import_layout.setLabelAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) self.path_edit_label = QLabel(ImportGroup) - self.path_edit_label.setObjectName(u"path_edit_label") + self.path_edit_label.setObjectName("path_edit_label") self.import_layout.setWidget(0, QFormLayout.ItemRole.LabelRole, self.path_edit_label) self.app_name_label = QLabel(ImportGroup) - self.app_name_label.setObjectName(u"app_name_label") + self.app_name_label.setObjectName("app_name_label") self.import_layout.setWidget(1, QFormLayout.ItemRole.LabelRole, self.app_name_label) self.import_folder_label = QLabel(ImportGroup) - self.import_folder_label.setObjectName(u"import_folder_label") + self.import_folder_label.setObjectName("import_folder_label") self.import_layout.setWidget(3, QFormLayout.ItemRole.LabelRole, self.import_folder_label) self.import_folder_check = QCheckBox(ImportGroup) - self.import_folder_check.setObjectName(u"import_folder_check") + self.import_folder_check.setObjectName("import_folder_check") font = QFont() font.setItalic(True) self.import_folder_check.setFont(font) @@ -47,37 +46,37 @@ def setupUi(self, ImportGroup): self.import_layout.setWidget(3, QFormLayout.ItemRole.FieldRole, self.import_folder_check) self.import_dlcs_label = QLabel(ImportGroup) - self.import_dlcs_label.setObjectName(u"import_dlcs_label") + self.import_dlcs_label.setObjectName("import_dlcs_label") self.import_layout.setWidget(4, QFormLayout.ItemRole.LabelRole, self.import_dlcs_label) self.import_dlcs_check = QCheckBox(ImportGroup) - self.import_dlcs_check.setObjectName(u"import_dlcs_check") + self.import_dlcs_check.setObjectName("import_dlcs_check") self.import_dlcs_check.setFont(font) self.import_layout.setWidget(4, QFormLayout.ItemRole.FieldRole, self.import_dlcs_check) self.import_force_label = QLabel(ImportGroup) - self.import_force_label.setObjectName(u"import_force_label") + self.import_force_label.setObjectName("import_force_label") self.import_layout.setWidget(5, QFormLayout.ItemRole.LabelRole, self.import_force_label) self.import_force_check = QCheckBox(ImportGroup) - self.import_force_check.setObjectName(u"import_force_check") + self.import_force_check.setObjectName("import_force_check") self.import_force_check.setFont(font) self.import_layout.setWidget(5, QFormLayout.ItemRole.FieldRole, self.import_force_check) self.import_button_label = QLabel(ImportGroup) - self.import_button_label.setObjectName(u"import_button_label") - self.import_button_label.setText(u"error") + self.import_button_label.setObjectName("import_button_label") + self.import_button_label.setText("error") self.import_layout.setWidget(6, QFormLayout.ItemRole.LabelRole, self.import_button_label) self.button_info_layout = QHBoxLayout() - self.button_info_layout.setObjectName(u"button_info_layout") + self.button_info_layout.setObjectName("button_info_layout") self.import_button = QPushButton(ImportGroup) - self.import_button.setObjectName(u"import_button") + self.import_button.setObjectName("import_button") sizePolicy = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -90,14 +89,14 @@ def setupUi(self, ImportGroup): self.import_layout.setLayout(6, QFormLayout.ItemRole.FieldRole, self.button_info_layout) self.platform_label = QLabel(ImportGroup) - self.platform_label.setObjectName(u"platform_label") + self.platform_label.setObjectName("platform_label") self.import_layout.setWidget(2, QFormLayout.ItemRole.LabelRole, self.platform_label) self.platform_layout = QHBoxLayout() - self.platform_layout.setObjectName(u"platform_layout") + self.platform_layout.setObjectName("platform_layout") self.platform_combo = QComboBox(ImportGroup) - self.platform_combo.setObjectName(u"platform_combo") + self.platform_combo.setObjectName("platform_combo") sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed) sizePolicy1.setHorizontalStretch(0) sizePolicy1.setVerticalStretch(0) @@ -106,11 +105,11 @@ def setupUi(self, ImportGroup): self.platform_layout.addWidget(self.platform_combo) - self.platform_tooltip = QLabel(ImportGroup) - self.platform_tooltip.setObjectName(u"platform_tooltip") - self.platform_tooltip.setFont(font) + self.platform_info = QLabel(ImportGroup) + self.platform_info.setObjectName("platform_info") + self.platform_info.setFont(font) - self.platform_layout.addWidget(self.platform_tooltip) + self.platform_layout.addWidget(self.platform_info) self.import_layout.setLayout(2, QFormLayout.ItemRole.FieldRole, self.platform_layout) @@ -120,17 +119,17 @@ def setupUi(self, ImportGroup): # setupUi def retranslateUi(self, ImportGroup): - ImportGroup.setTitle(QCoreApplication.translate("ImportGroup", u"Import EGL game from a directory", None)) - self.path_edit_label.setText(QCoreApplication.translate("ImportGroup", u"Installation path", None)) - self.app_name_label.setText(QCoreApplication.translate("ImportGroup", u"Override app name", None)) - self.import_folder_label.setText(QCoreApplication.translate("ImportGroup", u"Import all games", None)) - self.import_folder_check.setText(QCoreApplication.translate("ImportGroup", u"Scan the installation path for game folders and import them", None)) - self.import_dlcs_label.setText(QCoreApplication.translate("ImportGroup", u"Import DLCs", None)) - self.import_dlcs_check.setText(QCoreApplication.translate("ImportGroup", u"If a game has DLCs, try to import them too", None)) - self.import_force_label.setText(QCoreApplication.translate("ImportGroup", u"Force import", None)) - self.import_force_check.setText(QCoreApplication.translate("ImportGroup", u"Import game despite missing files", None)) - self.import_button.setText(QCoreApplication.translate("ImportGroup", u"Import game(s)", None)) - self.platform_label.setText(QCoreApplication.translate("ImportGroup", u"Platform", None)) - self.platform_tooltip.setText(QCoreApplication.translate("ImportGroup", u"Select the native platform of the game", None)) + ImportGroup.setTitle(QCoreApplication.translate("ImportGroup", "Import EGL game from a directory", None)) + self.path_edit_label.setText(QCoreApplication.translate("ImportGroup", "Installation path", None)) + self.app_name_label.setText(QCoreApplication.translate("ImportGroup", "Override app name", None)) + self.import_folder_label.setText(QCoreApplication.translate("ImportGroup", "Import all games", None)) + self.import_folder_check.setText(QCoreApplication.translate("ImportGroup", "Scan the installation path for game folders and import them", None)) + self.import_dlcs_label.setText(QCoreApplication.translate("ImportGroup", "Import DLCs", None)) + self.import_dlcs_check.setText(QCoreApplication.translate("ImportGroup", "If a game has DLCs, try to import them too", None)) + self.import_force_label.setText(QCoreApplication.translate("ImportGroup", "Force import", None)) + self.import_force_check.setText(QCoreApplication.translate("ImportGroup", "Import game despite missing files", None)) + self.import_button.setText(QCoreApplication.translate("ImportGroup", "Import game(s)", None)) + self.platform_label.setText(QCoreApplication.translate("ImportGroup", "Platform", None)) + self.platform_info.setText(QCoreApplication.translate("ImportGroup", "Select the native platform of the game", None)) # retranslateUi diff --git a/rare/ui/components/tabs/integrations/import_group.ui b/rare/ui/components/tabs/integrations/import_group.ui index 1ee4f1f231..eb1eb20592 100644 --- a/rare/ui/components/tabs/integrations/import_group.ui +++ b/rare/ui/components/tabs/integrations/import_group.ui @@ -21,7 +21,7 @@ - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -138,7 +138,7 @@ - + true diff --git a/rare/utils/wrapper_exe.py b/rare/utils/wrapper_exe.py index 514f123beb..00263335ec 100644 --- a/rare/utils/wrapper_exe.py +++ b/rare/utils/wrapper_exe.py @@ -5,7 +5,6 @@ import requests from orjson import orjson -from rare.utils import config_helper as config from rare.utils.paths import data_dir, runtime_assets_path logger = getLogger('WrapperExe')