diff --git a/rare/components/dialogs/install_dialog.py b/rare/components/dialogs/install_dialog.py
index 6ddd718f..8f0d8435 100644
--- a/rare/components/dialogs/install_dialog.py
+++ b/rare/components/dialogs/install_dialog.py
@@ -45,6 +45,8 @@ class InstallDialog(QDialog):
self.ui.setupUi(self)
self.setAttribute(Qt.WA_DeleteOnClose, True)
self.setWindowFlags(Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint)
+ # lk: set object names for CSS properties
+ self.ui.install_button.setObjectName("InstallButton")
self.core = LegendaryCoreSingleton()
self.rgame = rgame
diff --git a/rare/components/dialogs/uninstall_dialog.py b/rare/components/dialogs/uninstall_dialog.py
index fee9829b..0486eace 100644
--- a/rare/components/dialogs/uninstall_dialog.py
+++ b/rare/components/dialogs/uninstall_dialog.py
@@ -33,10 +33,11 @@ class UninstallDialog(QDialog):
self.keep_config = QCheckBox(self.tr("Keep game configuation."))
self.keep_config.setChecked(bool(options.keep_config))
- self.ok_button = QPushButton(
+ self.uninstall_button = QPushButton(
icon("ei.remove-circle", color="red"), self.tr("Uninstall")
)
- self.ok_button.clicked.connect(self.__on_uninstall)
+ self.uninstall_button.setObjectName("UninstallButton")
+ self.uninstall_button.clicked.connect(self.__on_uninstall)
self.cancel_button = QPushButton(self.tr("Cancel"))
self.cancel_button.clicked.connect(self.__on_cancel)
@@ -47,9 +48,9 @@ class UninstallDialog(QDialog):
form_layout.addWidget(self.keep_config)
button_layout = QHBoxLayout()
- button_layout.addWidget(self.ok_button)
- button_layout.addStretch(1)
button_layout.addWidget(self.cancel_button)
+ button_layout.addStretch(1)
+ button_layout.addWidget(self.uninstall_button)
layout = QVBoxLayout()
layout.addWidget(self.info_text)
diff --git a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py
index d2579624..dcdef40a 100644
Binary files a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py and b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py differ
diff --git a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss
index 2a694436..4e681fbf 100644
--- a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss
+++ b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss
@@ -425,15 +425,18 @@ QRadioButton::indicator:checked:disabled {
QGroupBox {
font-weight: bold;
- margin-top: 0.5em;
/* margin-left: 0.5em; /* Offset to the left */
border-width: 1px;
border-style: solid;
border-radius: 4px;
padding-top: 1.2em;
}
+QGroupBox[checkable="true"] {
+ margin-top: 0.5em;
+}
QToolBox {
font-weight: bold;
+ padding: 0px;
}
QToolBox::tab,
QGroupBox::title {
diff --git a/rare/resources/stylesheets/RareStyle/__init__.py b/rare/resources/stylesheets/RareStyle/__init__.py
index 1c979a18..1beadedc 100644
Binary files a/rare/resources/stylesheets/RareStyle/__init__.py and b/rare/resources/stylesheets/RareStyle/__init__.py differ
diff --git a/rare/resources/stylesheets/RareStyle/stylesheet.qss b/rare/resources/stylesheets/RareStyle/stylesheet.qss
index 2e23edbd..00bf18dc 100644
--- a/rare/resources/stylesheets/RareStyle/stylesheet.qss
+++ b/rare/resources/stylesheets/RareStyle/stylesheet.qss
@@ -431,15 +431,18 @@ QRadioButton::indicator:checked:disabled {
QGroupBox {
font-weight: bold;
- margin-top: 0.5em;
/* margin-left: 0.5em; /* Offset to the left */
border-width: 1px;
border-style: solid;
border-radius: 4px;
padding-top: 1.2em;
}
+QGroupBox[checkable="true"] {
+ margin-top: 0.5em;
+}
QToolBox {
font-weight: bold;
+ padding: 0px;
}
QToolBox::tab,
QGroupBox::title {
diff --git a/rare/ui/components/tabs/downloads/downloads_tab.py b/rare/ui/components/tabs/downloads/downloads_tab.py
index 941fdedb..aba75c7c 100644
--- a/rare/ui/components/tabs/downloads/downloads_tab.py
+++ b/rare/ui/components/tabs/downloads/downloads_tab.py
@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_DownloadsTab(object):
def setupUi(self, DownloadsTab):
DownloadsTab.setObjectName("DownloadsTab")
- DownloadsTab.resize(677, 195)
+ DownloadsTab.resize(677, 203)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -161,7 +161,7 @@ class Ui_DownloadsTab(object):
self.queue_scroll_contents.setSizePolicy(sizePolicy)
self.queue_scroll_contents.setObjectName("queue_scroll_contents")
self.queue_scroll_contents_layout = QtWidgets.QVBoxLayout(self.queue_scroll_contents)
- self.queue_scroll_contents_layout.setContentsMargins(0, 0, 9, 0)
+ self.queue_scroll_contents_layout.setContentsMargins(0, 0, 3, 0)
self.queue_scroll_contents_layout.setObjectName("queue_scroll_contents_layout")
self.queue_scroll.setWidget(self.queue_scroll_contents)
self.downloads_tab_layout.addWidget(self.queue_scroll)
diff --git a/rare/ui/components/tabs/downloads/downloads_tab.ui b/rare/ui/components/tabs/downloads/downloads_tab.ui
index 34affbc2..e00bc800 100644
--- a/rare/ui/components/tabs/downloads/downloads_tab.ui
+++ b/rare/ui/components/tabs/downloads/downloads_tab.ui
@@ -7,7 +7,7 @@
0
0
677
- 195
+ 203
@@ -254,7 +254,7 @@
0
- 9
+ 3
0
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 57e258ce..7bb5d91a 100644
--- a/rare/ui/components/tabs/games/game_info/game_settings.py
+++ b/rare/ui/components/tabs/games/game_info/game_settings.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'rare/ui/components/tabs/games/game_info/game_settings.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.7
#
# 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.
@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_GameSettings(object):
def setupUi(self, GameSettings):
GameSettings.setObjectName("GameSettings")
- GameSettings.resize(448, 310)
+ GameSettings.resize(263, 258)
self.game_settings_layout = QtWidgets.QVBoxLayout(GameSettings)
self.game_settings_layout.setObjectName("game_settings_layout")
self.launch_settings_group = QtWidgets.QGroupBox(GameSettings)
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 eaf6f46d..626a84c2 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
- 448
- 310
+ 263
+ 258
diff --git a/rare/utils/extra_widgets.py b/rare/utils/extra_widgets.py
index 1eaed5d2..58140e38 100644
--- a/rare/utils/extra_widgets.py
+++ b/rare/utils/extra_widgets.py
@@ -307,7 +307,7 @@ class SideTabContainer(QWidget):
self.scrollarea.setFrameStyle(QScrollArea.NoFrame)
if widget.layout():
widget.layout().setAlignment(Qt.AlignTop)
- widget.layout().setContentsMargins(0, 0, 9, 0)
+ widget.layout().setContentsMargins(0, 0, 3, 0)
widget.title = self.title
widget.title.setTitle = self.setTitle
self.scrollarea.setMinimumWidth(