diff --git a/rare/app.py b/rare/app.py index 96b4667a..9b3f582c 100644 --- a/rare/app.py +++ b/rare/app.py @@ -68,13 +68,18 @@ class App(QApplication): # Style self.setStyle(QStyleFactory.create("Fusion")) - if (color := settings.value("color_scheme", None)) is not None: + if settings.value("color_scheme", None) is None and settings.value("style_sheet", None) is None: + settings.setValue("color_scheme", "") + settings.setValue("style_sheet", "RareStyle") + if color := settings.value("color_scheme", False): + settings.setValue("style_sheet", "") custom_palette = load_color_scheme(os.path.join(style_path, "colors", color + ".scheme")) if custom_palette is not None: self.setPalette(custom_palette) - if (style := settings.value("style_sheet", None)) is not None: + elif style := settings.value("style_sheet", False): + settings.setValue("color_scheme", "") self.setStyleSheet(open(os.path.join(style_path, "qss", style + ".qss")).read()) - self.setWindowIcon(QIcon(os.path.join(style_path + "Logo.png"))) + self.setWindowIcon(QIcon(os.path.join(style_path, "Logo.png"))) # launch app self.launch_dialog = LaunchDialog(self.core, args.offline) diff --git a/rare/components/tabs/settings/rare.py b/rare/components/tabs/settings/rare.py index e067f142..33d4363d 100644 --- a/rare/components/tabs/settings/rare.py +++ b/rare/components/tabs/settings/rare.py @@ -4,7 +4,7 @@ import subprocess import sys from logging import getLogger -from PyQt5.QtCore import QSettings +from PyQt5.QtCore import QSettings, Qt from PyQt5.QtWidgets import QFileDialog, QWidget from rare.components.tabs.settings.rpc_settings import RPCSettings @@ -77,7 +77,7 @@ class RareSettings(QWidget, Ui_RareSettings): self.interface_info.setVisible(False) self.rpc = RPCSettings() - self.rpc_layout.addWidget(self.rpc) + self.rpc_layout.addWidget(self.rpc, alignment=Qt.AlignTop) self.init_checkboxes(self.checkboxes) self.sys_tray.stateChanged.connect( @@ -110,7 +110,7 @@ class RareSettings(QWidget, Ui_RareSettings): self.style_select.setDisabled(True) self.settings.setValue("color_scheme", self.color_select.currentText()) else: - self.settings.remove("color_scheme") + self.settings.setValue("color_scheme", "") self.style_select.setDisabled(False) self.interface_info.setVisible(True) @@ -120,7 +120,7 @@ class RareSettings(QWidget, Ui_RareSettings): self.color_select.setDisabled(True) self.settings.setValue("style_sheet", self.style_select.currentText()) else: - self.settings.remove("style_sheet") + self.settings.setValue("style_sheet", "") self.color_select.setDisabled(False) self.interface_info.setVisible(True) diff --git a/rare/styles/qss/RareStyle.qss b/rare/styles/qss/RareStyle.qss index 4f110abf..daba360f 100644 --- a/rare/styles/qss/RareStyle.qss +++ b/rare/styles/qss/RareStyle.qss @@ -99,10 +99,13 @@ QGroupBox { QGroupBox#settings_widget { border: 1px solid gray; font-size: 13px; - border-radius: 3px; - margin-top: 1ex; - padding-top: 4px; - padding-bottom: 4px; + font-weight: bold; + border-radius: 6px; + margin-top: 3ex; + padding-top: 0px; + padding-bottom: 0px; + padding-left: 0px; + padding-right: 0px; } QGroupBox#game_widget_icon { @@ -112,14 +115,17 @@ QGroupBox#game_widget_icon { } QGroupBox#group { - font-size: 15px; + border: 1px solid gray; + font-size: 13px; font-weight: bold; - border: 1px solid white; - margin-top: 10px; - padding: 8px; + border-radius: 6px; + margin-top: 3ex; + padding-top: 0px; + padding-bottom: 0px; + padding-left: 0px; + padding-right: 0px; } - QToolButton { border: 1px solid gray; border-radius: 2px; 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 bed1ca0c..55df7c5b 100644 --- a/rare/ui/components/tabs/games/game_info/game_settings.py +++ b/rare/ui/components/tabs/games/game_info/game_settings.py @@ -14,6 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_GameSettings(object): def setupUi(self, GameSettings): GameSettings.setObjectName("GameSettings") + GameSettings.resize(759, 617) self.game_settings_layout = QtWidgets.QVBoxLayout(GameSettings) self.game_settings_layout.setObjectName("game_settings_layout") self.title = QtWidgets.QLabel(GameSettings) @@ -120,7 +121,7 @@ class Ui_GameSettings(object): def retranslateUi(self, GameSettings): _translate = QtCore.QCoreApplication.translate - GameSettings.setWindowTitle(_translate("GameSettings", "Game Settings")) + GameSettings.setWindowTitle(_translate("GameSettings", "GameSettings")) self.launch_settings_groupbox.setTitle(_translate("GameSettings", "Launch Settings")) self.skip_update.setItemText(0, _translate("GameSettings", "Default")) self.skip_update.setItemText(1, _translate("GameSettings", "Yes")) 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 b33b20a3..d2865952 100644 --- a/rare/ui/components/tabs/games/game_info/game_settings.ui +++ b/rare/ui/components/tabs/games/game_info/game_settings.ui @@ -11,7 +11,7 @@ - Game Settings + GameSettings diff --git a/rare/ui/components/tabs/settings/dxvk.py b/rare/ui/components/tabs/settings/dxvk.py index 56b0f335..5738b8ae 100644 --- a/rare/ui/components/tabs/settings/dxvk.py +++ b/rare/ui/components/tabs/settings/dxvk.py @@ -14,8 +14,8 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_DxvkSettings(object): def setupUi(self, DxvkSettings): DxvkSettings.setObjectName("DxvkSettings") - self.gridLayout = QtWidgets.QGridLayout(DxvkSettings) - self.gridLayout.setObjectName("gridLayout") + self.dxvk_layout = QtWidgets.QGridLayout(DxvkSettings) + self.dxvk_layout.setObjectName("dxvk_layout") self.gb_dxvk_options = QtWidgets.QGroupBox(DxvkSettings) self.gb_dxvk_options.setObjectName("gb_dxvk_options") self.layout_dxvk_options = QtWidgets.QGridLayout(self.gb_dxvk_options) @@ -43,7 +43,7 @@ class Ui_DxvkSettings(object): self.api = QtWidgets.QCheckBox(self.gb_dxvk_options) self.api.setObjectName("api") self.layout_dxvk_options.addWidget(self.api, 1, 2, 1, 1) - self.gridLayout.addWidget(self.gb_dxvk_options, 2, 0, 1, 3) + self.dxvk_layout.addWidget(self.gb_dxvk_options, 2, 0, 1, 3) self.lbl_show_dxvk = QtWidgets.QLabel(DxvkSettings) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -51,7 +51,7 @@ class Ui_DxvkSettings(object): sizePolicy.setHeightForWidth(self.lbl_show_dxvk.sizePolicy().hasHeightForWidth()) self.lbl_show_dxvk.setSizePolicy(sizePolicy) self.lbl_show_dxvk.setObjectName("lbl_show_dxvk") - self.gridLayout.addWidget(self.lbl_show_dxvk, 0, 0, 1, 1) + self.dxvk_layout.addWidget(self.lbl_show_dxvk, 0, 0, 1, 1) self.show_dxvk = QtWidgets.QComboBox(DxvkSettings) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -63,7 +63,7 @@ class Ui_DxvkSettings(object): self.show_dxvk.addItem("") self.show_dxvk.addItem("") self.show_dxvk.addItem("") - self.gridLayout.addWidget(self.show_dxvk, 0, 1, 1, 2) + self.dxvk_layout.addWidget(self.show_dxvk, 0, 1, 1, 2) self.retranslateUi(DxvkSettings) QtCore.QMetaObject.connectSlotsByName(DxvkSettings) diff --git a/rare/ui/components/tabs/settings/dxvk.ui b/rare/ui/components/tabs/settings/dxvk.ui index dfa9eceb..e1fe686d 100644 --- a/rare/ui/components/tabs/settings/dxvk.ui +++ b/rare/ui/components/tabs/settings/dxvk.ui @@ -16,7 +16,7 @@ DXVK Settings - + diff --git a/rare/ui/components/tabs/settings/rare.py b/rare/ui/components/tabs/settings/rare.py index 12ee9ddd..748e7c88 100644 --- a/rare/ui/components/tabs/settings/rare.py +++ b/rare/ui/components/tabs/settings/rare.py @@ -16,14 +16,6 @@ class Ui_RareSettings(object): RareSettings.setObjectName("RareSettings") self.rare_layout = QtWidgets.QGridLayout(RareSettings) self.rare_layout.setObjectName("rare_layout") - self.rpc_layout = QtWidgets.QVBoxLayout() - self.rpc_layout.setObjectName("rpc_layout") - self.rare_layout.addLayout(self.rpc_layout, 1, 2, 1, 1) - self.img_dir_group = QtWidgets.QGroupBox(RareSettings) - self.img_dir_group.setObjectName("img_dir_group") - self.img_dir_layout = QtWidgets.QVBoxLayout(self.img_dir_group) - self.img_dir_layout.setObjectName("img_dir_layout") - self.rare_layout.addWidget(self.img_dir_group, 0, 0, 1, 2, QtCore.Qt.AlignTop) self.interface_group = QtWidgets.QGroupBox(RareSettings) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -33,59 +25,66 @@ class Ui_RareSettings(object): self.interface_group.setObjectName("interface_group") self.interface_layout = QtWidgets.QGridLayout(self.interface_group) self.interface_layout.setObjectName("interface_layout") - self.lang_label = QtWidgets.QLabel(self.interface_group) - self.lang_label.setObjectName("lang_label") - self.interface_layout.addWidget(self.lang_label, 0, 1, 1, 1, QtCore.Qt.AlignRight) + self.color_select = QtWidgets.QComboBox(self.interface_group) + self.color_select.setObjectName("color_select") + self.color_select.addItem("") + self.interface_layout.addWidget(self.color_select, 1, 1, 1, 1) self.style_label = QtWidgets.QLabel(self.interface_group) self.style_label.setObjectName("style_label") - self.interface_layout.addWidget(self.style_label, 2, 1, 1, 1, QtCore.Qt.AlignRight) - self.color_label = QtWidgets.QLabel(self.interface_group) - self.color_label.setObjectName("color_label") - self.interface_layout.addWidget(self.color_label, 1, 1, 1, 1, QtCore.Qt.AlignRight) + self.interface_layout.addWidget(self.style_label, 2, 0, 1, 1, QtCore.Qt.AlignRight) + self.lang_label = QtWidgets.QLabel(self.interface_group) + self.lang_label.setObjectName("lang_label") + self.interface_layout.addWidget(self.lang_label, 0, 0, 1, 1, QtCore.Qt.AlignRight) self.lang_select = QtWidgets.QComboBox(self.interface_group) self.lang_select.setObjectName("lang_select") - self.interface_layout.addWidget(self.lang_select, 0, 2, 1, 1) + self.interface_layout.addWidget(self.lang_select, 0, 1, 1, 1) + self.color_label = QtWidgets.QLabel(self.interface_group) + self.color_label.setObjectName("color_label") + self.interface_layout.addWidget(self.color_label, 1, 0, 1, 1, QtCore.Qt.AlignRight) self.interface_info = QtWidgets.QLabel(self.interface_group) font = QtGui.QFont() font.setItalic(True) self.interface_info.setFont(font) self.interface_info.setWordWrap(True) self.interface_info.setObjectName("interface_info") - self.interface_layout.addWidget(self.interface_info, 3, 0, 1, 4) + self.interface_layout.addWidget(self.interface_info, 3, 0, 1, 3) self.style_select = QtWidgets.QComboBox(self.interface_group) self.style_select.setObjectName("style_select") self.style_select.addItem("") - self.interface_layout.addWidget(self.style_select, 2, 2, 1, 1) - self.color_select = QtWidgets.QComboBox(self.interface_group) - self.color_select.setObjectName("color_select") - self.color_select.addItem("") - self.interface_layout.addWidget(self.color_select, 1, 2, 1, 1) + self.interface_layout.addWidget(self.style_select, 2, 1, 1, 1) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.interface_layout.addItem(spacerItem, 1, 2, 1, 1) self.rare_layout.addWidget(self.interface_group, 1, 0, 1, 1, QtCore.Qt.AlignTop) + self.img_dir_group = QtWidgets.QGroupBox(RareSettings) + self.img_dir_group.setObjectName("img_dir_group") + self.img_dir_layout = QtWidgets.QVBoxLayout(self.img_dir_group) + self.img_dir_layout.setObjectName("img_dir_layout") + self.rare_layout.addWidget(self.img_dir_group, 0, 0, 1, 1, QtCore.Qt.AlignTop) self.settings_group = QtWidgets.QGroupBox(RareSettings) self.settings_group.setObjectName("settings_group") - self.behaviour_layout = QtWidgets.QGridLayout(self.settings_group) - self.behaviour_layout.setObjectName("behaviour_layout") - self.auto_sync_cloud = QtWidgets.QCheckBox(self.settings_group) - self.auto_sync_cloud.setObjectName("auto_sync_cloud") - self.behaviour_layout.addWidget(self.auto_sync_cloud, 3, 0, 1, 1) - self.auto_update = QtWidgets.QCheckBox(self.settings_group) - self.auto_update.setObjectName("auto_update") - self.behaviour_layout.addWidget(self.auto_update, 1, 0, 1, 1) - self.confirm_start = QtWidgets.QCheckBox(self.settings_group) - self.confirm_start.setObjectName("confirm_start") - self.behaviour_layout.addWidget(self.confirm_start, 2, 0, 1, 1) - self.sys_tray = QtWidgets.QCheckBox(self.settings_group) - self.sys_tray.setObjectName("sys_tray") - self.behaviour_layout.addWidget(self.sys_tray, 0, 0, 1, 1) - spacerItem = QtWidgets.QSpacerItem(0, 0, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.behaviour_layout.addItem(spacerItem, 0, 2, 4, 1) - self.notification = QtWidgets.QCheckBox(self.settings_group) - self.notification.setObjectName("notification") - self.behaviour_layout.addWidget(self.notification, 0, 1, 1, 1) + self.behavior_layout = QtWidgets.QGridLayout(self.settings_group) + self.behavior_layout.setObjectName("behavior_layout") + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.behavior_layout.addItem(spacerItem1, 2, 1, 2, 1) self.save_size = QtWidgets.QCheckBox(self.settings_group) self.save_size.setObjectName("save_size") - self.behaviour_layout.addWidget(self.save_size, 1, 1, 1, 1) - self.rare_layout.addWidget(self.settings_group, 1, 1, 1, 1, QtCore.Qt.AlignTop) + self.behavior_layout.addWidget(self.save_size, 5, 0, 1, 1) + self.notification = QtWidgets.QCheckBox(self.settings_group) + self.notification.setObjectName("notification") + self.behavior_layout.addWidget(self.notification, 4, 0, 1, 1) + self.auto_sync_cloud = QtWidgets.QCheckBox(self.settings_group) + self.auto_sync_cloud.setObjectName("auto_sync_cloud") + self.behavior_layout.addWidget(self.auto_sync_cloud, 3, 0, 1, 1) + self.confirm_start = QtWidgets.QCheckBox(self.settings_group) + self.confirm_start.setObjectName("confirm_start") + self.behavior_layout.addWidget(self.confirm_start, 2, 0, 1, 1) + self.auto_update = QtWidgets.QCheckBox(self.settings_group) + self.auto_update.setObjectName("auto_update") + self.behavior_layout.addWidget(self.auto_update, 1, 0, 1, 1) + self.sys_tray = QtWidgets.QCheckBox(self.settings_group) + self.sys_tray.setObjectName("sys_tray") + self.behavior_layout.addWidget(self.sys_tray, 0, 0, 1, 1) + self.rare_layout.addWidget(self.settings_group, 2, 0, 1, 1, QtCore.Qt.AlignTop) self.log_dir_group = QtWidgets.QGroupBox(RareSettings) self.log_dir_group.setObjectName("log_dir_group") self.log_dir_layout = QtWidgets.QVBoxLayout(self.log_dir_group) @@ -101,9 +100,12 @@ class Ui_RareSettings(object): self.log_dir_size_label.setWordWrap(True) self.log_dir_size_label.setObjectName("log_dir_size_label") self.log_dir_layout.addWidget(self.log_dir_size_label) - self.rare_layout.addWidget(self.log_dir_group, 0, 2, 1, 1, QtCore.Qt.AlignTop) - spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.rare_layout.addItem(spacerItem1, 2, 1, 1, 1) + self.rare_layout.addWidget(self.log_dir_group, 0, 1, 1, 1, QtCore.Qt.AlignTop) + self.rpc_layout = QtWidgets.QVBoxLayout() + self.rpc_layout.setObjectName("rpc_layout") + self.rare_layout.addLayout(self.rpc_layout, 1, 1, 1, 1) + spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.rare_layout.addItem(spacerItem2, 2, 1, 1, 1) self.retranslateUi(RareSettings) QtCore.QMetaObject.connectSlotsByName(RareSettings) @@ -111,21 +113,21 @@ class Ui_RareSettings(object): def retranslateUi(self, RareSettings): _translate = QtCore.QCoreApplication.translate RareSettings.setWindowTitle(_translate("RareSettings", "RareSettings")) - self.img_dir_group.setTitle(_translate("RareSettings", "Image Cache Directory")) self.interface_group.setTitle(_translate("RareSettings", "Interface")) - self.lang_label.setText(_translate("RareSettings", "Language")) + self.color_select.setItemText(0, _translate("RareSettings", "None")) self.style_label.setText(_translate("RareSettings", "Style Sheet")) + self.lang_label.setText(_translate("RareSettings", "Language")) self.color_label.setText(_translate("RareSettings", "Color Scheme")) self.interface_info.setText(_translate("RareSettings", "Restart Rare to apply.")) self.style_select.setItemText(0, _translate("RareSettings", "None")) - self.color_select.setItemText(0, _translate("RareSettings", "None")) - self.settings_group.setTitle(_translate("RareSettings", "Behaviour")) - self.auto_sync_cloud.setText(_translate("RareSettings", "Automatically sync with cloud")) - self.auto_update.setText(_translate("RareSettings", "Update games on application startup")) - self.confirm_start.setText(_translate("RareSettings", "Confirm game launch")) - self.sys_tray.setText(_translate("RareSettings", "Exit to System tray")) - self.notification.setText(_translate("RareSettings", "Show notification on download completion")) + self.img_dir_group.setTitle(_translate("RareSettings", "Image Cache Directory")) + self.settings_group.setTitle(_translate("RareSettings", "Behavior")) self.save_size.setText(_translate("RareSettings", "Restore window size on application startup")) + self.notification.setText(_translate("RareSettings", "Show notification on download completion")) + self.auto_sync_cloud.setText(_translate("RareSettings", "Automatically sync with cloud")) + self.confirm_start.setText(_translate("RareSettings", "Confirm game launch")) + self.auto_update.setText(_translate("RareSettings", "Update games on application startup")) + self.sys_tray.setText(_translate("RareSettings", "Exit to System tray")) self.log_dir_group.setTitle(_translate("RareSettings", "Logs")) self.log_dir_open_button.setText(_translate("RareSettings", "Open Log directory")) self.log_dir_clean_button.setText(_translate("RareSettings", "Clean Log directory")) diff --git a/rare/ui/components/tabs/settings/rare.ui b/rare/ui/components/tabs/settings/rare.ui index a2ff7ab7..9cfed0ba 100644 --- a/rare/ui/components/tabs/settings/rare.ui +++ b/rare/ui/components/tabs/settings/rare.ui @@ -6,17 +6,6 @@ RareSettings - - - - - - - Image Cache Directory - - - - @@ -29,31 +18,40 @@ Interface - - - - Language - + + + + + None + + - + Style Sheet - + + + + Language + + + + + + + Color Scheme - - - - + @@ -68,7 +66,7 @@ - + @@ -78,23 +76,62 @@ - - - - None - - - + + + Qt::Horizontal + + + + 40 + 20 + + + - + + + + Image Cache Directory + + + + + - Behaviour + Behavior - + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Restore window size on application startup + + + + + + + Show notification on download completion + + + @@ -102,13 +139,6 @@ - - - - Update games on application startup - - - @@ -116,6 +146,13 @@ + + + + Update games on application startup + + + @@ -123,37 +160,10 @@ - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - Show notification on download completion - - - - - - - Restore window size on application startup - - - - + Logs @@ -186,6 +196,9 @@ + + + diff --git a/rare/ui/components/tabs/settings/rpc_settings.py b/rare/ui/components/tabs/settings/rpc_settings.py index 3005e246..8cde8cf2 100644 --- a/rare/ui/components/tabs/settings/rpc_settings.py +++ b/rare/ui/components/tabs/settings/rpc_settings.py @@ -14,14 +14,14 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_RPCSettings(object): def setupUi(self, RPCSettings): RPCSettings.setObjectName("RPCSettings") - self.gridLayout = QtWidgets.QGridLayout(RPCSettings) - self.gridLayout.setObjectName("gridLayout") + self.layout = QtWidgets.QGridLayout(RPCSettings) + self.layout.setObjectName("layout") self.enable = QtWidgets.QComboBox(RPCSettings) self.enable.setObjectName("enable") self.enable.addItem("") self.enable.addItem("") self.enable.addItem("") - self.gridLayout.addWidget(self.enable, 0, 1, 1, 1) + self.layout.addWidget(self.enable, 0, 1, 1, 1) self.label = QtWidgets.QLabel(RPCSettings) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -29,23 +29,23 @@ class Ui_RPCSettings(object): sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) self.label.setSizePolicy(sizePolicy) self.label.setObjectName("label") - self.gridLayout.addWidget(self.label, 0, 0, 1, 1) + self.layout.addWidget(self.label, 0, 0, 1, 1) self.show_game = QtWidgets.QCheckBox(RPCSettings) self.show_game.setObjectName("show_game") - self.gridLayout.addWidget(self.show_game, 1, 0, 1, 2) + self.layout.addWidget(self.show_game, 1, 0, 1, 2) self.show_os = QtWidgets.QCheckBox(RPCSettings) self.show_os.setObjectName("show_os") - self.gridLayout.addWidget(self.show_os, 2, 0, 1, 2) + self.layout.addWidget(self.show_os, 2, 0, 1, 2) self.show_time = QtWidgets.QCheckBox(RPCSettings) self.show_time.setObjectName("show_time") - self.gridLayout.addWidget(self.show_time, 3, 0, 1, 2) + self.layout.addWidget(self.show_time, 3, 0, 1, 2) self.retranslateUi(RPCSettings) QtCore.QMetaObject.connectSlotsByName(RPCSettings) def retranslateUi(self, RPCSettings): _translate = QtCore.QCoreApplication.translate - RPCSettings.setWindowTitle(_translate("RPCSettings", "Discord RPC")) + RPCSettings.setWindowTitle(_translate("RPCSettings", "DiscordRPC")) RPCSettings.setTitle(_translate("RPCSettings", "Discord RPC")) self.enable.setItemText(0, _translate("RPCSettings", "When Playing")) self.enable.setItemText(1, _translate("RPCSettings", "Always")) diff --git a/rare/ui/components/tabs/settings/rpc_settings.ui b/rare/ui/components/tabs/settings/rpc_settings.ui index ff480e58..215a9531 100644 --- a/rare/ui/components/tabs/settings/rpc_settings.ui +++ b/rare/ui/components/tabs/settings/rpc_settings.ui @@ -3,12 +3,12 @@ RPCSettings - Discord RPC + DiscordRPC Discord RPC - +