From e8e39fa3918ca2c127f9e7708fedcc63f919c52c Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Fri, 23 Feb 2024 00:02:03 +0200 Subject: [PATCH 01/10] Stylesheets: Remove padding from progressbar --- .../stylesheets/ChildOfMetropolis/__init__.py | Bin 26594 -> 26614 bytes .../ChildOfMetropolis/stylesheet.qss | 21 ++++++--------- .../stylesheets/RareStyle/__init__.py | Bin 26598 -> 26580 bytes .../stylesheets/RareStyle/stylesheet.qss | 25 ++++++------------ 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py index 7f9596ba8341396d44f982be285a85003c144914..e92a93faf5be7e8cd8cec21a4dcd508f84f4d706 100644 GIT binary patch literal 26614 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
mpN;ds zX1=U;U0r3a{?|B6i*JMnry*(wy*#}`HawAA4E78#RCVmS$-X%e{$$8xsZc;4dPBJO z)S;~tQ^(1jJiZ-N?!zoQz;Dr=hzNyIui;AMvM!udx5}CJhAz#%p`r)vQ@YHbau#m* zI?kIn^P4^J&{`qiyj`WzGkX$bbx#+kw|YWfUSPqVnTG<)IYnyC79P}kdN5M8i^E%X z3|7!XI2J|xPkk@jIA^KflPY`id{W98=FuJ8&R8fwS$J(_vC+)%L2j7bdLg^0WmGD% z4?EFr>=z0U24cyRsvq9Ny81gFHT)F1(O3JR+^a9w7O+tM!ACtclyoNQ2^!;Vs?lV- z>?ij7$-Y7Fj3lP;k-cPJSln}-tb`kCJY%98+VLBCocF;jlH@uRtSSX7vQo~1rYzj| z0LDry^65(76D6FCJKMA;%6LFIJm3RAJG=}E*|WTmAbY}YUPHpMVn|c`#zV9_RRA(C z&c~+_mg^C1m4;LqGk55q7A?}1LiSo~la|=S9SmMcAXaekN6HJ@uL=JJ!NYaQCcG1{Bg zc%m2gP^Q7{IkPP)-_RxsR_3$C-x#<5HV>|bytFjyVm+4o9UFX@YtC8^YuRu(>tJKX zlruy5J`c;hSqdvQKk{}XN_^0CWEa_ROx?vE;y3*le=veWGx&Y@upbZJ_4wS&iZ#+? z-(WHtPeYpU*^Iygejd_HlyHI;9dFa_SZnQA^IoLcra%{=0^RZhM|qVnI}7~`9h`j%+`Llw5OopdQ7!}>Oahq5uYCayhx0E3sUr0nHjzsi!gg$uvK-{7rO2Y#* zT}Q467PYsL`%v7H;!ZZtnXd7tW%E=OMReNwdD(oTgcGz_Wt(=#el(kJQ=pAd`3KA9 za!vHJu6X!DB<0cTylrf%m!pwtlHU!#-prV0&Yyekvjy7oigsL^E7)k`es|iw-l1@3 z2A+P5;?&V@(%fCKE7jfW9UewR;^l!jo1!dQp7UcUJdhzDinDv7?0tUxJL=Bg=f~SD zCd$PM}g&e?Y|>^tX2d3< zM}Ex6JJzB1MA`c@rT6)9@~Cx{7=L5;{>Ud3eza!3#f01LG}Ze?XBrAWcBb^p?f-)8>*Y7A?f-&opWAwq+f#n0)p_>{ z&G4T7Wc-SR9m%<`Z|C9tPF*+8oUVgko8z8y_5N7DrZ~NiigQn}`(En$UY>K$`^uN4 zx4Z95um2qq{G>uL&l?<@`$K^4ADwkPC-c3|+|BE?Jo7%4eCA<#3g}%JZ*$O4o*WMT zdiMWgJMggXG;`wlSm#ITj(biJZd869PrmK3Qwv&2IK ze?dN`dM-S8SHSb$ynlIzkFl?RFH;ERr9CGy{*Pofy_4O>m#`UbE^~hNL*vfSvjg?-!?eE={36wFX z-)q+xqh1Xjzqh`3x$OhC%^4$TH^=&WXXVsnY|iq+=zTN&Ly+~n{LZUaI~wXsP(w?b z-$IAvZX*;(low#Qa_^(f%7xiTDi8R^lLnU~kTc2;_!{Lz)6 zo);;1R(eVF(UstEN=;*SxbV+!-eqOEB^& zYU+u>eIMU_%X5?V6T|#LbPW$N~^EmCN!_ecje+p1-K-vSgoS^Lc z)%Dw#Z(aw#e*g0I&4=GV>mP9W-XCO{{>sWHfBMg9%7@QBdHe0Fmp32&>XTnR`@`PL zt403&%2@u-i{BrAv^f1}vHyop_ZIoT>x+x^&0jALI=1=eTBcGW+uj{aeX+NC^>%e1 zp~Ig>=x}fEaur5@`}*b0_?tFwKYTV(9`b#$`ugSDo7MH0@GtpGG9Pa6|Is}>ZjU)R j*dFoMXr9fRfA(s%eEr?GgZ!QS|Ks)bUyp-b(f9rr4VLxK literal 26594 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 diff --git a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss index 9f22f1d4..115ff41d 100644 --- a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss +++ b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss @@ -77,6 +77,7 @@ QScrollBar { border-radius: 2px; padding: 2px; } + QHeaderView::section, QTableView QTableCornerButton::section, QLineEdit, @@ -105,20 +106,12 @@ QSpinBox, QDoubleSpinBox, QProgressBar, QPushButton { - min-height: 1.30em; -} -QLineEdit, -QTextEdit -QTimeEdit, -QDateEdit, -QDateTimeEdit, -QSpinBox, -QDoubleSpinBox, -QProgressBar { - max-height: 1.30em; + /* min-height: 1.30em; */ + min-height: 18px; } QToolButton { - min-height: 1.10em; + /* min-height: 1.10em; */ + min-height: 15px; } QFrame[frameShape="0"] { @@ -189,6 +182,7 @@ QComboBox QAbstractItemView { image: url(":/stylesheets/ChildOfMetropolis/sort-down.svg"); } QProgressBar { + padding: 0px; text-align: center; } QProgressBar::chunk { @@ -673,7 +667,7 @@ QTabBar#MainTabBar::tab { margin-right: 3px; border-top-color: transparent; border-bottom-color: #5CD3FF; - padding: 5px; + padding: 3px 5px; }/* QTabBar#MainTabBar::tab:top:first, QTabBar#MainTabBar::tab:bottom:first { @@ -749,6 +743,7 @@ QLineEdit#SearchBar { /* Wrapper settings styling */ QPushButton#WrapperWidgetButton, QToolButton#WrapperWidgetButton { + padding: 0px; border-color: #DADDDE; } QPushButton#WrapperWidgetButton:disabled, diff --git a/rare/resources/stylesheets/RareStyle/__init__.py b/rare/resources/stylesheets/RareStyle/__init__.py index 0b909452e60d986bb96cec2c644a82925571465a..5a7bf933776f48aade7e6d936697aa38d91fb608 100644 GIT binary patch literal 26580 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 Y+w)gne>KQI;Qt@5ZvJ)>?5e)^zhDsPPyhe` literal 26598 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 Date: Fri, 23 Feb 2024 10:47:31 +0200 Subject: [PATCH 02/10] Stylesheets: set minimum height in `ex` --- .../stylesheets/ChildOfMetropolis/__init__.py | Bin 26614 -> 26660 bytes .../ChildOfMetropolis/stylesheet.qss | 12 +- .../stylesheets/RareStyle/__init__.py | Bin 26580 -> 26626 bytes .../stylesheets/RareStyle/stylesheet.qss | 12 +- .../tabs/downloads/download_widget.py | 108 +++++++-------- .../tabs/downloads/download_widget.ui | 130 ++++++++---------- rare/ui/components/tabs/settings/legendary.py | 6 +- rare/ui/components/tabs/settings/legendary.ui | 6 +- 8 files changed, 132 insertions(+), 142 deletions(-) diff --git a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py index e92a93faf5be7e8cd8cec21a4dcd508f84f4d706..b7ec5de0390bca14bb2264be757ba4da8b250d26 100644 GIT binary patch literal 26660 zcmeI*TW=)Sbp_ye{))EsU@4FVl0yzjBYrRxAn=P38@W7KhQLeHo?tX1b0}r}@3X#D zb&B0hjyR%hBXTB4ySh%Dv(LV+z4xi6=A+fm|LNze%hy*gUj6YGt8Z?ve|~CYZ||ek z@78Z#e{*xWUcJ8f@Ac)aN$b6j^5FBE_4)1kYIX6KU#$N9PwTshpTGX<>lZKAH>>N{ zH>-d9%WrRwS0DfOcJ=M?X9xNJgHO8pzkc<*-~9SF|N4{FuU@`fUH<9()gRYyR$rZ8 ztyeEzt#1GH;?3$hG*2G`o-QCZ}<1_KG#P^o?ZIilV|xn|KjcQlP}&LX3q1|e2()u zo5tLq9A)-Zo*(9#xzF5ZZtg?Ds#35bD^Eh{C^Mg5=X+K!E3L?6R~k}f zEGuwcN${QzJ)n@;i#E;3%6)re*5)U=@BYsZa-F1_HTgVu3%B9Ay3VX>4n@*LPk8Dx zJhIm*9?F#&bl_@*)${C9nR%J@KRugv7!*RUD`L^E$kS)!CM*7OPrHZs^UP@XATPFv)Aq{5}}CFv|nwo!wU*yWq8@;a^VS|L(I=^jf4nH`I%tztWJ|gRg4cy}^_w~o{Yd4-X zdt&r3d@+8QyDbcOR!u(*1K5GZNb=XlfNk2~rE-5Mlb? ziGI9B#y-pQ%gA|<>v68K+EuXSBG0aaQfC=EPPRLb><1SpoM)6}j`Cz^>NIwCe>78E z$L2?wv!8p^*U>0SSGCq zb*yxel~*{-3}|?qS!XmE+a84aft4i6clr0Mh>c@+=lNV`2Kii76KC`Hi`?V&GJNjm za~&O>=lON>?^RYFh2~ZE5+U}vj8ywseVVc3tT@Q$D&wx}@Q`dVjTNKM!Xdmn%I7pI z$xNEle8jzq;S7&-kva8AJLZ1E;?r=0{(1Jt?P;#p*;~DH5YE>bqX*B~&z zK&!ZXKa3>yU5Cn5=JUR2lr?E3PcMw-bBdRYk?1Vn<2BVVe^ljNhRShx5-S�)=&+ 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 literal 26614 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
mpN;ds zX1=U;U0r3a{?|B6i*JMnry*(wy*#}`HawAA4E78#RCVmS$-X%e{$$8xsZc;4dPBJO z)S;~tQ^(1jJiZ-N?!zoQz;Dr=hzNyIui;AMvM!udx5}CJhAz#%p`r)vQ@YHbau#m* zI?kIn^P4^J&{`qiyj`WzGkX$bbx#+kw|YWfUSPqVnTG<)IYnyC79P}kdN5M8i^E%X z3|7!XI2J|xPkk@jIA^KflPY`id{W98=FuJ8&R8fwS$J(_vC+)%L2j7bdLg^0WmGD% z4?EFr>=z0U24cyRsvq9Ny81gFHT)F1(O3JR+^a9w7O+tM!ACtclyoNQ2^!;Vs?lV- z>?ij7$-Y7Fj3lP;k-cPJSln}-tb`kCJY%98+VLBCocF;jlH@uRtSSX7vQo~1rYzj| z0LDry^65(76D6FCJKMA;%6LFIJm3RAJG=}E*|WTmAbY}YUPHpMVn|c`#zV9_RRA(C z&c~+_mg^C1m4;LqGk55q7A?}1LiSo~la|=S9SmMcAXaekN6HJ@uL=JJ!NYaQCcG1{Bg zc%m2gP^Q7{IkPP)-_RxsR_3$C-x#<5HV>|bytFjyVm+4o9UFX@YtC8^YuRu(>tJKX zlruy5J`c;hSqdvQKk{}XN_^0CWEa_ROx?vE;y3*le=veWGx&Y@upbZJ_4wS&iZ#+? z-(WHtPeYpU*^Iygejd_HlyHI;9dFa_SZnQA^IoLcra%{=0^RZhM|qVnI}7~`9h`j%+`Llw5OopdQ7!}>Oahq5uYCayhx0E3sUr0nHjzsi!gg$uvK-{7rO2Y#* zT}Q467PYsL`%v7H;!ZZtnXd7tW%E=OMReNwdD(oTgcGz_Wt(=#el(kJQ=pAd`3KA9 za!vHJu6X!DB<0cTylrf%m!pwtlHU!#-prV0&Yyekvjy7oigsL^E7)k`es|iw-l1@3 z2A+P5;?&V@(%fCKE7jfW9UewR;^l!jo1!dQp7UcUJdhzDinDv7?0tUxJL=Bg=f~SD zCd$PM}g&e?Y|>^tX2d3< zM}Ex6JJzB1MA`c@rT6)9@~Cx{7=L5;{>Ud3eza!3#f01LG}Ze?XBrAWcBb^p?f-)8>*Y7A?f-&opWAwq+f#n0)p_>{ z&G4T7Wc-SR9m%<`Z|C9tPF*+8oUVgko8z8y_5N7DrZ~NiigQn}`(En$UY>K$`^uN4 zx4Z95um2qq{G>uL&l?<@`$K^4ADwkPC-c3|+|BE?Jo7%4eCA<#3g}%JZ*$O4o*WMT zdiMWgJMggXG;`wlSm#ITj(biJZd869PrmK3Qwv&2IK ze?dN`dM-S8SHSb$ynlIzkFl?RFH;ERr9CGy{*Pofy_4O>m#`UbE^~hNL*vfSvjg?-!?eE={36wFX z-)q+xqh1Xjzqh`3x$OhC%^4$TH^=&WXXVsnY|iq+=zTN&Ly+~n{LZUaI~wXsP(w?b z-$IAvZX*;(low#Qa_^(f%7xiTDi8R^lLnU~kTc2;_!{Lz)6 zo);;1R(eVF(UstEN=;*SxbV+!-eqOEB^& zYU+u>eIMU_%X5?V6T|#LbPW$N~^EmCN!_ecje+p1-K-vSgoS^Lc z)%Dw#Z(aw#e*g0I&4=GV>mP9W-XCO{{>sWHfBMg9%7@QBdHe0Fmp32&>XTnR`@`PL zt403&%2@u-i{BrAv^f1}vHyop_ZIoT>x+x^&0jALI=1=eTBcGW+uj{aeX+NC^>%e1 zp~Ig>=x}fEaur5@`}*b0_?tFwKYTV(9`b#$`ugSDo7MH0@GtpGG9Pa6|Is}>ZjU)R j*dFoMXr9fRfA(s%eEr?GgZ!QS|Ks)bUyp-b(f9rr4VLxK 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 5a7bf933776f48aade7e6d936697aa38d91fb608..e3221643eb35231151c38268018fbadd079ea719 100644 GIT binary patch literal 26626 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 Y+w)gne>KQI;Qt@5ZvJ)>?5e)^zhDsPPyhe` 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 @@ - + From ae69413ddb56b2cc346bfea7337e90c4d3e75ff9 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sat, 24 Feb 2024 01:51:45 +0200 Subject: [PATCH 03/10] InstallDialog: Remove inline stylesheet, adjust the font. --- rare/components/dialogs/install_dialog.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rare/components/dialogs/install_dialog.py b/rare/components/dialogs/install_dialog.py index b1250db7..9042f2ce 100644 --- a/rare/components/dialogs/install_dialog.py +++ b/rare/components/dialogs/install_dialog.py @@ -258,10 +258,12 @@ class InstallDialog(ActionDialog): def action_handler(self): self.error_box() message = self.tr("Updating...") + font = self.font() + font.setItalic(True) self.ui.download_size_text.setText(message) - self.ui.download_size_text.setStyleSheet("font-style: italic; font-weight: normal") + self.ui.download_size_text.setFont(font) self.ui.install_size_text.setText(message) - self.ui.install_size_text.setStyleSheet("font-style: italic; font-weight: normal") + self.ui.install_size_text.setFont(font) self.setActive(True) self.options_changed = False self.get_options() @@ -309,15 +311,19 @@ class InstallDialog(ActionDialog): download_size = download.analysis.dl_size install_size = download.analysis.install_size # install_size = self.dl_item.download.analysis.disk_space_delta + bold_font = self.font() + bold_font.setBold(True) + italic_font = self.font() + italic_font.setItalic(True) if download_size or (not download_size and (download.game.is_dlc or download.repair)): self.ui.download_size_text.setText(format_size(download_size)) - self.ui.download_size_text.setStyleSheet("font-style: normal; font-weight: bold") + self.ui.download_size_text.setFont(bold_font) self.accept_button.setEnabled(not self.options_changed) else: - self.ui.install_size_text.setText(self.tr("Game already installed")) - self.ui.install_size_text.setStyleSheet("font-style: italics; font-weight: normal") + self.ui.download_size_text.setText(self.tr("Game already installed")) + self.ui.download_size_text.setFont(italic_font) self.ui.install_size_text.setText(format_size(install_size)) - self.ui.install_size_text.setStyleSheet("font-style: normal; font-weight: bold") + self.ui.install_size_text.setFont(bold_font) self.action_button.setEnabled(self.options_changed) has_prereqs = bool(download.igame.prereq_info) and not download.igame.prereq_info.get("installed", False) if has_prereqs: From 379cbd2f89fc7276ae884a69ef656205db2ea0dc Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sat, 24 Feb 2024 02:22:25 +0200 Subject: [PATCH 04/10] Painter: Use QPalette.Window as background color --- rare/components/tabs/downloads/download.py | 4 ++-- rare/components/tabs/games/game_widgets/list_game_widget.py | 2 +- rare/widgets/image_widget.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rare/components/tabs/downloads/download.py b/rare/components/tabs/downloads/download.py index 91955a38..a843d0b2 100644 --- a/rare/components/tabs/downloads/download.py +++ b/rare/components/tabs/downloads/download.py @@ -59,11 +59,11 @@ class DownloadWidget(ImageWidget): def paint_image_empty(self, painter: QPainter, a0: QPaintEvent) -> None: # when pixmap object is not available yet, show a gray rectangle painter.setOpacity(0.5 * self._opacity) - painter.fillRect(a0.rect(), self.palette().color(QPalette.Background)) + painter.fillRect(a0.rect(), self.palette().color(QPalette.Window)) def paint_image_cover(self, painter: QPainter, a0: QPaintEvent) -> None: painter.setOpacity(self._opacity) - color = self.palette().color(QPalette.Background).darker(75) + color = self.palette().color(QPalette.Window).darker(75) painter.fillRect(self.rect(), color) brush = QBrush(self._pixmap) brush.setTransform(self._transform) diff --git a/rare/components/tabs/games/game_widgets/list_game_widget.py b/rare/components/tabs/games/game_widgets/list_game_widget.py index e6832388..151713ab 100644 --- a/rare/components/tabs/games/game_widgets/list_game_widget.py +++ b/rare/components/tabs/games/game_widgets/list_game_widget.py @@ -99,7 +99,7 @@ class ListGameWidget(GameWidget): def paint_image_cover(self, painter: QPainter, a0: QPaintEvent) -> None: painter.setOpacity(self._opacity) - color = self.palette().color(QPalette.Background).darker(75) + color = self.palette().color(QPalette.Window).darker(75) painter.fillRect(self.rect(), color) brush = QBrush(self._pixmap) brush.setTransform(self._transform) diff --git a/rare/widgets/image_widget.py b/rare/widgets/image_widget.py index eb5bca7f..c453490c 100644 --- a/rare/widgets/image_widget.py +++ b/rare/widgets/image_widget.py @@ -136,7 +136,7 @@ class ImageWidget(QWidget): painter.setOpacity(1.0) painter.setCompositionMode(QPainter.CompositionMode_Source) overlay, _ = self._generate_rounded_overlay() - painter.fillPath(overlay, self.palette().color(QPalette.Background)) + painter.fillPath(overlay, self.palette().color(QPalette.Window)) def paint_overlay_squared(self, painter: QPainter, a0: QPaintEvent) -> None: painter.setRenderHint(QPainter.Antialiasing, False) From 2e8dcc49ca08f0688fef8326f4e997d4d312af9b Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sat, 24 Feb 2024 02:25:47 +0200 Subject: [PATCH 05/10] Settings: Translate titles --- rare/components/tabs/settings/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rare/components/tabs/settings/__init__.py b/rare/components/tabs/settings/__init__.py index 41db9cf2..8b9c63f7 100644 --- a/rare/components/tabs/settings/__init__.py +++ b/rare/components/tabs/settings/__init__.py @@ -22,12 +22,14 @@ class SettingsTab(SideTabWidget): self.settings_index = self.addTab(game_settings, self.tr("Defaults")) self.about = About(self) - self.about_index = self.addTab(self.about, "About", "About") + title = self.tr("About") + self.about_index = self.addTab(self.about, title, title) self.about.update_available_ready.connect( lambda: self.tabBar().setTabText(self.about_index, "About (!)") ) if self.args.debug: - self.debug_index = self.addTab(DebugSettings(self), "Debug") + title = self.tr("Debug") + self.debug_index = self.addTab(DebugSettings(self), title, title) self.setCurrentIndex(self.rare_index) From 570261395a1a460a0edd12efafd4d7fc67071416 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sat, 24 Feb 2024 02:27:14 +0200 Subject: [PATCH 06/10] SideTabContainer: Do not darken background inside scrollarea --- rare/widgets/side_tab.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/rare/widgets/side_tab.py b/rare/widgets/side_tab.py index 25b04481..54dcadce 100644 --- a/rare/widgets/side_tab.py +++ b/rare/widgets/side_tab.py @@ -99,17 +99,19 @@ class SideTabContainer(QWidget): layout.addWidget(self.title) if not hasattr(widget, "implements_scrollarea") or not widget.implements_scrollarea: - self.scrollarea = QScrollArea(self) - self.scrollarea.setSizeAdjustPolicy(QScrollArea.AdjustToContents) - self.scrollarea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - self.scrollarea.setFrameStyle(QScrollArea.NoFrame) - self.scrollarea.setMinimumWidth( - widget.sizeHint().width() + self.scrollarea.verticalScrollBar().sizeHint().width() + scrollarea = QScrollArea(self) + scrollarea.setSizeAdjustPolicy(QScrollArea.AdjustToContents) + scrollarea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + scrollarea.setFrameStyle(QScrollArea.NoFrame) + scrollarea.setMinimumWidth( + widget.sizeHint().width() + scrollarea.verticalScrollBar().sizeHint().width() ) - self.scrollarea.setWidgetResizable(True) + scrollarea.setWidgetResizable(True) widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) - self.scrollarea.setWidget(widget) - layout.addWidget(self.scrollarea) + scrollarea.setWidget(widget) + scrollarea.widget().setAutoFillBackground(False) + scrollarea.viewport().setAutoFillBackground(False) + layout.addWidget(scrollarea) else: layout.addWidget(widget) From 6cfec6c718ac3e6df9f42f73082199050e4bdf8a Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sat, 24 Feb 2024 02:41:05 +0200 Subject: [PATCH 07/10] Style: Update Rare colorscheme and remove some styling from WrapperSettings widget --- rare/resources/colors/Rare.scheme | 18 +++++++++--------- rare/resources/resources.py | Bin 3601125 -> 3601126 bytes rare/resources/static_css/__init__.py | Bin 4331 -> 4331 bytes .../stylesheets/ChildOfMetropolis/__init__.py | Bin 26660 -> 26680 bytes .../ChildOfMetropolis/stylesheet.qss | 3 +++ .../stylesheets/RareStyle/__init__.py | Bin 26626 -> 26642 bytes .../stylesheets/RareStyle/stylesheet.qss | 3 +++ 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/rare/resources/colors/Rare.scheme b/rare/resources/colors/Rare.scheme index e2f3146c..5bab6402 100644 --- a/rare/resources/colors/Rare.scheme +++ b/rare/resources/colors/Rare.scheme @@ -2,22 +2,22 @@ Active\AlternateBase=#fff7f7f7 Active\Base=#ff333344 Active\BrightText=#ffffffff -Active\Button=#ff3c3f41 +Active\Button=#ff272a2e Active\ButtonText=#ffeeeeee -Active\Dark=#ff9f0910 -Active\Highlight=#ff2f4f4f +Active\Dark=#ff232529 +Active\Highlight=#ff385e5e Active\HighlightedText=#ffeeeeee -Active\Light=#ffffffff -Active\Link=#ff0000ff +Active\Light=#ff2c2f33 +Active\Link=#ff0000dd Active\LinkVisited=#ffff00ff -Active\Mid=#ffb80e35 -Active\Midlight=#ffca0651 +Active\Mid=#ff25272b +Active\Midlight=#ff292c30 Active\PlaceholderText=#80eeeeee -Active\Shadow=#ff767676 +Active\Shadow=#ff0b0c0d Active\Text=#ffeeeeee Active\ToolTipBase=#ffffffdc Active\ToolTipText=#ffeeeeee -Active\Window=#ff202225 +Active\Window=#ff212226 Active\WindowText=#ffeeeeee Disabled\ButtonText=#ff808080 Disabled\HighlightedText=#ff808080 diff --git a/rare/resources/resources.py b/rare/resources/resources.py index c7baa662d0c5a68c2b3bb8752c3534c7b149cfbf..a45a4bb1698992e1f2cc07c09ae1c162c07deb7c 100644 GIT binary patch delta 1119 zcmZ|OOH30{6b9f-VW6~NU$jL9wW1agvF%JxThj;{#Yj|OVIs*S3iT16Q4*6e#;9>& z+#q^G&Pt<+y3zQ^Eb2~JxHd+O3rR46f(0twxGrK(k)0pBG0marN&;emfelKa6l5raaR<(|gjEoN)ld&>U@feJFf_n= zXoL;W1RJ3lHbDfU5Ca8Nh-Z(sQQ$WFb99;I32NoR9G&6!WB9o^M*DfkICb)l2|CDw z<0$b@;_kr&oyne?q}`G&MtmhtK0Y}`E*_d8nO%t*k4;heY@X_a<~|%TPe%kB^@|#_ z24(Eu;S>)XtM>D&0<8*?rYHU>rk?p?oQr6jpMR#MtmmoL+pFmr>k$9y8sRr{4L)w2 zrD`58U`qF{2Yh@fkH6h{3P>3qE>L}06mL!S^4BTaDPvAYRNgvGtIK*0YkEA%14T+_ zPfXL+|0G+&Prsnyg;`q6C|eo1zd$kDLb9-x?2p(eN*>bmL-=G=e03@gW+wJKyKH5j zZ}MkivoAlMp$aRuY{j6`Qu{N|n3 delta 1161 zcmZA0T}V@57zc39(M`9r)O{W`KendMEZfdLo^2#yAiEM0BkW?JTPh+_L?F8`6T0v+ z<%PXa6iMZk6t-a3-E`GmL>C1HI>V22UFL=LKW9!4yZG&l_j%rr=Q;1$E_@dXurw{i zmS-}#I;$Y$9tPi=*hbaiC%gGjMZS25KY=5{` zLO$kUl~9;@YJAMCxY*FG7+Z6UveBDfw$N^2PkWA7!$?g-2+L4JOIEjxXxp@Tf=+dF z1taP<>LDVau;q~ltXodYQEi4g9zBU`&)kaqOt7j`f;tiQ$K1i53|!5vH95uHMnaPE z{ek*!*W+w*F`E=Xges^80~nzOYQY3%kiY`x^4VnF>X*f-L_IWs6>MM!2ROk6GBiRH zG{bplfmUdPc5s6SE`S$0pcA^l2iYG6PO9B)!T|5Tu{(wOBJ##Xm!EI<2;1_dz|=I{2& zE2r>ECe_9V(BZOpka+Nb&nS)WMGq$YxMq)oI)! zw7LY`s`8Gw6=Chd>L=WZl@p{!1@|Zxt~?W+Es3j?8IM;c zOr9+vDrvql-|OI?cPYwW6v>~T*`w>HZ82zV;r|ZE!{-jkD(X67&^n^Vf?`DvvmO|<9+Z-Gl^aWy>&~Ss+MpG!i|Oh$DmZjJPzr{N fWGxl$E|P;U6=~3_){8H5{Nxj(bpCgd{tEvA{KueV diff --git a/rare/resources/static_css/__init__.py b/rare/resources/static_css/__init__.py index 82dc333850d6cc2a6a44f58375da455bb646dac1..0e139851eb4be14a74e8bc96bce0efb5fa4a8a78 100644 GIT binary patch delta 27 jcmaE@_*!wp6F$BaiA?%gvwoelh|8qG$_U delta 27 jcmaE@_*!wp6F$D=!_A-gelh|8pzRAH diff --git a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py index b7ec5de0390bca14bb2264be757ba4da8b250d26..effb5639b1fca9c2f44d9dbc8f891bdf0b68ea96 100644 GIT binary patch literal 26680 zcmeI*S#KTJl?C8;{)(IUAyUIONQx9mqw^5Bfks|}w$Z~w92guf9X4dip=h`B?|Xf# z2G+eKMTK@6Nm@ZFb?XfK>~ZaVPL;xsR-gRSC#&-}7gw*p`E2$5&E+S@T6T6mT79{G z`{w)W^Y!Y@*?+IkZwy-Re3XvQuh*wH>x-Fx2I|MiL zuWtT$^>%d`8ms@gO841%_3F*rn_ukgTwcHVb|iWA?RRgkZ&qL2eE#Noy|eSDo3F1& zPQSi5y*XX|dUf{8uXeurad-Fjx;)VG;@tlpy~y?Qs~=w;ef8sh#=Jbvb(rg9X!Cq@ zkkJ?E-_Jc`UwF>gJcoi=rC>&89);3DM!vkv@64WOnvttB-LvwGQkYvdX%Cb`t-NGS zeBfuMxJe;vmKPF)+n49L)|qA0$o(V@N=JA&&78|hf!nM#UHfL{8JB)n8d9Y#GjLu> z@SckvP{`<6n?_{jt~D}hc}4eK|K(opgH)p?U*>7%He6TN8CA`pNSf#gPwm4admZDU zTp2+J?q--hjxLpvmr?&i->||&A@n*U7VV7mz92VQ@t0@X-N&Ck*Dw}^MGGD}O7D_~ zc z&7%G2v=k!KeYPjreb>uKT~Ft?jm^mq_9OE_IJJ(*I$#6O_{wwrG5lJMXN{g1JxsnB zKg`nx2E3@IpN0YKz+xo%xiMgqb~PmqKVU#~EheIi2jZVi_&yCjE&eA8Q&dbbHu<>q z`Cgv4V(vB`_sWAAnLWqa6puU>mF4qh{F5$H+&hY7xgLps)KOSQFn+dq@;phJ-!o1O zZ8SNx;u;4JO& zoRjpQN6x+64|A8*E`lv*>AMU{ouutB+3qy5@13D=npT!MNYA9HV^s5eFj8E{<_8(G zn`hM5(I`q6wbpr_WNW%S$;h+tvYR!GkVW@0>o640a~*~X&vL)WxY#8;tVf#bSm`V? zFL0O<(C{#$PG~Yx?uGiEnIy_@`S+xVjbl%zxh^w;eD11=lkxXip7DAfK6i6nMn|XV zzij@!$jpP#yvSN2#5(8E&2DBNr|mE^_HtdM-F+P%k}Za|V)RKkgm(wIjx&?Yq&dzd z?o|vYc%+MrsZUxl&jS`8ha2=yvp#N*bHB{m>YcrCzD^rG=x3A5tbaoDS>dwLdlI^* z(f5mJjfPJ0`yiwDv%bEUp>`Y!^mUSpRCGn7`}GI#jrPBI9{qG|HN^lHN0|xsLIYHWHoWcf6(==8yd5JX8+DlUO;c6ez6IOLljc9E;1# z%!ZM>q09~^X6JsGcB>>3!ox{M@8{__G1)Gjift@c87(8F%D zR&NQ%bS|=9M%J_3*#$nFhriwQu`Ih;jh5G~OLsH#)F_(Doi289N%#6P%PPm2K}Ya{ zMUTxXh4awnW2yS9Q3ys>(R_|;QcW{MwN)?b<{Z%j-`b<0Q9I}9;Z3~eAnmNYA0GHD zs)xBqs``jdSTi%Nsr4}HRjax4DmFh#e|GYl+)jRaoU!bbToNA6(nDsxD8goZAVnmEQ7jAP>;z8nklAz=e+>nkixe1n zK~uTN3~A#r)v&m=uHD#isE7piiSL90>+OZ!an{H6S=OKnIEe?AR^9PW`u7a8c~r)S z!a=x)$B>QfaSHW{Y?+19St!ueaVX*i+SGrWap<9T$UT{;x>$z~oXRZxmE111f_9Yb z!eXQFKz6wa4)Lni#YTlMIRy2?jDeM6N1iy$ou?0V5=}yG@m_0&lBl+JeKq|r^E+r# zYZi%7OZ$MdYHhKOCdA{5)<29?>pauZWq6<$wSw#rgl*IXCs;EhWD#CX4`P$&$U-t8 zUx7`0GjY&p7wM!OvYx!a&&2~v$~2-H+7^ds+HZOiH@WyHj~`9|%z{08X|;}B$3-Zx z>}j4)GgFMXA7vbGKBI?76saSH2*yWcO)ETtDn{a3JRXKealv>6H_CzV8T z;WF!!fX|yHXNWMK+;|P2^d^?8lc9bIs#DtVJ@b zkfsq9KKxGQ778*7U8JIE%*z9<)vSvGE$33_v6T!3fyzU@n(cQ(PhRE=tV^>zUG+h$ zX24H=0A(N#J_kL(e))>sFCqa-a)xzjua&43GK2OY5q#jUS&0;BQMd4YF?Sk`sRZC4 z1cVPz7|Nf9s4;833EE9whClis2`SG=TYsnzgaQnrUzu3_fEV>uaWw17e2|d87^h;$oj>Fk?Nn>I z)Atc6GV(Md#fK>4r$yb|t>3t9T(oA&S|WyiQxlYP6kDlEUDJ72+hPtL58Hrc^d3ltyl zU?iK@qi~qfP?k?z9UJpBOV^Rgolm@l_E=eit4$;=h`F`w4p+0EG{cUo?uxh z&~s~-alKkJ(zNEsM`rR-b-pT9E)h$O-DZD&ATDGWaj9;CMIx!*p7pAyP!lt)Gcra+ z7+=9dW{bmS-|(THqzBkU-tv&qav8rYrqWBOWiJ#8@)Vg`iP1-R=^iR~I0378kTq%6 z4&oq`T5~mbtC4s|<1)WxG||)gl8rK2g$#kzH^w*f`Av^W42)_)F}BLhID%`81bE=3zXW zmFtuF4F&PY((bHE(%=?Nh9(r{?`k^Uf?F0=+p=h*I{Xxc($CXmqg1J*9{8VYKlJU0 z^Qz>$GU+GW@UL?oQSWlSb2zUYmOR( zw)^QBPxFSXk~UQFU?rK^j@5mzrka_rS+CM$tyWvPs}fZmw91R@d92UMY!cnkWHbm> zM7h|YDfWQTs6u&YLw>q}tF42xLgFM8WDfQft>`;NqIXe5yFK&4L#WzWihR0(z?Z}M zWN1~-X%Tm=K+-1TvmTFcb&{EO&&9{I<1bQ$2ONt@r-t^};!tjqS!mckucs*Kb8_Ia zgHbvovvg--Zf-i-U*Le%hGRj&C|_r9y7^a90|2n0HGi@a)k$0f(>>-@SrukILN38 z!|8_=Wjnqi!uiIKFM4_yKDtxM+OnVQ&ld6sAK@!@l;VMB!FK$m8Ve7!g2T?rx+u|& z{A8pW2cmROk+HPOck~Zcu^l*U;3<589#oxX+vlplNUCCEVU(=zImi&l#R%A^92w-qZSm&G3~r$ip|I;qc&eM9viV zJ-rIGoHGrlSZT9!z!&^RRUbUV^H9sRHb{>;Le3V8JXfUCmKD_7;set1a8yVUuL}>f zqJAW6cZ#8nQ}uTDfjHJ@OsMc%Qp!+?pHM*8DUv<5sA4G=gi{a}s`peaor^jCiKM;O3|YwQ_4)Jfv52iA{S=)MQ4snD)ASRzzmCP_U1f-s6Zt{w9iPQQa>$ z@izVnZP|=utUtVUv$i_AmSnli>K>RxS-#S#=$Vtz;e}s9 z)7Ed{fh|OK^LyH5p~0ib>@1lf;Z1&IC^Dy359H-g(Bvgf5X3$=9XEY^xAwQ&{r(#29!xEKIYrvwtI;!Vw zq163O?oQQMlK=BIsA3-m<@u!@ODlrbv@jBi8cCDT}DAdMzvNLAUR$^HjCh%lcu*{v7o2HBs>Ee!7 zVG`>(#WIGDx)-Fg{HBNaZzwo>RgE{oc~Gv-&YHDsX2?WhQk02+R%(8?65|KO!i?Zi zDv{~b3U7GmzBqiS^IYXEeL3TeQ98pANZC(xy=?G5Qy@XOIs0HjwX{LL;@KCG{ReL-BiE~mq&7#S^ zA)>!pvu~0>`zgrnLa6uLv=%`}%$)~6@7hro7d z-4o)2mWP@)wB^7?Z*<+9ky&`Z|cjQM};rG+TAfK>4(?W@A*{bM6;p5A0cXY9$9C~ z5q%?=(dq`;<5kecD$Y%u7i1+oWCY!^MZGy|!EDtp&#rAy$Qaqlj>=d#GVD-VNn|81 zl{Z9?2zUO43VU>q8$QJ`tJ=jlBMr6i&^QcNt*p`uE4<4gKdxJy=C{g}pQ!P~i@ZAQ z{q2O|gY0Kt1JU`X7=X!es?}n+=iO|e?rTk3TlB40xN>^ZIzH576=yT8HdvA*c*^gd zWTg)hWrq+c)J#ycHAFa51!xoLl_b2taTq3lT3__{y;|#s?qee_AD~~@h%YBvB(X!R zw}(1k(GU5>$beBiiHE|*R@~OiNcB_q*jZ0Zh==MRlE_=)DVR0-17s29J>g4l&zdr0 z@{!g|X>aWkebJ)GA0mssS%(j{HX&oyfr)UbZ(||})K^=0gD+aW&krCbbg$FUg{~-;`rl0QUv!)t?7ugHpuX(1`pq+py z76VQTiUV0oWv*`F*-)_26v|>#-6QiRX2Jvg%Y3qp87eSV#HnafA@)2hGgw=`kd=zi z!?|2$l2Zl9OV}DEa>^NyUsXzeHd5cI44a)w0dhdN##%;`k1wzw3tPA6W|5s_q=5n? z8{QQA)}>!^8J(-=FW~`~GOTkdQu1(d!w={}Hcobm9(ZYMsMvm)(d10N$?kRwcf zD6^Fu4wV;u;ejv02vqDsczI9NvletKPGlxO$@0rd@)) zWzT6s-S<$%ZY$+d!Djas3OrZVgEag?24dCjJE8}XgwJMU{b>`4P$3yP6!^V$;gA^V z-Y?IrXa{G{%i2&#eFuSgQ@yIWTV~}sa2XYvax$Ru>>fMP$wKvFR3b5y>B^1n;y`Bb z=$^}l!{&#~l+T+>G7HK>Jz8f?*fG{H86|hNRw5BCnT-$n&$HcviV*ibY0;N!z^I<< zL@TX;LYHlLi@ioYIx}&t8Wd&p0WV3B>VPIQQqFAEm$m4=ySKEp#?D=3(iq7s=M(aW z@v+zF5B$;&uzr!>GQQK?X60xZ$E4!3G>IC&Ob!nP))Flc1vcZf7fv&pFOpO&c3+wm z#E(iWnhk}Xl7#|oia9kSjj10*mUzVr-*isM>imRcSuqqKm;F51L={hI{TNEBG`RyW z>WbO((k7;ZU7^66dqS2O@BmM=C89(d42L?+2$=;h`kpmoLp2oad{|5Tx2h2P8Py6M z)%2NqWyrAiM4zSbDbOgPmlI27ee@xZG@7Jn7hQ>~}o2(O_46UhhZc!`|V z43ss+t(wXTbROxrAhIMJ5eR(6w&MN|ChLuRGR8a7J|B9lFisnOUreRCX@>l?|Mtu!-zvPnbv#59G49<5_yu z4fcED#nn@UjD~DHiub|tdUz=~p_|^U;NB^UkvvUY$mK8rrB-SA&AKx2kT=-@_Q`O1 zSk&*n5z5^Oifo_~Qe&vb;50wVIdi1ohjd=QGcy+BpU_4{qzZtW&HkZa2Mt%X4Y7$r z;~_1o9Q%g8iOF3ihEx1Pg&JeBAotPK~QxwL6BwMc1^+I1rY9@*y5Jcoc2HJ$r5OCvsaEX1yYRs5k3m zhO<<$q0XVrNX#cQo27UzT{|b|;oUWcntu4LW{`p5l{i8*F%$}-#feGJgTs$nj?8qR z>Zqo}n-iqIF;71X5uf2d6j-L{7Fk)=E=4UdX_8m*e0XIwl<;S-HDDB5%M-jwR8942 zc?+fPJ@6GiNQ#eUf;^`V3=i^Q&lN(qb#o}%f0klK^}ConTiYIt4Vo20HGGBwdfs0Z z>B1@hoUWeHv1E}sT6B*EXp;WfIwNqXP9!sZKw+3cYu$SqlhyiGD)VBGQ0RN1 zjG{d|L7MGJE7>y>Z+0fbiK@KUE8L`t$o%1}+*ahFAQ$$GCzN24I!asfb|{HBXYAsL zrF*j0{B0I&?u^V7&A4yX5o+_yj5D?~-3LlInR+&9cQk6H93I#JKQqNm3R$zfkRaSb zTlh)BX~rZCO7&gVZPwur)|#%`JkPlFyV8&q$-QlX$_p=(lf9el(d_~?3>1r6ki?y&JtTeM~5xFhhun$d}Kr&6O2{Gk@Ai;FF^ zq}Lv9o{{xBI_u%F_CgIMT1N>_)k8TPM@`($l)}rjZrjYl3u>ep_TJG>>FLG!T~22{ zXDY_>*+!RNGskEzp9gJqy^e|Rmdfpz(H50&(x%=~DxNj-H?>=TlLt?eytHKYvMs;c zMyn(=)|gojvurpVb+8yweBfpGd057cQkb#4X+a903%$SiT>kc*H6Okr-Hiz?opN2F8CDNcp$D6d<_D-bPq%c~uCpXdF zKM2yWbR=tZ(-B`CpJ)6K@y+9UHZUR@+VEmtH%0ZNb<}u${iOcBJ%aCNGz@L@jXYUt z<_ncp$Q$e3(%y`uY3-46tv~#ZKQx;RGF8^DGtj>)4V_F>@I4^zAkW=37m|^ty4YT6 zh|z)8faDVnOl?c*3yKTPMvBGLW0(srn-pjyRQ|!Txm*+d%oPt`;FoNbzUB;VL%kf0RFmm#kC9WZqhTY*>z;nLSj^~- zYdHgjMSoY?eBPpPXM_lP7sX*myQH~2V~W;Es=LoyJlK6VQfMrie2@GX3J+w+hvMv> zDEp8f|BiO&AM)dE78B)S1@h!R;{=rc+su#Q?2*d$p}2(=AM)dTb|CvVYJ;wSC+BJ( z^5bSky_*j=bM~DK``-Cc-X5yZDLX#Mq@Oz>#_Dqrfz&Uew4s5ZwLgAe?^DQRa?oLy^FLtJ(@UAnZUvB-FNpA0{>)M_y(dXdTvfWO% z{nPxJV!pK)Irom%o7B9!A6Lseyz!TOS$f;+j`X|@ZhtBicVFlBd3)XHtnK4?xp(rG4Bz>A6lw81Drs(c-yMHFMZxEJyj2|GtqvcbmuMcRmH%(vXkj<`I*& z+?O*G3`ucYGbN%&XT~Y>iRRW!AO1Wx(?0~s$LPzM;mGG@kIu}vd@Qv!(`V_A&J6Vw zoLe(}Z1(8Pz+uX%t(iWif1jEDf$jqVvH#Z!h+CnSOy9Qli`5P0mkwdvrizy{Z+~ym zetJ-Ca5B)}qW#3Mi&UzY{u`5EcK=<+oY$vSpBR|$Mf-`Ni+1?+&7OPz)zhW}MoUi& z?)&)eSACN{+@Bc!??wCR0P%<|v-;B^zijkJnx@?`N5xb8U9Yor+@m-VaT)RpT7O>)z!_jUw!(k=YQC_x?JTC zxJ=XkdG-6lk5|VZuXg|N+0H8exjsLiJAb{}YuoYh1bILi>Li zq5Ykmi**?N?dz+X>969vefE5yJjwUv`kSk_H|y(Zz`x{g(L7u5|M5LMZnil&*lh9l fY@UycfBtHH`uh9tCh~XI|Bu(#e?1PiMc?^fcgGE3 literal 26660 zcmeI*TW=)Sbp_ye{))EsU@4FVl0yzjBYrRxAn=P38@W7KhQLeHo?tX1b0}r}@3X#D zb&B0hjyR%hBXTB4ySh%Dv(LV+z4xi6=A+fm|LNze%hy*gUj6YGt8Z?ve|~CYZ||ek z@78Z#e{*xWUcJ8f@Ac)aN$b6j^5FBE_4)1kYIX6KU#$N9PwTshpTGX<>lZKAH>>N{ zH>-d9%WrRwS0DfOcJ=M?X9xNJgHO8pzkc<*-~9SF|N4{FuU@`fUH<9()gRYyR$rZ8 ztyeEzt#1GH;?3$hG*2G`o-QCZ}<1_KG#P^o?ZIilV|xn|KjcQlP}&LX3q1|e2()u zo5tLq9A)-Zo*(9#xzF5ZZtg?Ds#35bD^Eh{C^Mg5=X+K!E3L?6R~k}f zEGuwcN${QzJ)n@;i#E;3%6)re*5)U=@BYsZa-F1_HTgVu3%B9Ay3VX>4n@*LPk8Dx zJhIm*9?F#&bl_@*)${C9nR%J@KRugv7!*RUD`L^E$kS)!CM*7OPrHZs^UP@XATPFv)Aq{5}}CFv|nwo!wU*yWq8@;a^VS|L(I=^jf4nH`I%tztWJ|gRg4cy}^_w~o{Yd4-X zdt&r3d@+8QyDbcOR!u(*1K5GZNb=XlfNk2~rE-5Mlb? ziGI9B#y-pQ%gA|<>v68K+EuXSBG0aaQfC=EPPRLb><1SpoM)6}j`Cz^>NIwCe>78E z$L2?wv!8p^*U>0SSGCq zb*yxel~*{-3}|?qS!XmE+a84aft4i6clr0Mh>c@+=lNV`2Kii76KC`Hi`?V&GJNjm za~&O>=lON>?^RYFh2~ZE5+U}vj8ywseVVc3tT@Q$D&wx}@Q`dVjTNKM!Xdmn%I7pI z$xNEle8jzq;S7&-kva8AJLZ1E;?r=0{(1Jt?P;#p*;~DH5YE>bqX*B~&z zK&!ZXKa3>yU5Cn5=JUR2lr?E3PcMw-bBdRYk?1Vn<2BVVe^ljNhRShx5-S�)=&+ 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 diff --git a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss index 5f2fec42..abc7d805 100644 --- a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss +++ b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss @@ -105,6 +105,7 @@ QComboBox, QSpinBox, QDoubleSpinBox, QProgressBar, +QScrollArea, QPushButton { min-height: 3.00ex; /* min-height: 1.30em; */ @@ -763,6 +764,7 @@ QScrollArea#WrapperSettingsScroll { QScrollBar#WrapperSettingsScrollBar { background-color: #BCBEBF; } +/* QLabel#WrapperSettingsLabel { border-width: 1px; border-style: solid; @@ -776,3 +778,4 @@ QLabel#WrapperSettingsLabel:disabled { border-color: rgb( 67, 71, 77); background-color: rgb( 32, 34, 37); } +*/ diff --git a/rare/resources/stylesheets/RareStyle/__init__.py b/rare/resources/stylesheets/RareStyle/__init__.py index e3221643eb35231151c38268018fbadd079ea719..b987bee262da6f386d765ec9cc7a49f4a6adb1dc 100644 GIT binary patch literal 26642 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 Q`2YKxyT6_U`>G%O4|Tu&<^TWy literal 26626 zcmeI*+ixXTl?L#4{}l&#AQ?eqJ9gVf!vo4lBVN#e=JG%g^5qzM)aedxClmhr`F>y3 zF4sABr#lT90n>=0PVLLu>-w#=ca`ZMZGQSsKiyovx_SQc4?o*{b$|QQb1er4Kid3e z`});ach}p^tE>OsUf&zEJ@`>NKD*mq-fwRZ)m+}Z#2i{Jd}m%sYgA8dZ{;>G6rkC!k1uzkJx;__y@ zdH!;9|HtRAH@Bg&`Jd*H(nL>qY9Aii z>l_c|$_P4eH^c0Cbg9g|%=(}DrWFQ-(Cds?v@_ECDY?mtzdY0KG5++qrm-ljTJX?O zde=OxpHabQC}#``#D4Sqb-l?YQ5iUG0dy4{<+v3jcaT%(Dr9r@{A&`9Wbs!icNk*Kdz`ae@akGJA=y z5rd-Vsc3$PdD4Z#lcPwM>n$;FWfay?i=Ta-JP%3pd%=dOZI)uha;f2d72D+zmB%qZ z$HiX|^N^nu;yW^rc&|p^HRc~8KB#cstPl(cRY-6Ww75vSyzG7*$&PZrxyowMojX6e z4Hn&`?=(5>I?|q$uhUSt%yk{ho`%vDt)Y@xvfgEQ)PI;+7vcXp6t}L7Ib8hoCiJf| z`Y=??I?9N1D3<$m`gl5t4@33B3b{_B?Tb>lz^U1}ZbRW#Y=qORtZ~BQVy~0T*oNXW z9+vSW(RW%uy=FNS4ZzAiFk(qI*J(t0+VnWR zu}bm(ip*KhXj$|qGGFGIJxF$%>pJbMei#a|SN!2R^4x~Pd3gBL@9;yP^`Y40f9UXwfPvCCyf^Pt1}Fd z722w-oA7fJs;3!E=8N>x;;j|%ncpOfwBex|LnSl#+I41GpG4+?3_ZrCYnpN7IITQxRmuyzOqp3E=!$3@m;S(J@opH_&O&3CPOUQLQYICUGEH|d2_ z7nyOG*(4Oz`~VeR-kjnYfAxpUw6d=nnSWkqq(}<=YF9+_F#12txbw^=5$k5v=s~oc zgpZr_iX!oUo8A#0cs$A~d{+|M%( z3Y>*%D1`#6oTQaE1^pVMMf}KlMVsNl?&LU9h*RTOokyKCvQVfuhf7rzd}K`?gKO*K ziRbAnR;91lS{}~xbd`(mpXIvBY?>9({8U_M4O=ybbeokFVdce%C`A}zS;ZS$lP&z8gBWY2vXzKZ%N4VB+G2P9~P@cGHXJN zv~2@Zh2BZl7Gb=)o{UpeBiU8%v3-5Oj!cx-vx{=F z9i-=_w6o1Rm$bGJx>T(t?WgK`U7I_d1fSJ!iRaCJ9e7X$f z%Z#IoL|~*Sie@ddP+;d~n*6@WXi+9^8pG-1J8+fulc`ZiFCEa1JWwpkntYNpP>n?5 zfhQk@vPgiT({4mGi5%I+Z|KH0tazBa+)VZX@&4H9UeraySnw zpIMs@&eDb#UKeViaFdZDl}+fF_Mqu`W{4F&i6>|eE39pdol7t+6hzNe)`d+h#s;FR zRZb|>CRtPE!J|nF(@C4kB^0c~&x&M`xd@t(bT1yZ=~qkfepMWQl|yJY*(nt2^O-63 zAsfFSRiiq;@x@1=fVLxgNE_WG$AyCGf{fNKA9x~B?sA7L3*l%_ZiPr+wxIk=ksU3~%8< zB#9pP)Q8i4FC$yOMH-ss-ADQ}%RV5;Qk%psp&&w9BSZ=qeVjGA_qTR_^B3##`e)%D zhC_kdjE#rULpZYD3GJ{)MyQo8af@2kZRL|0;<)jWF>-gJa+X46ObS?t2k{48@K6*? zyGo3uWj`4}Buo^V&C+^7bKwU@@*24UF7g3>2`9v=XPKX6!(VuSPcjHhR3{mEmEX-{ zS*N)qYu|*rUG+9?;uRufY$)(12**>@D5_qOO#*cl9kHIsrr}njq0(Bbrxj#sM$5=* zFLyl9tTk0ZVgr`(Xxf$2AkR(X0)o+ftJ16kr{RLgQW?l!J?Ahhlvx*lYMptf6RoMA zc$IvSYP-7ONn_uWYNrxNSCnpCrQwfaLf&wK&0*cHGFST#jA3)XYe(rP&T;ET?S{+Z#oG3+FVtA=Eu z_(ymkTQQhdWj)-g4`@@n+L8W6c=j~*6y>p%X%PngLaatmX2as{2r^rSV;la#qODe< zZ9c1lk1oQ)h!*;|VWEsx&+;M~?fx^ob!U|IRixrmr4;@`p*2#t(Cr=;*BK$Jv5PfifL11Eh7Y(P6Ev10VInUSsB0@U0e($Bl)74l`JbkesQ59Om+wlkW@6uIu{wyJx*qh`c^d{KG?u-nMVXd%ayTKWg$6&*JUPXSs`hXv@obf)RdU zdvp{YL{4*c))I?+66!;;?woL+_1U3$C4E*yHE|sZW~;tsGdYPLs6OS=)7OH@|#rrwbl#8;S(ZmvIY6XhTVECX3g}{2}&?j+{lQi zvVOfQ{izPZ16+Q2B84KwD4RyL0|mat?|W1eWnKS{+xD_0Fup7g?2U zP$WNmfX&)eVf3J$Vs#iY;iPjmoQaRtMmUYv$Ts2xvXR7^BX{w3`pZg@f)>TSI##xm zlX~Ws`&Fp(4@gKFm2-E|tQ(C-o1q{Mx+BS*2dRG?kwT{VXvf@om!NTenT7=U@n(!A%!vhOiyEz=SXw2ID?k2xUGU|VPHR8grJRfQ4 zA?q3~4q&DVkZrP_*?Nt>!D6pW%Bxml#EKG;Ntmg(7t z26>l^2g7>Ok>B*BT44R~5elWtzjCo03Dk^6z|D*B;2Z^bz6k|Li96HUIRj!^Z{0n}p?J7{`habv8;KDkElkxGPKXjmpzyTQz2c%H>5`$ZBI z(9TGHZq52g=(rJ06BLjgak1o7idV)Iz2P49jigOP&O>@Lgu+@Ai^u0}H zvnnk@bGU$l{Hd-G+4VSlWH!H*Q(_x>2=_9(`oO-D=6D$kipA!t^f$++O|EKOq2QFrT0EJKyN}37m7$Xo(akT} z3<}9QvO{gv$YL>w)!ka|^>QOKQzZxs@W;xkL$=^qa_RgnfYBK#o4`m`g-uWn59|;5 z_@wM#-guq%YO;H_jOd;=t*xhUjB}EtuWx?R$6j*1%0%{^thrR>gJ-X+K z6h+xQ^ElR*Q{yYFnKf7limUd>+$h3v`pjs3p`8!p&ZA_VpiL;yDI|e^G{utQv)Lzo zcxVk1-qij)Uq8u$8~h=&&~-Y(*510A4YyetRyGslcTd~$EN*#05GfR_yJ~3!sXFHo zT~lq}_w3<^)G~zXJsCO_po)lUC7AX5t~qTo8#IG(DkE~k4b>?RhgHFoP=LYp=Fl_) znzRxyI?uE!Myv76>e*@fJO>>^!5bCG#m`i`_A>0jk}!dtNGbAEBHaV=l~9>??xBwg zDb$Irn=?WllN&_wIJ4wU^dnAWhgdp1s47~k&~HZAKd5k^UaOzn*+5;>s3w2LwWexa zt!@*!eb1ZTIbte*PY=i*spL(5$g}wjua8#4gUqi^v5so2sG5;>@_o;iHXbBKR3@!L z=qBw!WKu+4>lUX&g(mwpHotqqnHBhCBgxoM!c$LKCR=1icOS94HxCem9!S?{&of*^ zL5%P~v8m2Z+=K`EZH0wG*5g4qrgO5BP7YUB(I!iGKa7{|)U4kViO^L2j_lU`cG^@W zt((Gwy-qVyD6@9>3J>Zdw)HlF1hOmJz$0g;G9k}0Lv_eMXkNtSM1d_bQmxQEZ78Tf z_&iA<8B~{}P;U;6R-vLZi+Eoske8Oa6AbOvby<%!?LkEq{D8R5tG&PIj)A62p{J(l z!7cmu1cA2jMMt@yE`9Z#Qz*fA*d9y`4?LQcpoknPOooSkS(0|S43$_oJg6OK1d>mb-nc0>qCJ*%6Rm` zPg6C8LMv|eNUxD(_9SI#0hp zsT94}Lq#?cb6ojdRr6k3htZm%ha4lh$@s$z4h6I<{FJ5n|tyF$7a z#f_v;S1seAyMstze<}lI)llfpJoMy9IAA}^v-zsZheUKD6ZO3>exq^T7o-b?RyrAJ zG+V1cRO_N%Z3_>fpP1mkLl-2?t}zs71e!oJNYe^1)EZ^9n33JZgaR$9#^|cpU97I9 zXbbn@P=+%DW|O4vmPvs7P=-c)L%kim3=c9Jd-Mb~^vP}i%l})MWTd!-E-EIwn7;3d zE@oR~G|!f8#0V?(96d8&XniFV=%P`dnLG|=#9rY6$K4@jHeEN`GeUI=+2l`^ms~|x z&1<3VJSYem3L;fK0+$;D>4jN1hn;rmJ-rCUqH#1z^V+96N<8!gB_rrVW!4=)WE$T!XZp+imWhUbt~@7>S-cthC7iXNAYwu1Ng{y(o@)? zy}g~CIt1m9BNo(Zv?h;tOhC{wRj}1w(ktJpPatejsnsi4jiqp_+=z`z1R$Z$M}p zj))&fn5;;X;hY5BSD+jDtica^x|fm7AL)Y+P7~A2gZ&t@Yvja*T$3uUouf1Y`4ksfb2 zocrNWMTm2G5q`>DWVQ!@3HX!W;N*m~a+cX5+i0U;7W;@Icm!G1F+DRy)tK~0XW>DW zCDz3T6ca^7G!lgu^@T{1FXfBwltQIv+Knt;#FKfB=&{G^JN}F^i+-H?LLqT01Mv&e z22;ZW-xB}TZALm5ZY>qQy8l5v{J`qD3T<`}X{p*+Gx9@=`atfo9#3aAk;OhT9IMh9 z9d$pP`;;%lq+ZgUhQ?4KQilgt;VnI_$jHWNM%S8IpI?YF zJ8JQv5>YL|%HUKekgca!(G)wwM%5-U zHuwQ8cJIRmnPpx4^eiHhPT9YxHLu&O9@_SOG$*1|Ln;$%H=5Eff2l;`m*K%qM6On^ zi$is+w-EF%W}Edg+gVZfS15<76Twgkg`UM*CnMDCu!_B{)BKScJ%dYIPx~@Pe4vn> zd?-Lqm9gyJ^SSWR^XjybrkET}sscSjS(w7Z;>)3cYaYx>@{pRPIGlER@pepQz`H#| zLfKE1mJAdMEGZUw54lxccqkvyhjm3e%Q}CM*I=vXpdcyI3KP(m)p%>A!B_g|1eLjt zF0$}l@fyp9Lj67?)yXU*CqotJA}^3aWy~*N0~9DS<~hC;3i2VJaM{ba%MaF9d0p$703G@!e2pR?S+fpCU?nWq|mj-f+_^t0%6~60PTdAzE=LvuKW9?M_h`dL}0e z(>>eMAOy&BD410WW@M(UD(gVc@A&t+yR;|Dvotb4KJd543t1*^rWqulooLJn2?@sx zvr*}lIX(5QCyQj9kE>@~c_y#lm4;MlGj`~}%DLzPg^XUbNlWYz8_?1E;_;38SYwuI z)+9L>ZX-q4!AG=i>tbn3f7=Eh#u~He zVUZ1ovkq1xip8xApYX7Zo24*geL;;zxA>sx$c_q>VfAs%(aqPhHZSJ2`(B>Dth1m? z)=DJkmGDu%Q0cyEXT1m7 zQ>3x-Os%sX|BgR2gG@42)~++re=NsHVny^P?)8J@Z zQ(sYBX*N=?M+=RFFK zMu@dntH6u0o|Lw;P&3;qtz(mv$J-HiJE=11D@dxq9($-(bf zhdvQyAI_9Maw->78 zC$3OcoK{a?gF2ng{seWu zvTpA=sdsk<-h1l0wui?)$J^HJ-fgvi%wH(xtv}is@11=AHevdXHPolSsVSY)oyU5I&pBP!3m5MEqwCK6d!yC<>;v2Gl;61d zZb#St)N<`#)_UN>?%sRt>ARbbUbM2%pZOW`{T2C`sHoo@#caGmd zXULOt>cPQYWUD{ElSZA-WmRwQR}wy0a&Ry-IBRT?_?iQTb}1|T0PGySz6w8<`PI_rq5>jdw5Ysd;rQ%z-M;gjzWfR7o`(7-F+)r1 z`-%b^Pn@PdC0y3f`wnX=N~X_i*E1J; zuGjN>y=JH{8{on-a*hmeKu)JVRg&DWrNP_g*;%6Gc9b>}u;e?A78HErK3=ljq-+V2lTZ`a9p z0jdW{K<87mCn)=Rd-wYJtCzvA-#&kN|IybU_aAfl+CR=R{fjG~{OLcZAs>DG$?Gp) zJiq_w$DjQ8E&)xO)()shvQQOx4bjwsq zWZB1!sV@$;FJ5n-B6R%S2pu0B+-$?>FJC^tAOF71>yJL3C=dC5v;D*K*Z14IG2mbF wugZM1;{PX4@VMJ%-@n`9U#9tZUi`Bc+sl_ Date: Sat, 24 Feb 2024 13:11:28 +0200 Subject: [PATCH 08/10] WrapperSettings: Improve widget structure * Remove the annoying stacked widget, instead create a double layout in the container and place a label in that to hold the placeholder message. * Implement the scroll area as a custom widget. This custom widget installs an event filter on the container to adjust the scrollarea size when the container size changes. --- .../tabs/settings/widgets/wrappers.py | 153 ++++++++++-------- 1 file changed, 86 insertions(+), 67 deletions(-) diff --git a/rare/components/tabs/settings/widgets/wrappers.py b/rare/components/tabs/settings/widgets/wrappers.py index b508bf33..a4f70eb1 100644 --- a/rare/components/tabs/settings/widgets/wrappers.py +++ b/rare/components/tabs/settings/widgets/wrappers.py @@ -4,8 +4,17 @@ import shutil from logging import getLogger from typing import Optional, Tuple, Iterable -from PyQt5.QtCore import pyqtSignal, QSize, Qt, QMimeData, pyqtSlot -from PyQt5.QtGui import QDrag, QDropEvent, QDragEnterEvent, QDragMoveEvent, QFont, QMouseEvent, QShowEvent +from PyQt5.QtCore import pyqtSignal, QSize, Qt, QMimeData, pyqtSlot, QObject, QEvent +from PyQt5.QtGui import ( + QDrag, + QDropEvent, + QDragEnterEvent, + QDragMoveEvent, + QFont, + QMouseEvent, + QShowEvent, + QResizeEvent, +) from PyQt5.QtWidgets import ( QHBoxLayout, QLabel, @@ -15,7 +24,11 @@ from PyQt5.QtWidgets import ( QWidget, QScrollArea, QAction, - QMenu, QStackedWidget, QPushButton, QLineEdit, QVBoxLayout, QComboBox, + QMenu, + QPushButton, + QLineEdit, + QVBoxLayout, + QComboBox, ) from rare.models.wrapper import Wrapper @@ -172,46 +185,75 @@ class WrapperWidget(QFrame): drag.exec_(Qt.MoveAction) +class WrapperSettingsScroll(QScrollArea): + def __init__(self, parent=None): + super(WrapperSettingsScroll, self).__init__(parent=parent) + self.setFrameShape(QFrame.StyledPanel) + self.setSizeAdjustPolicy(QScrollArea.AdjustToContents) + self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff) + self.setAlignment(Qt.AlignLeft | Qt.AlignVCenter) + self.setWidgetResizable(True) + self.setProperty("no_kinetic_scroll", True) + + self.setObjectName(type(self).__name__) + self.horizontalScrollBar().setObjectName(f"{self.objectName()}Bar") + self.verticalScrollBar().setObjectName(f"{self.objectName()}Bar") + + def setWidget(self, w): + super().setWidget(w) + w.installEventFilter(self) + + def eventFilter(self, a0: QObject, a1: QEvent) -> bool: + if a0 is self.widget() and a1.type() == QEvent.Resize: + self.__resize(a0) + return a0.event(a1) + return False + + def __resize(self, e: QResizeEvent): + minh = self.horizontalScrollBar().minimum() + maxh = self.horizontalScrollBar().maximum() + # lk: when the scrollbar is not visible, min and max are 0 + if maxh > minh: + height = ( + e.size().height() + + self.rect().height() // 2 + - self.contentsRect().height() // 2 + + self.widget().layout().spacing() + + self.horizontalScrollBar().sizeHint().height() + ) + else: + height = e.size().height() + self.rect().height() - self.contentsRect().height() + self.setMaximumHeight(max(height, self.minimumHeight())) + + class WrapperSettings(QWidget): def __init__(self, parent=None): super(WrapperSettings, self).__init__(parent=parent) - self.widget_stack = QStackedWidget(self) - self.wrapper_scroll = QScrollArea(self.widget_stack) - self.wrapper_scroll.setSizeAdjustPolicy(QScrollArea.AdjustToContents) - self.wrapper_scroll.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - self.wrapper_scroll.setWidgetResizable(True) - self.wrapper_scroll.setProperty("no_kinetic_scroll", True) - self.wrapper_container = WrapperContainer(parent=self.wrapper_scroll) - self.wrapper_container.orderChanged.connect(self.__on_order_changed) - self.wrapper_scroll.setWidget(self.wrapper_container) - - self.no_wrapper_label = QLabel(self.tr("No wrappers defined"), self.widget_stack) - - self.widget_stack.addWidget(self.wrapper_scroll) - self.widget_stack.addWidget(self.no_wrapper_label) + self.wrapper_label = QLabel(self.tr("No wrappers defined"), self) + self.wrapper_label.setFrameStyle(QLabel.StyledPanel | QLabel.Plain) + self.wrapper_label.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) self.add_button = QPushButton(self.tr("Add wrapper"), self) self.add_button.clicked.connect(self.__on_add) - self.wrapper_scroll.horizontalScrollBar().rangeChanged.connect(self.adjust_scrollarea) + self.wrapper_scroll = WrapperSettingsScroll(self) + self.wrapper_scroll.setMinimumHeight(self.add_button.minimumSizeHint().height()) + + self.wrapper_container = WrapperContainer(self.wrapper_label, self.wrapper_scroll) + self.wrapper_container.orderChanged.connect(self.__on_order_changed) + self.wrapper_scroll.setWidget(self.wrapper_container) # lk: set object names for the stylesheet self.setObjectName("WrapperSettings") - self.no_wrapper_label.setObjectName(f"{self.objectName()}Label") - self.wrapper_scroll.setObjectName(f"{self.objectName()}Scroll") - self.wrapper_scroll.horizontalScrollBar().setObjectName( - f"{self.wrapper_scroll.objectName()}Bar") - self.wrapper_scroll.verticalScrollBar().setObjectName( - f"{self.wrapper_scroll.objectName()}Bar") + self.wrapper_label.setObjectName(f"{self.objectName()}Label") main_layout = QHBoxLayout(self) - main_layout.addWidget(self.widget_stack) - main_layout.addWidget(self.add_button, alignment=Qt.AlignTop) main_layout.setContentsMargins(0, 0, 0, 0) - main_layout.setAlignment(Qt.AlignTop) + main_layout.addWidget(self.wrapper_scroll, alignment=Qt.AlignTop) + main_layout.addWidget(self.add_button, alignment=Qt.AlignTop) - self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) self.app_name: str = "default" self.core = RareCore.instance().core() @@ -223,27 +265,6 @@ class WrapperSettings(QWidget): self.update_state() return super().showEvent(a0) - @pyqtSlot(int, int) - def adjust_scrollarea(self, minh: int, maxh: int): - wrapper_widget = self.wrapper_container.findChild(WrapperWidget) - if not wrapper_widget: - return - # lk: when the scrollbar is not visible, min and max are 0 - if maxh > minh: - self.wrapper_scroll.setMaximumHeight( - wrapper_widget.sizeHint().height() - + self.wrapper_scroll.rect().height() // 2 - - self.wrapper_scroll.contentsRect().height() // 2 - + self.wrapper_container.layout().spacing() - + self.wrapper_scroll.horizontalScrollBar().sizeHint().height() - ) - else: - self.wrapper_scroll.setMaximumHeight( - wrapper_widget.sizeHint().height() - + self.wrapper_scroll.rect().height() - - self.wrapper_scroll.contentsRect().height() - ) - @pyqtSlot(QWidget, int) def __on_order_changed(self, widget: WrapperWidget, new_index: int): wrapper = widget.data() @@ -266,16 +287,12 @@ class WrapperSettings(QWidget): self.add_user_wrapper(wrapper) def __add_wrapper(self, wrapper: Wrapper, position: int = -1): - self.widget_stack.setCurrentWidget(self.wrapper_scroll) + self.wrapper_label.setVisible(False) widget = WrapperWidget(wrapper, self.wrapper_container) if position < 0: self.wrapper_container.addWidget(widget) else: self.wrapper_container.insertWidget(position, widget) - self.adjust_scrollarea( - self.wrapper_scroll.horizontalScrollBar().minimum(), - self.wrapper_scroll.horizontalScrollBar().maximum(), - ) widget.update_wrapper.connect(self.__update_wrapper) widget.delete_wrapper.connect(self.__delete_wrapper) @@ -304,7 +321,9 @@ class WrapperSettings(QWidget): if wrapper.checksum in self.wrappers.get_game_md5sum_list(self.app_name): QMessageBox.warning( - self, self.tr("Warning"), self.tr("Wrapper {0} is already in the list").format(wrapper.as_str) + self, + self.tr("Warning"), + self.tr("Wrapper {0} is already in the list").format(wrapper.as_str), ) return @@ -314,7 +333,7 @@ class WrapperSettings(QWidget): self.tr("Warning"), self.tr("Wrapper {0} is not in $PATH. Add it anyway?").format(wrapper.executable), QMessageBox.Yes | QMessageBox.No, - QMessageBox.No + QMessageBox.No, ) if ans == QMessageBox.No: return @@ -327,8 +346,7 @@ class WrapperSettings(QWidget): wrappers.remove(wrapper) self.wrappers.set_game_wrapper_list(self.app_name, wrappers) if not wrappers: - self.wrapper_scroll.setMaximumHeight(self.no_wrapper_label.sizeHint().height()) - self.widget_stack.setCurrentWidget(self.no_wrapper_label) + self.wrapper_label.setVisible(True) @pyqtSlot(object, object) def __update_wrapper(self, old: Wrapper, new: Wrapper): @@ -345,10 +363,7 @@ class WrapperSettings(QWidget): w.deleteLater() wrappers = self.wrappers.get_game_wrapper_list(self.app_name) if not wrappers: - self.wrapper_scroll.setMaximumHeight(self.no_wrapper_label.sizeHint().height()) - self.widget_stack.setCurrentWidget(self.no_wrapper_label) - else: - self.widget_stack.setCurrentWidget(self.wrapper_scroll) + self.wrapper_label.setVisible(True) for wrapper in wrappers: self.__add_wrapper(wrapper) @@ -357,15 +372,19 @@ class WrapperContainer(QWidget): # QWidget: moving widget, int: new index orderChanged: pyqtSignal = pyqtSignal(QWidget, int) - def __init__(self, parent=None): + def __init__(self, label: QLabel, parent=None): super(WrapperContainer, self).__init__(parent=parent) self.setAcceptDrops(True) - self.__layout = QHBoxLayout(self) - self.__layout.setContentsMargins(0, 0, 0, 0) - self.__layout.setAlignment(Qt.AlignLeft | Qt.AlignTop) - + self.__layout = QHBoxLayout() self.__drag_widget: Optional[QWidget] = None + main_layout = QHBoxLayout(self) + main_layout.addWidget(label) + main_layout.addLayout(self.__layout) + main_layout.setContentsMargins(0, 0, 0, 0) + main_layout.setAlignment(Qt.AlignLeft | Qt.AlignVCenter) + main_layout.setSizeConstraint(QHBoxLayout.SetFixedSize) + # lk: set object names for the stylesheet self.setObjectName(type(self).__name__) From f3d870cebb383cfe461f61a6e12bf13799218961 Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sat, 24 Feb 2024 13:12:00 +0200 Subject: [PATCH 09/10] ButtonLineEdit: Remove stylesheet, it doesn't seem to do anything --- rare/utils/extra_widgets.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/rare/utils/extra_widgets.py b/rare/utils/extra_widgets.py index e5e9ca3d..f126f769 100644 --- a/rare/utils/extra_widgets.py +++ b/rare/utils/extra_widgets.py @@ -123,19 +123,19 @@ class ButtonLineEdit(QLineEdit): self.button.clicked.connect(self.buttonClicked.emit) self.setPlaceholderText(placeholder_text) - frame_width = self.style().pixelMetric(QStyle.PM_DefaultFrameWidth) - button_size = self.button.sizeHint() - - self.setStyleSheet( - f"QLineEdit#{self.objectName()} {{padding-right: {(button_size.width() + frame_width + 1)}px; }}" - ) - self.setMinimumSize( - max(self.minimumSizeHint().width(), button_size.width() + frame_width * 2 + 2), - max( - self.minimumSizeHint().height(), - button_size.height() + frame_width * 2 + 2, - ), - ) + # frame_width = self.style().pixelMetric(QStyle.PM_DefaultFrameWidth) + # button_size = self.button.sizeHint() + # + # self.setStyleSheet( + # f"QLineEdit#{self.objectName()} {{padding-right: {(button_size.width() + frame_width + 1)}px; }}" + # ) + # self.setMinimumSize( + # max(self.minimumSizeHint().width(), button_size.width() + frame_width * 2 + 2), + # max( + # self.minimumSizeHint().height(), + # button_size.height() + frame_width * 2 + 2, + # ), + # ) def resizeEvent(self, event): frame_width = self.style().pixelMetric(QStyle.PM_DefaultFrameWidth) From 7b810173dac76ecd6da5389af69127242329313e Mon Sep 17 00:00:00 2001 From: loathingKernel <142770+loathingKernel@users.noreply.github.com> Date: Sat, 24 Feb 2024 13:56:15 +0200 Subject: [PATCH 10/10] Downloads: unset autoFillBackground for queue scrollarea --- rare/components/tabs/downloads/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rare/components/tabs/downloads/__init__.py b/rare/components/tabs/downloads/__init__.py index 57cdec38..c0d4db91 100644 --- a/rare/components/tabs/downloads/__init__.py +++ b/rare/components/tabs/downloads/__init__.py @@ -61,6 +61,8 @@ class DownloadsTab(QWidget): queue_contents = QWidget(self.queue_scrollarea) queue_contents.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) self.queue_scrollarea.setWidget(queue_contents) + self.queue_scrollarea.widget().setAutoFillBackground(False) + self.queue_scrollarea.viewport().setAutoFillBackground(False) queue_contents_layout = QVBoxLayout(queue_contents) queue_contents_layout.setContentsMargins(0, 0, 3, 0)