diff --git a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py
index e92a93fa..b7ec5de0 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 115ff41d..5f2fec42 100644
--- a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss
+++ b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss
@@ -106,12 +106,14 @@ QSpinBox,
QDoubleSpinBox,
QProgressBar,
QPushButton {
+ min-height: 3.00ex;
/* min-height: 1.30em; */
- min-height: 18px;
+ /* min-height: 18px; */
}
QToolButton {
+ min-height: 3.00ex;
/* min-height: 1.10em; */
- min-height: 15px;
+ /* min-height: 15px; */
}
QFrame[frameShape="0"] {
@@ -181,15 +183,19 @@ QComboBox QAbstractItemView {
border-top-width: 1;
image: url(":/stylesheets/ChildOfMetropolis/sort-down.svg");
}
+
QProgressBar {
padding: 0px;
text-align: center;
}
QProgressBar::chunk {
+ padding: 0px;
+ border-width: 0px;
width: 2%;
- margin: 0%;
+ margin: 0px;
background-color: #71DA7E;
}
+
QScrollBar {
border-radius: 4px;
padding: 1px;
diff --git a/rare/resources/stylesheets/RareStyle/__init__.py b/rare/resources/stylesheets/RareStyle/__init__.py
index 5a7bf933..e3221643 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 e55a5533..831a1483 100644
--- a/rare/resources/stylesheets/RareStyle/stylesheet.qss
+++ b/rare/resources/stylesheets/RareStyle/stylesheet.qss
@@ -106,12 +106,14 @@ QSpinBox,
QDoubleSpinBox,
QProgressBar,
QPushButton {
+ min-height: 3.00ex;
/* min-height: 1.30em; */
- min-height: 18px;
+ /* min-height: 18px; */
}
QToolButton {
+ min-height: 3.00ex;
/* min-height: 1.10em; */
- min-height: 15px;
+ /* min-height: 15px; */
}
QFrame[frameShape="0"] {
@@ -181,15 +183,19 @@ QComboBox QAbstractItemView {
border-top-width: 1;
image: url(":/stylesheets/RareStyle/sort-down.svg");
}
+
QProgressBar {
padding: 0px;
text-align: center;
}
QProgressBar::chunk {
+ padding: 0px;
+ border-width: 0px;
width: 2%;
- margin: 0%;
+ margin: 0px;
background-color: rgb( 39, 66, 66);
}
+
QScrollBar {
border-radius: 4px;
padding: 1px;
diff --git a/rare/ui/components/tabs/downloads/download_widget.py b/rare/ui/components/tabs/downloads/download_widget.py
index 4b0b3599..ebacb9bd 100644
--- a/rare/ui/components/tabs/downloads/download_widget.py
+++ b/rare/ui/components/tabs/downloads/download_widget.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'rare/ui/components/tabs/downloads/download_widget.ui'
#
-# Created by: PyQt5 UI code generator 5.15.8
+# Created by: PyQt5 UI code generator 5.15.10
#
# 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,28 +14,24 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_DownloadWidget(object):
def setupUi(self, DownloadWidget):
DownloadWidget.setObjectName("DownloadWidget")
- DownloadWidget.resize(490, 90)
+ DownloadWidget.resize(479, 86)
DownloadWidget.setWindowTitle("DownloadWidget")
self.active_download_layout = QtWidgets.QGridLayout(DownloadWidget)
self.active_download_layout.setContentsMargins(0, 0, 0, 0)
self.active_download_layout.setObjectName("active_download_layout")
- self.downloaded = QtWidgets.QLabel(DownloadWidget)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+ self.dl_name = QtWidgets.QLabel(DownloadWidget)
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.downloaded.sizePolicy().hasHeightForWidth())
- self.downloaded.setSizePolicy(sizePolicy)
- self.downloaded.setText("downloaded")
- self.downloaded.setObjectName("downloaded")
- self.active_download_layout.addWidget(self.downloaded, 2, 3, 1, 1)
- self.dl_speed_label = QtWidgets.QLabel(DownloadWidget)
+ sizePolicy.setHeightForWidth(self.dl_name.sizePolicy().hasHeightForWidth())
+ self.dl_name.setSizePolicy(sizePolicy)
font = QtGui.QFont()
- font.setBold(True)
- font.setWeight(75)
- self.dl_speed_label.setFont(font)
- self.dl_speed_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
- self.dl_speed_label.setObjectName("dl_speed_label")
- self.active_download_layout.addWidget(self.dl_speed_label, 1, 2, 1, 1)
+ font.setBold(False)
+ font.setWeight(50)
+ self.dl_name.setFont(font)
+ self.dl_name.setText("dl_name")
+ self.dl_name.setObjectName("dl_name")
+ self.active_download_layout.addWidget(self.dl_name, 0, 1, 1, 3)
self.dl_name_label = QtWidgets.QLabel(DownloadWidget)
font = QtGui.QFont()
font.setBold(True)
@@ -53,15 +49,14 @@ class Ui_DownloadWidget(object):
self.cache_used.setText("cache_used")
self.cache_used.setObjectName("cache_used")
self.active_download_layout.addWidget(self.cache_used, 2, 1, 1, 1)
- self.time_left = QtWidgets.QLabel(DownloadWidget)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.time_left.sizePolicy().hasHeightForWidth())
- self.time_left.setSizePolicy(sizePolicy)
- self.time_left.setText("time_left")
- self.time_left.setObjectName("time_left")
- self.active_download_layout.addWidget(self.time_left, 1, 1, 1, 1)
+ self.dl_speed_label = QtWidgets.QLabel(DownloadWidget)
+ font = QtGui.QFont()
+ font.setBold(True)
+ font.setWeight(75)
+ self.dl_speed_label.setFont(font)
+ self.dl_speed_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+ self.dl_speed_label.setObjectName("dl_speed_label")
+ self.active_download_layout.addWidget(self.dl_speed_label, 1, 2, 1, 1)
self.downloaded_label = QtWidgets.QLabel(DownloadWidget)
font = QtGui.QFont()
font.setBold(True)
@@ -79,27 +74,6 @@ class Ui_DownloadWidget(object):
self.dl_speed.setText("dl_speed")
self.dl_speed.setObjectName("dl_speed")
self.active_download_layout.addWidget(self.dl_speed, 1, 3, 1, 1)
- self.cache_used_label = QtWidgets.QLabel(DownloadWidget)
- font = QtGui.QFont()
- font.setBold(True)
- font.setWeight(75)
- self.cache_used_label.setFont(font)
- self.cache_used_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
- self.cache_used_label.setObjectName("cache_used_label")
- self.active_download_layout.addWidget(self.cache_used_label, 2, 0, 1, 1)
- self.dl_name = QtWidgets.QLabel(DownloadWidget)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.dl_name.sizePolicy().hasHeightForWidth())
- self.dl_name.setSizePolicy(sizePolicy)
- font = QtGui.QFont()
- font.setBold(False)
- font.setWeight(50)
- self.dl_name.setFont(font)
- self.dl_name.setText("dl_name")
- self.dl_name.setObjectName("dl_name")
- self.active_download_layout.addWidget(self.dl_name, 0, 1, 1, 3)
self.time_left_label = QtWidgets.QLabel(DownloadWidget)
font = QtGui.QFont()
font.setBold(True)
@@ -108,23 +82,39 @@ class Ui_DownloadWidget(object):
self.time_left_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.time_left_label.setObjectName("time_left_label")
self.active_download_layout.addWidget(self.time_left_label, 1, 0, 1, 1)
- self.kill_button = QtWidgets.QPushButton(DownloadWidget)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+ self.downloaded = QtWidgets.QLabel(DownloadWidget)
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.kill_button.sizePolicy().hasHeightForWidth())
- self.kill_button.setSizePolicy(sizePolicy)
- self.kill_button.setObjectName("kill_button")
- self.active_download_layout.addWidget(self.kill_button, 3, 4, 1, 1)
+ sizePolicy.setHeightForWidth(self.downloaded.sizePolicy().hasHeightForWidth())
+ self.downloaded.setSizePolicy(sizePolicy)
+ self.downloaded.setText("downloaded")
+ self.downloaded.setObjectName("downloaded")
+ self.active_download_layout.addWidget(self.downloaded, 2, 3, 1, 1)
+ self.time_left = QtWidgets.QLabel(DownloadWidget)
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Maximum)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.time_left.sizePolicy().hasHeightForWidth())
+ self.time_left.setSizePolicy(sizePolicy)
+ self.time_left.setText("time_left")
+ self.time_left.setObjectName("time_left")
+ self.active_download_layout.addWidget(self.time_left, 1, 1, 1, 1)
+ self.cache_used_label = QtWidgets.QLabel(DownloadWidget)
+ font = QtGui.QFont()
+ font.setBold(True)
+ font.setWeight(75)
+ self.cache_used_label.setFont(font)
+ self.cache_used_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+ self.cache_used_label.setObjectName("cache_used_label")
+ self.active_download_layout.addWidget(self.cache_used_label, 2, 0, 1, 1)
self.progress_bar = QtWidgets.QProgressBar(DownloadWidget)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.progress_bar.sizePolicy().hasHeightForWidth())
- self.progress_bar.setSizePolicy(sizePolicy)
self.progress_bar.setProperty("value", 0)
self.progress_bar.setObjectName("progress_bar")
self.active_download_layout.addWidget(self.progress_bar, 3, 0, 1, 4)
+ self.kill_button = QtWidgets.QPushButton(DownloadWidget)
+ self.kill_button.setObjectName("kill_button")
+ self.active_download_layout.addWidget(self.kill_button, 3, 4, 1, 1)
self.active_download_layout.setColumnStretch(1, 1)
self.active_download_layout.setColumnStretch(3, 1)
@@ -132,11 +122,11 @@ class Ui_DownloadWidget(object):
def retranslateUi(self, DownloadWidget):
_translate = QtCore.QCoreApplication.translate
- self.dl_speed_label.setText(_translate("DownloadWidget", "Download speed:"))
self.dl_name_label.setText(_translate("DownloadWidget", "Current download:"))
+ self.dl_speed_label.setText(_translate("DownloadWidget", "Download speed:"))
self.downloaded_label.setText(_translate("DownloadWidget", "Downloaded:"))
- self.cache_used_label.setText(_translate("DownloadWidget", "Cache size:"))
self.time_left_label.setText(_translate("DownloadWidget", "Time left:"))
+ self.cache_used_label.setText(_translate("DownloadWidget", "Cache size:"))
self.kill_button.setText(_translate("DownloadWidget", "Stop Download"))
diff --git a/rare/ui/components/tabs/downloads/download_widget.ui b/rare/ui/components/tabs/downloads/download_widget.ui
index 7cd0aa8a..e35c4342 100644
--- a/rare/ui/components/tabs/downloads/download_widget.ui
+++ b/rare/ui/components/tabs/downloads/download_widget.ui
@@ -6,8 +6,8 @@
0
0
- 490
- 90
+ 479
+ 86
@@ -26,32 +26,22 @@
0
- -
-
+
-
+
-
+
0
0
-
- downloaded
-
-
-
- -
-
- 75
- true
+ 50
+ false
- Download speed:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+ dl_name
@@ -84,16 +74,19 @@
- -
-
-
-
- 0
- 0
-
+
-
+
+
+
+ 75
+ true
+
- time_left
+ Download speed:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -126,41 +119,6 @@
- -
-
-
-
- 75
- true
-
-
-
- Cache size:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- false
-
-
-
- dl_name
-
-
-
-
@@ -177,32 +135,62 @@
- -
-
+
-
+
-
+
0
0
- Stop Download
+ downloaded
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ time_left
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Cache size:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- 0
- 0
-
-
0
+ -
+
+
+ Stop Download
+
+
+
diff --git a/rare/ui/components/tabs/settings/legendary.py b/rare/ui/components/tabs/settings/legendary.py
index ed51c50b..30000ce0 100644
--- a/rare/ui/components/tabs/settings/legendary.py
+++ b/rare/ui/components/tabs/settings/legendary.py
@@ -25,7 +25,7 @@ class Ui_LegendarySettings(object):
self.install_dir_group.setObjectName("install_dir_group")
self.install_dir_layout = QtWidgets.QVBoxLayout(self.install_dir_group)
self.install_dir_layout.setObjectName("install_dir_layout")
- self.left_layout.addWidget(self.install_dir_group, 0, QtCore.Qt.AlignTop)
+ self.left_layout.addWidget(self.install_dir_group)
self.download_group = QtWidgets.QGroupBox(LegendarySettings)
self.download_group.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
self.download_group.setObjectName("download_group")
@@ -97,7 +97,7 @@ class Ui_LegendarySettings(object):
self.disable_https_check.setText("")
self.disable_https_check.setObjectName("disable_https_check")
self.download_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.disable_https_check)
- self.left_layout.addWidget(self.download_group, 0, QtCore.Qt.AlignTop)
+ self.left_layout.addWidget(self.download_group)
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.left_layout.addItem(spacerItem)
self.legendary_layout.addLayout(self.left_layout)
@@ -113,7 +113,7 @@ class Ui_LegendarySettings(object):
self.locale_group.setObjectName("locale_group")
self.locale_layout = QtWidgets.QVBoxLayout(self.locale_group)
self.locale_layout.setObjectName("locale_layout")
- self.right_layout.addWidget(self.locale_group, 0, QtCore.Qt.AlignTop)
+ self.right_layout.addWidget(self.locale_group)
self.cleanup_group = QtWidgets.QGroupBox(LegendarySettings)
self.cleanup_group.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
self.cleanup_group.setObjectName("cleanup_group")
diff --git a/rare/ui/components/tabs/settings/legendary.ui b/rare/ui/components/tabs/settings/legendary.ui
index 55704c85..306c8bc3 100644
--- a/rare/ui/components/tabs/settings/legendary.ui
+++ b/rare/ui/components/tabs/settings/legendary.ui
@@ -16,7 +16,7 @@
-
-
-
+
-
Default installation folder
@@ -27,7 +27,7 @@
- -
+
-
Download settings
@@ -183,7 +183,7 @@
-
-
-
+
-