From 8767904b5ec3f496ef5c585a24477f996b3bcdd3 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 21 Aug 2019 20:29:24 -0400 Subject: [PATCH] update theme checkboxes, remove novelty themes --- resources/icons/ui/dark_checkbox_checked.png | Bin 0 -> 452 bytes .../icons/ui/dark_checkbox_checked@2x.png | Bin 0 -> 825 bytes .../ui/dark_checkbox_checked_disabled.png | Bin 0 -> 467 bytes .../ui/dark_checkbox_checked_disabled@2x.png | Bin 0 -> 845 bytes .../icons/ui/dark_checkbox_unchecked.png | Bin 0 -> 397 bytes .../icons/ui/dark_checkbox_unchecked@2x.png | Bin 0 -> 828 bytes .../ui/dark_checkbox_unchecked_disabled.png | Bin 0 -> 386 bytes .../dark_checkbox_unchecked_disabled@2x.png | Bin 0 -> 875 bytes .../icons/ui/midnight_checkbox_checked.png | Bin 0 -> 452 bytes .../icons/ui/midnight_checkbox_checked@2x.png | Bin 0 -> 825 bytes .../ui/midnight_checkbox_checked_disabled.png | Bin 0 -> 434 bytes .../midnight_checkbox_checked_disabled@2x.png | Bin 0 -> 739 bytes .../icons/ui/midnight_checkbox_unchecked.png | Bin 0 -> 397 bytes .../ui/midnight_checkbox_unchecked@2x.png | Bin 0 -> 828 bytes .../midnight_checkbox_unchecked_disabled.png | Bin 0 -> 372 bytes ...idnight_checkbox_unchecked_disabled@2x.png | Bin 0 -> 760 bytes resources/images.qrc | 8 + resources/themes.qrc | 3 - resources/themes/dark.qss | 90 +++++++++- resources/themes/emerald-green.qss | 169 ----------------- resources/themes/light.qss | 95 ---------- resources/themes/midnight.qss | 99 +++++++++- resources/themes/pink-and-blue.qss | 170 ------------------ 23 files changed, 187 insertions(+), 447 deletions(-) create mode 100644 resources/icons/ui/dark_checkbox_checked.png create mode 100644 resources/icons/ui/dark_checkbox_checked@2x.png create mode 100644 resources/icons/ui/dark_checkbox_checked_disabled.png create mode 100644 resources/icons/ui/dark_checkbox_checked_disabled@2x.png create mode 100644 resources/icons/ui/dark_checkbox_unchecked.png create mode 100644 resources/icons/ui/dark_checkbox_unchecked@2x.png create mode 100644 resources/icons/ui/dark_checkbox_unchecked_disabled.png create mode 100644 resources/icons/ui/dark_checkbox_unchecked_disabled@2x.png create mode 100644 resources/icons/ui/midnight_checkbox_checked.png create mode 100644 resources/icons/ui/midnight_checkbox_checked@2x.png create mode 100644 resources/icons/ui/midnight_checkbox_checked_disabled.png create mode 100644 resources/icons/ui/midnight_checkbox_checked_disabled@2x.png create mode 100644 resources/icons/ui/midnight_checkbox_unchecked.png create mode 100644 resources/icons/ui/midnight_checkbox_unchecked@2x.png create mode 100644 resources/icons/ui/midnight_checkbox_unchecked_disabled.png create mode 100644 resources/icons/ui/midnight_checkbox_unchecked_disabled@2x.png delete mode 100644 resources/themes/emerald-green.qss delete mode 100644 resources/themes/light.qss delete mode 100644 resources/themes/pink-and-blue.qss diff --git a/resources/icons/ui/dark_checkbox_checked.png b/resources/icons/ui/dark_checkbox_checked.png new file mode 100644 index 0000000000000000000000000000000000000000..5acad089c0032c7ef3602f92e4ead43bf2bfcebe GIT binary patch literal 452 zcmV;#0XzPQP)Zn4u59cxbAs|-P77dQj5&9K4>zMUO&{9r u_6?R3@-D*Nj^+SviRjE2a~-JWAJIF(Ds=KIT)3P70000i0F@-9%R?MTh@)KK<4VX~VE%UG-5*{m1v$?S1CBW1FHI6T=2^S&gN0 z4j(=|pVRuB?Df+1Q-b=;_AbBP%ObGvIeWyk(rFu_vr>#^2Ipo)ukXCgIQydG_S<_s zg0y@~%9mcT-K(b8urR-(``ecJZ4%!n=C3bgTqAOAjeSCWeY~n-QTVH`zt;YnCwctT zdj?^Ktqi7W3|Wj>J`7iwuFPOq!MehbF@QTDnQ4L8f@3TWx(>aZ4N(nJL?}Fa<}c&s zfA#ZbO})=p$oS);F>Y)@_x+TAHDmJ>Hmw3oD2eAtN!NRY2CPfN7?ST zH@CfIzA@p4n`9HBsN%9KHi( tH%j*w9DjD``yb0?7G~)N5@ECV*ZzDbIXNVJDKIZEc)I$ztaD0e0sysye_8+l literal 0 HcmV?d00001 diff --git a/resources/icons/ui/dark_checkbox_checked_disabled.png b/resources/icons/ui/dark_checkbox_checked_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..bad9677cc4f4a9ba26e86e1bd35dedeabd704201 GIT binary patch literal 467 zcmV;^0WAKBP){y%|5A(0corT_4Ei=P>zuR57S>V5m zeg;{qDpp$24W7pI zv2KsO&|+NjHxvSd03kpK5CVh%A;83WVAB75T6uS%1GocZP-f{&F7B?VJqWHW3<943kb>A!xnU0z3&CB^ zfrm-Nn|*zGzFAyat}-J55_14%{PCqWm}`Rgpw%d!`_uEU=o8VUgC_z4p4I>W002ov JPDHLkV1f&9!|nh8 literal 0 HcmV?d00001 diff --git a/resources/icons/ui/dark_checkbox_checked_disabled@2x.png b/resources/icons/ui/dark_checkbox_checked_disabled@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3c3ea0b45e6520062ec5dd12ce13cc39d62df0c0 GIT binary patch literal 845 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V24 zPZ!6KiaBp*J9x3YuYR!xT*(urlZbjU3v;MWuE6!LE;MM<^ zeQAYY{=te1%c?f89{ln^(Y2a$QOlPAMFE4eY5V22q|WtOq&E9+lJWW6w0*qi_uagE zbAqJ9;)^^+kJMZ*W?Wg*G0~zyl|hg}nBm>mpf$`{41SDnm?LQ=$ZbtA0a!!wB+8dVw<|%;Yiesa+!^qrSly-!nf&edU)Z($6L3e z4i{h5^H33LJpAeBlFT3;m(vVxcOSPoo)6jX9LxZ6ri3#4CENd*Cpc8T7tP%C{nb6= z?4!=5%QrGTSh;$)z>-(OKM!V{U=Kgyai{hZ%b!i{ug^(~H_-!A&G*z*-@4D%T7CKUYORLGLvOw@1O57>)nj?h z?Q{2DeD~32`^R;Gv4Fc^G4lhl2X5>KbPx3MHAFW^%Q9?dFt=jJW6UdIxWjbk1;Y;3 z9T$mEShCk{!R`OgcS`=yb`W(qdlwi|Z?6e|H|6?13+TiLSMFNq%=fR-e5%g%T^QuV zeY+E9iF^(^<7a0?#Gn{ybV{4H{Wx13eeg=xAyv~1#e~IfpP9 LS3j3^P60#3jQH~}Z%R|`oypz{lv0kEw;PFu3f%)%&&dQBxC{~elH zb|D~X3ABCRUpFB!olb9#ZF#FK%T-nXGMFSu@&r5p2O#I8fvkf72!R&Y29t_7jt8FS rjgPH!_k90{Y|Shy%W`!-nmOJ9Bb0qej2bl$00000NkvXXu0mjfRwbrq literal 0 HcmV?d00001 diff --git a/resources/icons/ui/dark_checkbox_unchecked@2x.png b/resources/icons/ui/dark_checkbox_unchecked@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c0c4ec9c5575c62fde28ab6a9ff5de0a89d9ef9d GIT binary patch literal 828 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1L zPZ!6KiaBp*AN0EtAky|f_?D=(mSDkqw&Us(whQ#A9LnoZThOgoZpGh_You)`cync^ z+JWc?!Uj8v&MxRoJ-*7fzdQ5et(OKJCFe};={`aKMjc$t#GjD$@|6}=izs~8Z9b31SM$LL6l(98x zv*#ok#vPN}b`{FpKVL7g_D^@;V;#re4-7w_UM0%Uu<}`WRK~e&Z;#f*&1ZZWI{l*O z_FC1Cwf~J9`oyI27^=S498)~@|4cmF;&A6l-=j zmpcA-)o#8j-rDPR6B)O2B{ytg$n0Uf#I(ea&4YWwF$o1-2PtX@cJXwyuLO$SMS!bUGaUODO z3VOx4VqWl_Eq{B|+EcQvXV0FUxh2_VvGnne18*L6ZaWY<^@X6+V?7=M_><1EW)mi1mE(!Z}F#5p# z+j0zLHTUZqoAy0-6jqjLd${ZMt`jo@m;;no9dg@|@chl29A@TO``Y<@HJ8p4oY?=0 z*SB=$&E4NFO!2dF-P94c|F2C|?DfYMX5~%yLbuBw|M)NT*fU^ieEZD2`~HLPE89IK Qf!Tq<)78&qol`;+0PC1@x&QzG literal 0 HcmV?d00001 diff --git a/resources/icons/ui/dark_checkbox_unchecked_disabled.png b/resources/icons/ui/dark_checkbox_unchecked_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..9fb0036caa99a6b2cdf74c0637c1ed6814416243 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq~J) z)5S3)qV?_djeds$B-$Q+Hy3d`)pY$rtBc1gu8Sc`$D|)^bU3tt^T>@E8_F-V zEd74KNp_>k@rAl(TP4-qv}}Q z`Ta~)e`l{0D&>E}!qi%&zc_ZnGA8Z}jT!saPUFANaQEL=fr;u5QuAFNZ+)J7O2hwh z;hZvEBe4Uj20s3eR1TLk#)>{=$UcAjO>YKI4MX0pf2}F_)yk`I3 zQi~_v!h3m0JTt|K$ zeVb`C?Rw+Sg{HqR-AwqRVW22Cw>hOjM=?q0{hqonNt4v}&3Y)*e{Suc&+%#AHE%xu dx$5&=_{fHMm-9T)tAK&Z;OXk;vd$@?2>|bZq7VQ8 literal 0 HcmV?d00001 diff --git a/resources/icons/ui/dark_checkbox_unchecked_disabled@2x.png b/resources/icons/ui/dark_checkbox_unchecked_disabled@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8d6c0edd4af7b755b73cad183dde103b8163b43e GIT binary patch literal 875 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|T?H zr;B4q#hkaZ4|+>GiX7W7el3PYf33vVd*0a&(=U0qwm5MGRt0&t-iltzn%ni-|qKkb?*P3aq@`) zzkvkLb;(^P7Nn?M&RqF}#kgOvfZai!K|3b%e-BeYQo{6(Yg0nwG@lfypH(w8Zg_L$ zgoyAxh8KHtQY`SQq z_Reb$^M^m@HM-9HkYeUredMaP*su5_Gm=6T99w=T@Kgj{zB84fL7XFkvr#+2z}Cw3 z0sp)U{!HhsqNU@T?1T(Y_@&P`$Y4Cs8#Tf4eA%{Z_P^L(H-g+7YPIii&H4WdODFl& zeO53zshGfT|0eac7Q>F0ZC}d7IeY(s^|#hmFcf^6&7M&8mh)?5 zYIcnLbK{1Y$6x8UEZY6%_N4sVuje~zT)Q`O#ZJa|mhaCw$X&euxxV?X6axdxoonnr zcn;j0Kj&7<;t4HVdDgbo*~+Il{LSdO6<990MXKg_-2}$#T*(bv7&3bpFEK4KWb@#j za7;o$*FlOJf=xUDUsZx{OE0;)pyp?T<xx>i496Dis$%yzcY>F(55nHT-i)i283ZhTWx_G!urh6TID zQZCd4aQiN9%FwX=Bv-YaVf9+h~(m>7{ggTYYW^0u_TV8Q#HfyX&6 ze|*?;JF_tF(9L#s35LQgV$8qg&M7=o{bM!jYxERDIEGyuax0tYuz2v-X!< zo-!R2y;Ii~s!5fvpYvULR&Mcco;QM@S9Ptv+P&qhBv0Gxv-vW?PyaN%<2D869tKZW KKbLh*2~7a&iiPZn4u59cxbAs|-P77dQj5&9K4>zMUO&{9r u_6?R3@-D*Nj^+SviRjE2a~-JWAJIF(Ds=KIT)3P70000i0F@-9%R?MTh@)KK<4VX~VE%UG-5*{m1v$?S1CBW1FHI6T=2^S&gN0 z4j(=|pVRuB?Df+1Q-b=;_AbBP%ObGvIeWyk(rFu_vr>#^2Ipo)ukXCgIQydG_S<_s zg0y@~%9mcT-K(b8urR-(``ecJZ4%!n=C3bgTqAOAjeSCWeY~n-QTVH`zt;YnCwctT zdj?^Ktqi7W3|Wj>J`7iwuFPOq!MehbF@QTDnQ4L8f@3TWx(>aZ4N(nJL?}Fa<}c&s zfA#ZbO})=p$oS);F>Y)@_x+TAHDmJ>Hmw3oD2eAtN!NRY2CPfN7?ST zH@CfIzA@p4n`9HBsN%9KHi( tH%j*w9DjD``yb0?7G~)N5@ECV*ZzDbIXNVJDKIZEc)I$ztaD0e0sysye_8+l literal 0 HcmV?d00001 diff --git a/resources/icons/ui/midnight_checkbox_checked_disabled.png b/resources/icons/ui/midnight_checkbox_checked_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..4df7f714a06c82784a68133f0203de61652b1e2f GIT binary patch literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_r((Aj~*bn@<`j$X?><>&pI^LyUn>_fXWwuM7-~_MR?|ArXh)PT%Oo>?q)H|7Z!L zqF2skl^>j(8qxO)ADKr)ET8m)H#}m7{RELm>@vH1#kjNnv}a#Z(}=j?Hrp~{(qWEw zi4XlYpMGQXIW2AH?8g6k7k4RjUKK3h zJd50a{jWyX&(CgblOkl9#VXj{9M<*Letu}%c~x!#lW>A~K&slTb9*;3^lsT0Jim0B z!!pk`N)Oz;YPc>GyyHzhn_W}9^sVE{0!AyoT-`;zwNrtd?0*aD=I<|&sx80watv##-e(AvGe8k7j78h+;TlPV0-g^D>;>KTM@Bhqy{&Zi#|NYhPb~eu8R+^}Bf~!(;ir3O(?|kMx zZ&-dnXaj@Kk2Bu#8I0`*%C?K^UCr7WugrWRZBlG9{e0lFi_N#oCbQ++*%qAHzmN5{&D@UTzn0y+^L-C%$gS|){{4*ljdxeR zd{MYD;?G<4>1~NFbv60-nZp`N6Rw#(>AYOV!K+c>zRmXk!eX<@_BXV*mPUMfTB2uV zUblgj{&Z*CTnI!ihVf~eNbIv{qz4q@a^Hbh%hF2># zuPO*xTX!}0@oHA>n8#-Y4@}a%cXbEDyBm*O^%=z09K2HUB_jMgU-ACetOusXSJbWk zcKAf%JK;D67O&*Rb&h6}_xza8c4}%>#+2{O^BI{O7&sUh6&P3=7z7xY2y&VhO#IF4 z_P0LH=s-KeuWJVkdOFrUlX-UUJJW(x-jLrbrxnfk-6_t{zOBObF;D!~qx1JN+}L*X z_34)}A?DAs&aGef@tb}_o_-9|z6iOq=X&Soy<|CfNhkNMM7~CTxJl0L8pazRD|i1{ z74>uW*3;1nccyU*Gh{#Y`rCV%ow?uQa?U&TM;q-XT)Xk3)#!iO1%~U!agINZq)y+O z_q|QZVPDM3{l(HHle3GvW6ENGf4p_4)9RH?{A}S)mxI^j`$cze_!{+Bf&mCTUHx3v IIVCg!0G4J;8~^|S literal 0 HcmV?d00001 diff --git a/resources/icons/ui/midnight_checkbox_unchecked.png b/resources/icons/ui/midnight_checkbox_unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..4e68c78c7eaadd2e3c696d2a96602d307dd65663 GIT binary patch literal 397 zcmV;80doF{P)0#3jQH~}Z%R|`oypz{lv0kEw;PFu3f%)%&&dQBxC{~elH zb|D~X3ABCRUpFB!olb9#ZF#FK%T-nXGMFSu@&r5p2O#I8fvkf72!R&Y29t_7jt8FS rjgPH!_k90{Y|Shy%W`!-nmOJ9Bb0qej2bl$00000NkvXXu0mjfRwbrq literal 0 HcmV?d00001 diff --git a/resources/icons/ui/midnight_checkbox_unchecked@2x.png b/resources/icons/ui/midnight_checkbox_unchecked@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c0c4ec9c5575c62fde28ab6a9ff5de0a89d9ef9d GIT binary patch literal 828 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1L zPZ!6KiaBp*AN0EtAky|f_?D=(mSDkqw&Us(whQ#A9LnoZThOgoZpGh_You)`cync^ z+JWc?!Uj8v&MxRoJ-*7fzdQ5et(OKJCFe};={`aKMjc$t#GjD$@|6}=izs~8Z9b31SM$LL6l(98x zv*#ok#vPN}b`{FpKVL7g_D^@;V;#re4-7w_UM0%Uu<}`WRK~e&Z;#f*&1ZZWI{l*O z_FC1Cwf~J9`oyI27^=S498)~@|4cmF;&A6l-=j zmpcA-)o#8j-rDPR6B)O2B{ytg$n0Uf#I(ea&4YWwF$o1-2PtX@cJXwyuLO$SMS!bUGaUODO z3VOx4VqWl_Eq{B|+EcQvXV0FUxh2_VvGnne18*L6ZaWY<^@X6+V?7=M_><1EW)mi1mE(!Z}F#5p# z+j0zLHTUZqoAy0-6jqjLd${ZMt`jo@m;;no9dg@|@chl29A@TO``Y<@HJ8p4oY?=0 z*SB=$&E4NFO!2dF-P94c|F2C|?DfYMX5~%yLbuBw|M)NT*fU^ieEZD2`~HLPE89IK Qf!Tq<)78&qol`;+0PC1@x&QzG literal 0 HcmV?d00001 diff --git a/resources/icons/ui/midnight_checkbox_unchecked_disabled.png b/resources/icons/ui/midnight_checkbox_unchecked_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..f1b17e42306a16ef89cee9378ffb3c5dfab917ee GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_r((Aj~*bn@<`j$X?><>&pI^LyUosU)*YgAOiyZbh{&vn}pG~F3k(t6ZF4Oc9TE0mslad>$2*k<5x_*gVdjU=Pr7X zupwcm#S`(LlKLlCo{s&r?{a_n$%)@jR=*djh!^N|d90&+s{5I^_}ev=o0xPMiyhc3 zgg3|dHCh#Ly!qLl%~=xs&G~@TfXM{`}GandDxcn&l+Ly+}G1CefzFuu+pj2euLf@KDW)^d$Vr6W`3V|X%c(D{GSuWPNkfk{B*;f85TlU8lr2h8vg9S)MNqn>1_hb1UlBHc9)!Ci_MMSRi#|Gw&3Hb zubEcTkM~F2=3n!W;fmSUWnx})Xa9)$9FuOU_%@+p-Da!I+SN>&y8A@a78icons/collapse_all.ico icons/expand_all.ico images/blank_tileset.png + icons/ui/dark_checkbox_checked_disabled.png + icons/ui/dark_checkbox_checked.png + icons/ui/dark_checkbox_unchecked_disabled.png + icons/ui/dark_checkbox_unchecked.png + icons/ui/midnight_checkbox_checked_disabled.png + icons/ui/midnight_checkbox_checked.png + icons/ui/midnight_checkbox_unchecked_disabled.png + icons/ui/midnight_checkbox_unchecked.png diff --git a/resources/themes.qrc b/resources/themes.qrc index 547d7e03..5707a161 100644 --- a/resources/themes.qrc +++ b/resources/themes.qrc @@ -1,9 +1,6 @@ themes/dark.qss - themes/light.qss themes/midnight.qss - themes/pink-and-blue.qss - themes/emerald-green.qss diff --git a/resources/themes/dark.qss b/resources/themes/dark.qss index 17154c40..52787f11 100644 --- a/resources/themes/dark.qss +++ b/resources/themes/dark.qss @@ -31,6 +31,46 @@ QWidget::item:focus { border: none; } +/* Menus */ + +QMenu::indicator { + width: 12px; + height: 12px; + padding-left: 6px; +} + +QMenu::indicator:non-exclusive:unchecked { + image: url(":/icons/ui/dark_checkbox_unchecked.png"); +} + +QMenu::indicator:non-exclusive:unchecked:selected { + image: url(":/icons/ui/dark_checkbox_unchecked_disabled.png"); +} + +QMenu::indicator:non-exclusive:checked { + image: url(":/icons/ui/dark_checkbox_checked.png"); +} + +QMenu::indicator:non-exclusive:checked:selected { + image: url(":/icons/ui/dark_checkbox_checked_disabled.png"); +} + +QMenu::indicator:exclusive:unchecked { + image: url(":/icons/ui/dark_checkbox_unchecked.png"); +} + +QMenu::indicator:exclusive:unchecked:selected { + image: url(":/icons/ui/dark_checkbox_unchecked_disabled.png"); +} + +QMenu::indicator:exclusive:checked { + image: url(":/icons/ui/dark_checkbox_checked.png"); +} + +QMenu::indicator:exclusive:checked:selected { + image: url(":/icons/ui/dark_checkbox_checked_disabled.png"); +} + /* Combo Boxes */ QComboBox { @@ -40,10 +80,17 @@ QComboBox { QComboBox QAbstractItemView { background: #232629; - color: #505F69; + color: #EFF0F1; selection-background-color: #18465D; } +QComboBox::indicator { + background-color: transparent; + selection-background-color: transparent; + color: transparent; + selection-color: transparent; +} + /* Spin Boxes */ QSpinBox { @@ -67,27 +114,52 @@ QLineEdit { /* Checkboxes */ -QCheckBox, QRadioButton { +QCheckBox { + background-color: #19232D; + color: #F0F0F0; + spacing: 4px; + outline: none; + padding-top: 4px; + padding-bottom: 4px; +} + +QCheckBox:focus { border: none; } +QCheckBox QWidget:disabled { + background-color: #19232D; + color: #787878; +} + +QCheckBox::indicator { + margin-left: 4px; + height: 16px; + width: 16px; +} + QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked { - border: 1px solid #18465D; - background: none; + image: url(:/icons/ui/dark_checkbox_unchecked.png) } QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { - border: 1px solid #EFF0F1; + +} + +QCheckBox::indicator:unchecked:disabled { + image: url(":/icons/ui/dark_checkbox_unchecked_disabled.png"); } QRadioButton::indicator::checked, QCheckBox::indicator::checked { - border: 1px solid #18465D; - background: #18465D; + image: url(":/icons/ui/dark_checkbox_checked.png"); } QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { - border: 1px solid #EFF0F1; - background: #EFF0F1; + +} + +QCheckBox::indicator:checked:disabled { + image: url(":/icons/ui/dark_checkbox_checked_disabled.png"); } /* Map List View */ diff --git a/resources/themes/emerald-green.qss b/resources/themes/emerald-green.qss deleted file mode 100644 index ad061ad2..00000000 --- a/resources/themes/emerald-green.qss +++ /dev/null @@ -1,169 +0,0 @@ -/* EMERALD GREEN theme for porymap */ - -/* - - Background #2d8f4e - Font #B9E9C9 - Highlight #50C878 - Accent #226C3B - -*/ - -/* General Widgets */ - -QWidget { - background: #2d8f4e; - color: #B9E9C9; -} - -QWidget::disabled { - background: #2d8f4e; - color: #AAAAAA; -} - -QWidget::item:selected { - background: #50C878; -} - -QWidget::item:focus { - background: #50C878; - border: none; -} - -/* Combo Boxes */ - -QComboBox { - background: #226C3B; - color: #B9E9C9; -} - -QComboBox QAbstractItemView { - background: #2d8f4e; - color: #B9E9C9; - selection-background-color: #50C878; -} - -/* Spin Boxes */ - -QSpinBox { - background: #226C3B; - color: #B9E9C9; -} - -/* Line Edits */ - -QLineEdit { - background: #226C3B; - color: #B9E9C9; -} - -/* Frames, Labels */ - -#label_spritePixmap { - background: #226C3B; - color: #B9E9C9; -} - -/* Checkboxes */ - -QCheckBox, QRadioButton { - border: none; -} - -QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked { - border: 1px solid #50C878; - background: none; -} - -QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { - border: 1px solid #B9E9C9; -} - -QRadioButton::indicator::checked, QCheckBox::indicator::checked { - border: 1px solid #50C878; - background: #50C878; -} - -QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { - border: 1px solid #B9E9C9; - background: #B9E9C9; -} - -/* Map List View */ - -QTreeView { - background: #226C3B; -} - -QTreeView::item:hover { - background: #50C878; -} - -QTreeView::item:selected { - background: #50C878; - color: #B9E9C9; -} - -QTreeView::branch { - background: #226C3B; -} - -/* Scroll Bar */ - -QScrollBar::vertical { - background-color: #2d8f4e; -} - -QScrollBar::horizontal { - background-color: #2d8f4e; -} - -QScrollBar::handle:horizontal { - background-color: #226C3B; - border: 1px solid #2d8f4e; -} - -QScrollBar::handle:vertical { - background-color: #226C3B; - border: 1px solid #2d8f4e; -} - -QScrollBar::add-line:horizontal { - border: none; - background: none; - color: none; -} - -QScrollBar::add-line:vertical { - border: none; - background: none; - color: none; -} - -QScrollBar::sub-line:horizontal { - border: none; - background: none; - color: none; -} - -QScrollBar::sub-line:vertical { - border: none; - background: none; - color: none; -} - -QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal { - background: none; -} - -QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical { - background: none; -} - -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; -} - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -} diff --git a/resources/themes/light.qss b/resources/themes/light.qss deleted file mode 100644 index 59d75cb1..00000000 --- a/resources/themes/light.qss +++ /dev/null @@ -1,95 +0,0 @@ -/* LIGHT theme for porymap */ - -/* General Widgets */ - -QWidget { - background: #F5F5F5; - color: #3C3C3C; -} - -QWidget::item:selected { - background: #CACACA; -} - -QWidget::item:focus { - background: #CACACA; - border: none; -} - -/* Combo Boxes */ - -QComboBox { - background: #F5F5F5; - color: #3C3C3C; -} - -QComboBox QAbstractItemView { - background: #F5F5F5; - color: #898989; - selection-background-color: #707070; -} - -/* Spin Boxes */ - -QSpinBox { - background: #F5F5F5; - color: #3C3C3C; -} - -/* Line Edits */ - -QLineEdit { - background: #F5F5F5; - color: #3C3C3C; -} - -/* Frames, Labels */ - -#label_spritePixmap { - background: #F5F5F5; - color: #3C3C3C; -} - -/* Checkboxes */ - -QCheckBox, QRadioButton { - border: none; -} - -QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked { - border: 1px solid #CACACA; - background: none; -} - -QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { - border: 1px solid #3C3C3C; -} - -QRadioButton::indicator::checked, QCheckBox::indicator::checked { - border: 1px solid #CACACA; - background: #CACACA; -} - -QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { - border: 1px solid #3C3C3C; - background: #3C3C3C; -} - -/* Map List View */ - -QTreeView { - background: #F5F5F5; -} - -QTreeView::item:hover { - background: #CACACA; -} - -QTreeView::item:selected { - background: #CACACA; - color: #3C3C3C; -} - -QTreeView::branch { - background: #F5F5F5; -} diff --git a/resources/themes/midnight.qss b/resources/themes/midnight.qss index 8552ba4c..1cd37b2a 100644 --- a/resources/themes/midnight.qss +++ b/resources/themes/midnight.qss @@ -30,6 +30,46 @@ QWidget::item:focus { border: none; } +/* Menus */ + +QMenu::indicator { + width: 12px; + height: 12px; + padding-left: 6px; +} + +QMenu::indicator:non-exclusive:unchecked { + image: url(":/icons/ui/midnight_checkbox_unchecked.png"); +} + +QMenu::indicator:non-exclusive:unchecked:selected { + image: url(":/icons/ui/midnight_checkbox_unchecked_disabled.png"); +} + +QMenu::indicator:non-exclusive:checked { + image: url(":/icons/ui/midnight_checkbox_checked.png"); +} + +QMenu::indicator:non-exclusive:checked:selected { + image: url(":/icons/ui/midnight_checkbox_checked_disabled.png"); +} + +QMenu::indicator:exclusive:unchecked { + image: url(":/icons/ui/midnight_checkbox_unchecked.png"); +} + +QMenu::indicator:exclusive:unchecked:selected { + image: url(":/icons/ui/midnight_checkbox_unchecked_disabled.png"); +} + +QMenu::indicator:exclusive:checked { + image: url(":/icons/ui/midnight_checkbox_checked.png"); +} + +QMenu::indicator:exclusive:checked:selected { + image: url(":/icons/ui/midnight_checkbox_checked_disabled.png"); +} + /* Combo Boxes */ QComboBox { @@ -43,6 +83,13 @@ QComboBox QAbstractItemView { selection-background-color: #49483E; } +QComboBox::indicator { + background-color: transparent; + selection-background-color: transparent; + color: transparent; + selection-color: transparent; +} + /* Spin Boxes */ QSpinBox { @@ -65,7 +112,7 @@ QLineEdit { } /* Checkboxes */ - +/* QCheckBox, QRadioButton { border: none; } @@ -88,6 +135,56 @@ QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { border: 1px solid #F8F8F2; background: #F8F8F2; } +*/ +/* *********** */ + +QCheckBox { + background-color: #31332b; + color: #F8F8F2; + spacing: 4px; + outline: none; + padding-top: 4px; + padding-bottom: 4px; +} + +QCheckBox:focus { + border: none; +} + +QCheckBox QWidget:disabled { + background-color: #49483E; + color: #F8F8F2; +} + +QCheckBox::indicator { + margin-left: 4px; + height: 16px; + width: 16px; +} + +QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked { + image: url(:/icons/ui/midnight_checkbox_unchecked.png) +} + +QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { + +} + +QCheckBox::indicator:unchecked:disabled { + image: url(":/icons/ui/midnight_checkbox_unchecked_disabled.png"); +} + +QRadioButton::indicator::checked, QCheckBox::indicator::checked { + image: url(":/icons/ui/midnight_checkbox_checked.png"); +} + +QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { + +} + +QCheckBox::indicator:checked:disabled { + image: url(":/icons/ui/midnight_checkbox_checked_disabled.png"); +} /* Map List View */ diff --git a/resources/themes/pink-and-blue.qss b/resources/themes/pink-and-blue.qss deleted file mode 100644 index 8a919266..00000000 --- a/resources/themes/pink-and-blue.qss +++ /dev/null @@ -1,170 +0,0 @@ -/* PINK AND BLUE theme for porymap */ - -/* - - Background #31739C - Font #FFFFFF - Highlight #EF5A63 - Accent #FF94B5 - Disabled #4A9CD6 - -*/ - -/* General Widgets */ - -QWidget { - background: #31739C; - color: #FFFFFF; -} - -QWidget::disabled { - background: #31739C; - color: #BBBBBB; -} - -QWidget::item:selected { - background: #FF94B5; -} - -QWidget::item:focus { - background: #FF94B5; - border: none; -} - -/* Combo Boxes */ - -QComboBox { - background: #EF5A63; - color: #FFFFFF; -} - -QComboBox QAbstractItemView { - background: #31739C; - color: #4A9CD6; - selection-background-color: #FF94B5; -} - -/* Spin Boxes */ - -QSpinBox { - background: #EF5A63; - color: #FFFFFF; -} - -/* Line Edits */ - -QLineEdit { - background: #EF5A63; - color: #FFFFFF; -} - -/* Frames, Labels */ - -#label_spritePixmap { - background: #EF5A63; - color: #FFFFFF; -} - -/* Checkboxes */ - -QCheckBox, QRadioButton { - border: none; -} - -QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked { - border: 1px solid #FF94B5; - background: none; -} - -QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { - border: 1px solid #FFFFFF; -} - -QRadioButton::indicator::checked, QCheckBox::indicator::checked { - border: 1px solid #FF94B5; - background: #FF94B5; -} - -QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { - border: 1px solid #FFFFFF; - background: #FFFFFF; -} - -/* Map List View */ - -QTreeView { - background: #EF5A63; -} - -QTreeView::item:hover { - background: #FF94B5; -} - -QTreeView::item:selected { - background: #FF94B5; - color: #FFFFFF; -} - -QTreeView::branch { - background: #EF5A63; -} - -/* Scroll Bar */ - -QScrollBar::vertical { - background-color: #EF5A63; -} - -QScrollBar::horizontal { - background-color: #EF5A63; -} - -QScrollBar::handle:horizontal { - background-color: #4A9CD6; - border: 1px solid #31739C; -} - -QScrollBar::handle:vertical { - background-color: #4A9CD6; - border: 1px solid #31739C; -} - -QScrollBar::add-line:horizontal { - border: none; - background: none; - color: none; -} - -QScrollBar::add-line:vertical { - border: none; - background: none; - color: none; -} - -QScrollBar::sub-line:horizontal { - border: none; - background: none; - color: none; -} - -QScrollBar::sub-line:vertical { - border: none; - background: none; - color: none; -} - -QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal { - background: none; -} - -QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical { - background: none; -} - -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; -} - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -}