diff --git a/rare/components/tabs/settings/rare.py b/rare/components/tabs/settings/rare.py
index e067f142..e2686064 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(
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 @@
+ -
+
+
-