diff --git a/rare/ui/components/tabs/games/game_info/game_info.py b/rare/ui/components/tabs/games/game_info/game_info.py
index dd520c49..e4ed446f 100644
--- a/rare/ui/components/tabs/games/game_info/game_info.py
+++ b/rare/ui/components/tabs/games/game_info/game_info.py
@@ -14,7 +14,6 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_GameInfo(object):
def setupUi(self, GameInfo):
GameInfo.setObjectName("GameInfo")
- GameInfo.resize(424, 308)
self.layout_game_info = QtWidgets.QGridLayout(GameInfo)
self.layout_game_info.setObjectName("layout_game_info")
self.layout_game_info_form = QtWidgets.QGridLayout()
@@ -180,12 +179,12 @@ class Ui_GameInfo(object):
def retranslateUi(self, GameInfo):
_translate = QtCore.QCoreApplication.translate
GameInfo.setWindowTitle(_translate("GameInfo", "Game Info"))
- self.lbl_dev.setText(_translate("GameInfo", "Developer:"))
- self.lbl_version.setText(_translate("GameInfo", "Version:"))
- self.lbl_install_path.setText(_translate("GameInfo", "Installation Path:"))
- self.lbl_game_actions.setText(_translate("GameInfo", "Game Actions:"))
- self.lbl_app_name.setText(_translate("GameInfo", "Application Name:"))
- self.lbl_install_size.setText(_translate("GameInfo", "Installation Size:"))
+ self.lbl_dev.setText(_translate("GameInfo", "Developer"))
+ self.lbl_version.setText(_translate("GameInfo", "Version"))
+ self.lbl_install_path.setText(_translate("GameInfo", "Installation Path"))
+ self.lbl_game_actions.setText(_translate("GameInfo", "Actions"))
+ self.lbl_app_name.setText(_translate("GameInfo", "Application Name"))
+ self.lbl_install_size.setText(_translate("GameInfo", "Installation Size"))
self.uninstall_button.setText(_translate("GameInfo", "Uninstall Game"))
self.verify_button.setText(_translate("GameInfo", "Verify Installation"))
self.repair_button.setText(_translate("GameInfo", "Repair Instalation"))
diff --git a/rare/ui/components/tabs/games/game_info/game_info.ui b/rare/ui/components/tabs/games/game_info/game_info.ui
index bafc4b3c..09955772 100644
--- a/rare/ui/components/tabs/games/game_info/game_info.ui
+++ b/rare/ui/components/tabs/games/game_info/game_info.ui
@@ -6,8 +6,8 @@
0
0
- 424
- 308
+ 436
+ 317
@@ -79,7 +79,7 @@
- Developer:
+ Developer
@@ -118,7 +118,7 @@
- Version:
+ Version
@@ -137,7 +137,7 @@
- Installation Path:
+ Installation Path
@@ -169,7 +169,7 @@
- Game Actions:
+ Actions
@@ -188,7 +188,7 @@
- Application Name:
+ Application Name
@@ -207,7 +207,7 @@
- Installation Size:
+ Installation Size
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 409ad566..bed1ca0c 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,6 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_GameSettings(object):
def setupUi(self, GameSettings):
GameSettings.setObjectName("GameSettings")
- GameSettings.resize(668, 433)
self.game_settings_layout = QtWidgets.QVBoxLayout(GameSettings)
self.game_settings_layout.setObjectName("game_settings_layout")
self.title = QtWidgets.QLabel(GameSettings)
@@ -26,76 +25,80 @@ class Ui_GameSettings(object):
self.launch_settings_groupbox.setObjectName("launch_settings_groupbox")
self.launch_settings_layout = QtWidgets.QGridLayout(self.launch_settings_groupbox)
self.launch_settings_layout.setObjectName("launch_settings_layout")
- self.launch_params_label = QtWidgets.QLabel(self.launch_settings_groupbox)
- self.launch_params_label.setObjectName("launch_params_label")
- self.launch_settings_layout.addWidget(self.launch_params_label, 3, 0, 1, 1, QtCore.Qt.AlignRight)
self.skip_update = QtWidgets.QComboBox(self.launch_settings_groupbox)
self.skip_update.setObjectName("skip_update")
self.skip_update.addItem("")
self.skip_update.addItem("")
self.skip_update.addItem("")
self.launch_settings_layout.addWidget(self.skip_update, 0, 1, 1, 1, QtCore.Qt.AlignLeft)
- self.skip_update_label = QtWidgets.QLabel(self.launch_settings_groupbox)
- self.skip_update_label.setObjectName("skip_update_label")
- self.launch_settings_layout.addWidget(self.skip_update_label, 0, 0, 1, 1, QtCore.Qt.AlignRight)
- self.offline_label = QtWidgets.QLabel(self.launch_settings_groupbox)
- self.offline_label.setObjectName("offline_label")
- self.launch_settings_layout.addWidget(self.offline_label, 1, 0, 1, 1, QtCore.Qt.AlignRight)
- self.wrapper_label = QtWidgets.QLabel(self.launch_settings_groupbox)
- self.wrapper_label.setObjectName("wrapper_label")
- self.launch_settings_layout.addWidget(self.wrapper_label, 4, 0, 1, 1, QtCore.Qt.AlignRight)
- self.offline = QtWidgets.QComboBox(self.launch_settings_groupbox)
- self.offline.setObjectName("offline")
- self.offline.addItem("")
- self.offline.addItem("")
- self.offline.addItem("")
- self.launch_settings_layout.addWidget(self.offline, 1, 1, 1, 1, QtCore.Qt.AlignLeft)
self.cloud_sync = QtWidgets.QCheckBox(self.launch_settings_groupbox)
self.cloud_sync.setText("")
self.cloud_sync.setObjectName("cloud_sync")
self.launch_settings_layout.addWidget(self.cloud_sync, 2, 1, 1, 1, QtCore.Qt.AlignLeft)
- self.cloud_sync_label = QtWidgets.QLabel(self.launch_settings_groupbox)
- self.cloud_sync_label.setObjectName("cloud_sync_label")
- self.launch_settings_layout.addWidget(self.cloud_sync_label, 2, 0, 1, 1, QtCore.Qt.AlignRight)
+ self.launch_params_label = QtWidgets.QLabel(self.launch_settings_groupbox)
+ self.launch_params_label.setObjectName("launch_params_label")
+ self.launch_settings_layout.addWidget(self.launch_params_label, 3, 0, 1, 1, QtCore.Qt.AlignRight)
+ self.wrapper_label = QtWidgets.QLabel(self.launch_settings_groupbox)
+ self.wrapper_label.setObjectName("wrapper_label")
+ self.launch_settings_layout.addWidget(self.wrapper_label, 4, 0, 1, 1, QtCore.Qt.AlignRight)
+ self.skip_update_label = QtWidgets.QLabel(self.launch_settings_groupbox)
+ self.skip_update_label.setObjectName("skip_update_label")
+ self.launch_settings_layout.addWidget(self.skip_update_label, 0, 0, 1, 1, QtCore.Qt.AlignRight)
self.wrapper_widget = QtWidgets.QWidget(self.launch_settings_groupbox)
self.wrapper_widget.setObjectName("wrapper_widget")
self.wrapper_layout = QtWidgets.QHBoxLayout(self.wrapper_widget)
self.wrapper_layout.setContentsMargins(0, 0, 0, 0)
self.wrapper_layout.setObjectName("wrapper_layout")
self.wrapper = QtWidgets.QLineEdit(self.wrapper_widget)
+ self.wrapper.setMinimumSize(QtCore.QSize(400, 0))
self.wrapper.setObjectName("wrapper")
self.wrapper_layout.addWidget(self.wrapper)
self.wrapper_button = QtWidgets.QPushButton(self.wrapper_widget)
self.wrapper_button.setObjectName("wrapper_button")
self.wrapper_layout.addWidget(self.wrapper_button)
self.launch_settings_layout.addWidget(self.wrapper_widget, 4, 1, 1, 1)
+ self.offline_label = QtWidgets.QLabel(self.launch_settings_groupbox)
+ self.offline_label.setObjectName("offline_label")
+ self.launch_settings_layout.addWidget(self.offline_label, 1, 0, 1, 1, QtCore.Qt.AlignRight)
+ self.offline = QtWidgets.QComboBox(self.launch_settings_groupbox)
+ self.offline.setObjectName("offline")
+ self.offline.addItem("")
+ self.offline.addItem("")
+ self.offline.addItem("")
+ self.launch_settings_layout.addWidget(self.offline, 1, 1, 1, 1, QtCore.Qt.AlignLeft)
self.launch_params_widget = QtWidgets.QWidget(self.launch_settings_groupbox)
self.launch_params_widget.setObjectName("launch_params_widget")
self.launch_params_layout = QtWidgets.QHBoxLayout(self.launch_params_widget)
self.launch_params_layout.setContentsMargins(0, 0, 0, 0)
self.launch_params_layout.setObjectName("launch_params_layout")
self.launch_params = QtWidgets.QLineEdit(self.launch_params_widget)
+ self.launch_params.setMinimumSize(QtCore.QSize(400, 0))
self.launch_params.setObjectName("launch_params")
self.launch_params_layout.addWidget(self.launch_params)
self.launch_params_button = QtWidgets.QPushButton(self.launch_params_widget)
self.launch_params_button.setObjectName("launch_params_button")
self.launch_params_layout.addWidget(self.launch_params_button)
self.launch_settings_layout.addWidget(self.launch_params_widget, 3, 1, 1, 1)
+ self.cloud_sync_label = QtWidgets.QLabel(self.launch_settings_groupbox)
+ self.cloud_sync_label.setObjectName("cloud_sync_label")
+ self.launch_settings_layout.addWidget(self.cloud_sync_label, 2, 0, 1, 1, QtCore.Qt.AlignRight)
self.game_settings_layout.addWidget(self.launch_settings_groupbox)
self.proton_groupbox = QtWidgets.QGroupBox(GameSettings)
self.proton_groupbox.setObjectName("proton_groupbox")
self.proton_layout = QtWidgets.QGridLayout(self.proton_groupbox)
self.proton_layout.setObjectName("proton_layout")
- self.proton_prefix_label = QtWidgets.QLabel(self.proton_groupbox)
- self.proton_prefix_label.setObjectName("proton_prefix_label")
- self.proton_layout.addWidget(self.proton_prefix_label, 1, 0, 1, 1, QtCore.Qt.AlignRight)
- self.proton_wrapper_label = QtWidgets.QLabel(self.proton_groupbox)
- self.proton_wrapper_label.setObjectName("proton_wrapper_label")
- self.proton_layout.addWidget(self.proton_wrapper_label, 0, 0, 1, 1, QtCore.Qt.AlignRight)
self.proton_wrapper = QtWidgets.QComboBox(self.proton_groupbox)
self.proton_wrapper.setObjectName("proton_wrapper")
self.proton_wrapper.addItem("")
self.proton_layout.addWidget(self.proton_wrapper, 0, 1, 1, 1, QtCore.Qt.AlignLeft)
+ self.proton_wrapper_label = QtWidgets.QLabel(self.proton_groupbox)
+ self.proton_wrapper_label.setObjectName("proton_wrapper_label")
+ self.proton_layout.addWidget(self.proton_wrapper_label, 0, 0, 1, 1, QtCore.Qt.AlignRight)
+ self.proton_prefix_label = QtWidgets.QLabel(self.proton_groupbox)
+ self.proton_prefix_label.setObjectName("proton_prefix_label")
+ self.proton_layout.addWidget(self.proton_prefix_label, 1, 0, 1, 1, QtCore.Qt.AlignRight)
+ spacerItem = QtWidgets.QSpacerItem(20, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+ self.proton_layout.addItem(spacerItem, 4, 1, 1, 1)
self.proton_prefix_layout = QtWidgets.QVBoxLayout()
self.proton_prefix_layout.setObjectName("proton_prefix_layout")
self.proton_layout.addLayout(self.proton_prefix_layout, 1, 1, 2, 1)
@@ -104,13 +107,13 @@ class Ui_GameSettings(object):
self.proton_prefix_alignment_label.setText("")
self.proton_prefix_alignment_label.setObjectName("proton_prefix_alignment_label")
self.proton_layout.addWidget(self.proton_prefix_alignment_label, 2, 0, 1, 1)
- self.game_settings_layout.addWidget(self.proton_groupbox)
self.linux_layout = QtWidgets.QVBoxLayout()
self.linux_layout.setSpacing(0)
self.linux_layout.setObjectName("linux_layout")
- self.game_settings_layout.addLayout(self.linux_layout)
- spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
- self.game_settings_layout.addItem(spacerItem)
+ self.proton_layout.addLayout(self.linux_layout, 3, 0, 1, 2)
+ self.game_settings_layout.addWidget(self.proton_groupbox)
+ spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+ self.game_settings_layout.addItem(spacerItem1)
self.retranslateUi(GameSettings)
QtCore.QMetaObject.connectSlotsByName(GameSettings)
@@ -119,25 +122,25 @@ class Ui_GameSettings(object):
_translate = QtCore.QCoreApplication.translate
GameSettings.setWindowTitle(_translate("GameSettings", "Game Settings"))
self.launch_settings_groupbox.setTitle(_translate("GameSettings", "Launch Settings"))
- self.launch_params_label.setText(_translate("GameSettings", "Launch parameters:"))
self.skip_update.setItemText(0, _translate("GameSettings", "Default"))
self.skip_update.setItemText(1, _translate("GameSettings", "Yes"))
self.skip_update.setItemText(2, _translate("GameSettings", "No"))
- self.skip_update_label.setText(_translate("GameSettings", "Skip update check:"))
- self.offline_label.setText(_translate("GameSettings", "Offline mode:"))
- self.wrapper_label.setText(_translate("GameSettings", "Wrapper:"))
+ self.launch_params_label.setText(_translate("GameSettings", "Launch parameters"))
+ self.wrapper_label.setText(_translate("GameSettings", "Wrapper"))
+ self.skip_update_label.setText(_translate("GameSettings", "Skip update check"))
+ self.wrapper.setPlaceholderText(_translate("GameSettings", "e.g. optirun"))
+ self.wrapper_button.setText(_translate("GameSettings", "Save"))
+ self.offline_label.setText(_translate("GameSettings", "Offline mode"))
self.offline.setItemText(0, _translate("GameSettings", "Default"))
self.offline.setItemText(1, _translate("GameSettings", "Yes"))
self.offline.setItemText(2, _translate("GameSettings", "No"))
- self.cloud_sync_label.setText(_translate("GameSettings", "Sync with cloud:"))
- self.wrapper.setPlaceholderText(_translate("GameSettings", "e.g. optirun"))
- self.wrapper_button.setText(_translate("GameSettings", "Save"))
self.launch_params.setPlaceholderText(_translate("GameSettings", "parameters"))
self.launch_params_button.setText(_translate("GameSettings", "Save"))
- self.proton_groupbox.setTitle(_translate("GameSettings", "Proton"))
- self.proton_prefix_label.setText(_translate("GameSettings", "Prefix:"))
- self.proton_wrapper_label.setText(_translate("GameSettings", "Wrapper:"))
+ self.cloud_sync_label.setText(_translate("GameSettings", "Sync with cloud"))
+ self.proton_groupbox.setTitle(_translate("GameSettings", "Linux Settings"))
self.proton_wrapper.setItemText(0, _translate("GameSettings", "Don\'t use Proton"))
+ self.proton_wrapper_label.setText(_translate("GameSettings", "Proton"))
+ self.proton_prefix_label.setText(_translate("GameSettings", "Prefix"))
if __name__ == "__main__":
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 fddd8321..b33b20a3 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
- 668
- 433
+ 759
+ 617
@@ -30,13 +30,6 @@
Launch Settings
- -
-
-
- Launch parameters:
-
-
-
-
-
@@ -56,46 +49,6 @@
- -
-
-
- Skip update check:
-
-
-
- -
-
-
- Offline mode:
-
-
-
- -
-
-
- Wrapper:
-
-
-
- -
-
-
-
-
- Default
-
-
- -
-
- Yes
-
-
- -
-
- No
-
-
-
-
-
@@ -103,10 +56,24 @@
- -
-
+
-
+
- Sync with cloud:
+ Launch parameters
+
+
+
+ -
+
+
+ Wrapper
+
+
+
+ -
+
+
+ Skip update check
@@ -127,6 +94,12 @@
-
+
+
+ 400
+ 0
+
+
e.g. optirun
@@ -142,6 +115,32 @@
+ -
+
+
+ Offline mode
+
+
+
+ -
+
+
-
+
+ Default
+
+
+ -
+
+ Yes
+
+
+ -
+
+ No
+
+
+
+
-
@@ -159,6 +158,12 @@
-
+
+
+ 400
+ 0
+
+
parameters
@@ -174,29 +179,22 @@
+ -
+
+
+ Sync with cloud
+
+
+
-
- Proton
+ Linux Settings
-
-
-
-
- Prefix:
-
-
-
- -
-
-
- Wrapper:
-
-
-
-
-
@@ -206,6 +204,36 @@
+ -
+
+
+ Proton
+
+
+
+ -
+
+
+ Prefix
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Maximum
+
+
+
+ 20
+ 0
+
+
+
+
-
@@ -219,16 +247,16 @@
+ -
+
+
+ 0
+
+
+
- -
-
-
- 0
-
-
-
-
diff --git a/rare/ui/components/tabs/settings/about.py b/rare/ui/components/tabs/settings/about.py
index 9aea4e10..e98ac7f9 100644
--- a/rare/ui/components/tabs/settings/about.py
+++ b/rare/ui/components/tabs/settings/about.py
@@ -96,12 +96,12 @@ class Ui_About(object):
_translate = QtCore.QCoreApplication.translate
About.setWindowTitle(_translate("About", "About"))
self.open_browser.setText(_translate("About", "Download latest release"))
- self.version_label.setText(_translate("About", "Version:"))
- self.license_label.setText(_translate("About", "License:"))
- self.lgd_dev_label.setText(_translate("About", "Legendary Developer:"))
+ self.version_label.setText(_translate("About", "Version"))
+ self.license_label.setText(_translate("About", "License"))
+ self.lgd_dev_label.setText(_translate("About", "Legendary Developer"))
self.dev.setToolTip(_translate("About", "Github"))
- self.update_label.setText(_translate("About", "Update available:"))
- self.dev_label.setText(_translate("About", "Rare Developer:"))
+ self.update_label.setText(_translate("About", "Update available"))
+ self.dev_label.setText(_translate("About", "Rare Developer"))
self.license.setText(_translate("About", "GNU General Public License v3.0"))
self.lgd_dev.setToolTip(_translate("About", "Github"))
self.info_text.setText(_translate("About", "This is a beta version, so you can get bugs. If you get a bug, please report it by creating an Issue on Github. You can also contact me on Discord (Dummerle#7419). Or you can join the Discord server"))
diff --git a/rare/ui/components/tabs/settings/about.ui b/rare/ui/components/tabs/settings/about.ui
index f46dfd69..eb21f288 100644
--- a/rare/ui/components/tabs/settings/about.ui
+++ b/rare/ui/components/tabs/settings/about.ui
@@ -30,7 +30,7 @@
- Version:
+ Version
@@ -43,7 +43,7 @@
- License:
+ License
@@ -56,7 +56,7 @@
- Legendary Developer:
+ Legendary Developer
@@ -82,7 +82,7 @@
- Update available:
+ Update available
@@ -102,7 +102,7 @@
- Rare Developer:
+ Rare Developer
diff --git a/rare/ui/components/tabs/settings/dxvk.py b/rare/ui/components/tabs/settings/dxvk.py
index 64f5c9b8..56b0f335 100644
--- a/rare/ui/components/tabs/settings/dxvk.py
+++ b/rare/ui/components/tabs/settings/dxvk.py
@@ -20,29 +20,29 @@ class Ui_DxvkSettings(object):
self.gb_dxvk_options.setObjectName("gb_dxvk_options")
self.layout_dxvk_options = QtWidgets.QGridLayout(self.gb_dxvk_options)
self.layout_dxvk_options.setObjectName("layout_dxvk_options")
- self.api = QtWidgets.QCheckBox(self.gb_dxvk_options)
- self.api.setObjectName("api")
- self.layout_dxvk_options.addWidget(self.api, 2, 2, 1, 1)
self.version = QtWidgets.QCheckBox(self.gb_dxvk_options)
self.version.setObjectName("version")
self.layout_dxvk_options.addWidget(self.version, 0, 2, 1, 1)
+ self.fps = QtWidgets.QCheckBox(self.gb_dxvk_options)
+ self.fps.setObjectName("fps")
+ self.layout_dxvk_options.addWidget(self.fps, 1, 0, 1, 1)
self.memory = QtWidgets.QCheckBox(self.gb_dxvk_options)
self.memory.setObjectName("memory")
self.layout_dxvk_options.addWidget(self.memory, 0, 1, 1, 1)
self.devinfo = QtWidgets.QCheckBox(self.gb_dxvk_options)
self.devinfo.setObjectName("devinfo")
self.layout_dxvk_options.addWidget(self.devinfo, 0, 0, 1, 1)
- self.frametime = QtWidgets.QCheckBox(self.gb_dxvk_options)
- self.frametime.setObjectName("frametime")
- self.layout_dxvk_options.addWidget(self.frametime, 3, 0, 1, 1)
self.gpuload = QtWidgets.QCheckBox(self.gb_dxvk_options)
self.gpuload.setObjectName("gpuload")
- self.layout_dxvk_options.addWidget(self.gpuload, 2, 1, 1, 1)
- self.fps = QtWidgets.QCheckBox(self.gb_dxvk_options)
- self.fps.setObjectName("fps")
- self.layout_dxvk_options.addWidget(self.fps, 2, 0, 1, 1)
+ self.layout_dxvk_options.addWidget(self.gpuload, 1, 1, 1, 1)
+ self.frametime = QtWidgets.QCheckBox(self.gb_dxvk_options)
+ self.frametime.setObjectName("frametime")
+ self.layout_dxvk_options.addWidget(self.frametime, 2, 0, 1, 1)
spacerItem = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
- self.layout_dxvk_options.addItem(spacerItem, 0, 3, 4, 1)
+ self.layout_dxvk_options.addItem(spacerItem, 0, 3, 3, 1)
+ 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.lbl_show_dxvk = QtWidgets.QLabel(DxvkSettings)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
@@ -73,14 +73,14 @@ class Ui_DxvkSettings(object):
DxvkSettings.setWindowTitle(_translate("DxvkSettings", "DxvkSettings"))
DxvkSettings.setTitle(_translate("DxvkSettings", "DXVK Settings"))
self.gb_dxvk_options.setTitle(_translate("DxvkSettings", "DXVK HUD Options"))
- self.api.setText(_translate("DxvkSettings", "D3D Version"))
self.version.setText(_translate("DxvkSettings", "DXVK Version"))
+ self.fps.setText(_translate("DxvkSettings", "FPS"))
self.memory.setText(_translate("DxvkSettings", "Memory Usage"))
self.devinfo.setText(_translate("DxvkSettings", "Device Info"))
- self.frametime.setText(_translate("DxvkSettings", "Frame Time graph"))
self.gpuload.setText(_translate("DxvkSettings", "GPU Usage"))
- self.fps.setText(_translate("DxvkSettings", "FPS"))
- self.lbl_show_dxvk.setText(_translate("DxvkSettings", "Show HUD:"))
+ self.frametime.setText(_translate("DxvkSettings", "Frame Time graph"))
+ self.api.setText(_translate("DxvkSettings", "D3D Version"))
+ self.lbl_show_dxvk.setText(_translate("DxvkSettings", "Show HUD"))
self.show_dxvk.setItemText(0, _translate("DxvkSettings", "System Default"))
self.show_dxvk.setItemText(1, _translate("DxvkSettings", "Hidden"))
self.show_dxvk.setItemText(2, _translate("DxvkSettings", "Visible"))
diff --git a/rare/ui/components/tabs/settings/dxvk.ui b/rare/ui/components/tabs/settings/dxvk.ui
index edf5b241..dfa9eceb 100644
--- a/rare/ui/components/tabs/settings/dxvk.ui
+++ b/rare/ui/components/tabs/settings/dxvk.ui
@@ -2,6 +2,14 @@
DxvkSettings
+
+
+ 0
+ 0
+ 419
+ 185
+
+
DxvkSettings
@@ -15,13 +23,6 @@
DXVK HUD Options
- -
-
-
- D3D Version
-
-
-
-
@@ -29,6 +30,13 @@
+ -
+
+
+ FPS
+
+
+
-
@@ -43,14 +51,7 @@
- -
-
-
- Frame Time graph
-
-
-
- -
+
-
GPU Usage
@@ -58,13 +59,13 @@
-
-
+
- FPS
+ Frame Time graph
- -
+
-
Qt::Horizontal
@@ -77,6 +78,13 @@
+ -
+
+
+ D3D Version
+
+
+
@@ -89,7 +97,7 @@
- Show HUD:
+ Show HUD
diff --git a/rare/ui/components/tabs/settings/legendary.py b/rare/ui/components/tabs/settings/legendary.py
index b9d5cfb3..c2a0c8c8 100644
--- a/rare/ui/components/tabs/settings/legendary.py
+++ b/rare/ui/components/tabs/settings/legendary.py
@@ -68,7 +68,7 @@ class Ui_LegendarySettings(object):
LegendarySettings.setWindowTitle(_translate("LegendarySettings", "LegendarySettings"))
self.gb_install_dir.setTitle(_translate("LegendarySettings", "Default Installation Directory"))
self.gb_downloads.setTitle(_translate("LegendarySettings", "Download Settings"))
- self.lbl_max_workers.setText(_translate("LegendarySettings", "Max Workers:"))
+ self.lbl_max_workers.setText(_translate("LegendarySettings", "Max Workers"))
self.lbl_max_workers_info.setText(_translate("LegendarySettings", "Less is slower (0: Default)"))
self.gb_clean.setTitle(_translate("LegendarySettings", "Cleanup"))
self.clean_button_without_manifests.setText(_translate("LegendarySettings", "Clean, but keep manifests"))
diff --git a/rare/ui/components/tabs/settings/legendary.ui b/rare/ui/components/tabs/settings/legendary.ui
index efa42912..50481a31 100644
--- a/rare/ui/components/tabs/settings/legendary.ui
+++ b/rare/ui/components/tabs/settings/legendary.ui
@@ -37,7 +37,7 @@
- Max Workers:
+ Max Workers
diff --git a/rare/ui/components/tabs/settings/linux.py b/rare/ui/components/tabs/settings/linux.py
index ddce9200..4c23dec1 100644
--- a/rare/ui/components/tabs/settings/linux.py
+++ b/rare/ui/components/tabs/settings/linux.py
@@ -57,8 +57,8 @@ class Ui_LinuxSettings(object):
_translate = QtCore.QCoreApplication.translate
LinuxSettings.setWindowTitle(_translate("LinuxSettings", "LinuxSettings"))
self.wine_groupbox.setTitle(_translate("LinuxSettings", "Wine Settings"))
- self.exec_label.setText(_translate("LinuxSettings", "Executable:"))
- self.prefix_label.setText(_translate("LinuxSettings", "Prefix:"))
+ self.exec_label.setText(_translate("LinuxSettings", "Executable"))
+ self.prefix_label.setText(_translate("LinuxSettings", "Prefix"))
if __name__ == "__main__":
diff --git a/rare/ui/components/tabs/settings/linux.ui b/rare/ui/components/tabs/settings/linux.ui
index e4bf0abb..4cee6742 100644
--- a/rare/ui/components/tabs/settings/linux.ui
+++ b/rare/ui/components/tabs/settings/linux.ui
@@ -36,14 +36,14 @@
-
- Executable:
+ Executable
-
- Prefix:
+ Prefix
diff --git a/rare/ui/components/tabs/settings/rpc_settings.py b/rare/ui/components/tabs/settings/rpc_settings.py
index a01c3d36..3005e246 100644
--- a/rare/ui/components/tabs/settings/rpc_settings.py
+++ b/rare/ui/components/tabs/settings/rpc_settings.py
@@ -14,7 +14,6 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_RPCSettings(object):
def setupUi(self, RPCSettings):
RPCSettings.setObjectName("RPCSettings")
- RPCSettings.resize(167, 144)
self.gridLayout = QtWidgets.QGridLayout(RPCSettings)
self.gridLayout.setObjectName("gridLayout")
self.enable = QtWidgets.QComboBox(RPCSettings)
@@ -51,7 +50,7 @@ class Ui_RPCSettings(object):
self.enable.setItemText(0, _translate("RPCSettings", "When Playing"))
self.enable.setItemText(1, _translate("RPCSettings", "Always"))
self.enable.setItemText(2, _translate("RPCSettings", "Never"))
- self.label.setText(_translate("RPCSettings", "Show:"))
+ self.label.setText(_translate("RPCSettings", "Show"))
self.show_game.setText(_translate("RPCSettings", "Show Game"))
self.show_os.setText(_translate("RPCSettings", "Show OS"))
self.show_time.setText(_translate("RPCSettings", "Show Time playing"))
diff --git a/rare/ui/components/tabs/settings/rpc_settings.ui b/rare/ui/components/tabs/settings/rpc_settings.ui
index 4a92cf7e..b71d4119 100644
--- a/rare/ui/components/tabs/settings/rpc_settings.ui
+++ b/rare/ui/components/tabs/settings/rpc_settings.ui
@@ -6,8 +6,8 @@
0
0
- 167
- 144
+ 178
+ 146
@@ -45,7 +45,7 @@
- Show:
+ Show
diff --git a/rare/ui/utils/pathedit.py b/rare/ui/utils/pathedit.py
index 28e7068f..0752f0b1 100644
--- a/rare/ui/utils/pathedit.py
+++ b/rare/ui/utils/pathedit.py
@@ -18,7 +18,6 @@ class Ui_PathEdit(object):
self.layout_pathedit.setContentsMargins(0, 0, 0, 0)
self.layout_pathedit.setObjectName("layout_pathedit")
self.path_select = QtWidgets.QToolButton(PathEdit)
- self.path_select.setText("...")
self.path_select.setObjectName("path_select")
self.layout_pathedit.addWidget(self.path_select, 0, 1, 1, 1)
self.text_edit = QtWidgets.QLineEdit(PathEdit)
@@ -41,6 +40,7 @@ class Ui_PathEdit(object):
def retranslateUi(self, PathEdit):
_translate = QtCore.QCoreApplication.translate
PathEdit.setWindowTitle(_translate("PathEdit", "PathEdit"))
+ self.path_select.setText(_translate("PathEdit", "Browse..."))
self.text_edit.setPlaceholderText(_translate("PathEdit", "Default"))
self.save_path_button.setText(_translate("PathEdit", "Save"))
diff --git a/rare/ui/utils/pathedit.ui b/rare/ui/utils/pathedit.ui
index b3b0e946..a297a6d0 100644
--- a/rare/ui/utils/pathedit.ui
+++ b/rare/ui/utils/pathedit.ui
@@ -21,7 +21,7 @@
-
- ...
+ Browse...