From 6e346d0fbb90af874c459de98ef5f36f23eb88c8 Mon Sep 17 00:00:00 2001 From: JackLee_CN <809262979@qq.com> Date: Thu, 7 Nov 2024 12:27:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=92=8C=E5=9B=BE=E6=A0=87=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=8C=96=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res.qrc | 2 +- res/img/btn/btn_about.png | Bin 791 -> 703 bytes res/img/btn/btn_close.png | Bin 4092 -> 469 bytes res/img/btn/btn_download.png | Bin 439 -> 527 bytes res/img/btn/btn_max.png | Bin 1851 -> 380 bytes res/img/btn/btn_max_restore.png | Bin 0 -> 547 bytes res/img/btn/btn_min.png | Bin 1634 -> 196 bytes res/img/btn/btn_restart_max.png | Bin 2286 -> 0 bytes res/img/btn/btn_setting.png | Bin 966 -> 928 bytes res/img/btn/btn_update.png | Bin 752 -> 735 bytes res/img/btn/net_error.png | Bin 897 -> 717 bytes res/img/btn/net_ok.png | Bin 886 -> 868 bytes res/img/btn/net_wait.png | Bin 678 -> 825 bytes res/qss/dark_style.qss | 26 ++++++++++++++++++++------ res/qss/light_style.qss | 14 ++++++++++++++ src/sui_title.cpp | 15 ++++++++------- src/sui_title.h | 4 +--- src/xsteam_ui.cpp | 4 ---- 18 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 res/img/btn/btn_max_restore.png delete mode 100644 res/img/btn/btn_restart_max.png diff --git a/res.qrc b/res.qrc index 004c379..b6558e8 100644 --- a/res.qrc +++ b/res.qrc @@ -15,7 +15,7 @@ res/img/btn/btn_close.png res/img/btn/btn_max.png res/img/btn/btn_min.png - res/img/btn/btn_restart_max.png + res/img/btn/btn_max_restore.png res/qss/dark_style.qss res/qss/light_style.qss diff --git a/res/img/btn/btn_about.png b/res/img/btn/btn_about.png index 7ddca35410e9552e6e088825a621c34c28fe6f7b..02b74f8db4f34e97683f817ab64ea6ab450549fe 100644 GIT binary patch delta 679 zcmV;Y0$BZ*2EPT6B!7lUL_t(oN5z+YQ3F8?#ft-QP#jPPMFHRd925nB0*V5P0zd&p z0XU!zKmzY~lfB7a_il6TAKjTu%QcsMdHLjMa^Q1x;QJ?|04x@ZGXcJk%q7Q8Hu{cy zOWv2uC7+=a0-%ez@KFMQbpGs8fJ{5L0pLkMRy7oZ0CX|NpMNEnW@xR?7s;E910Xxn zM-PUs?FWEdNq5r+q!)nE{c7HE*^Lan)jZ<&!n=R~{MIP~Fasabh5=~2EqPo6BRhm` zVS48!5L*C@_Am1s~DN$<9zmzdZ{_tfiV z04#|BK$2YrD1UC4lI}@RmntHc2y1h?0EqkCs9Fb&MgdG^?}t!$z%2k5tC07A(>q}X zOrMgzmYk;2^Z>|KVnxO;Yu@h&fZQU)ZGL$GDfwD-H4r;6Kv@$8l5v*hfQ&Wq*AJog zybA-RcRT|in{>-$h=s8X7=X-C58&4TR7)y>+7Un#>VL$v2QVt5_Xt78^u9?*S)HYX zswJ&~PQ73&38_yEhRe_l(u%i6a|w*=v{ZW2zC8n!2zd~0L=lg@j?IpHJ!^+tw-u8I z^y^SBu+pU!X9K3kd+bsHwBlC33t(yFuu=dermV?PV=&^XSfR*zRx zJtqeSmw!-4{l>tyIa6Cmid)Q>*t_kD*Xj!iT5dA(=cuaaP|xt8vN*+^vbL1^z3?H8 z&>91lA8boZ*ujN1vX%oP{XekM_fNmkBrtX^Zeid{s9y*R4~QjaRmSX N002ovPDHLkV1ijPH!A=D delta 767 zcmV$X}gI=(j+N>$V;{^xTS3}kE=BRL!n)7@^juL4pDfKg-NcVpogzZcDBGft9(&I@BW z9NwQ!r#sj@h!?b*ZZ@0P2EqzJY5fxus53_lFwddds`+H@Rydv5K$HL|+J9;1h~^t2 zp4%e!=?g~Q0Dt^R*`<(UY|2pr0O}cehMdmV>-DqEkz@%@##QXVjxuJFz-|w_Yq?$l z05ycscV&*z@z{G6n&_oli=mp7j>N^6aXkO%XzBv zAZI`T$kDk#d=h}(;$;AkphVAq0FcWJ2D0E~4rKJ$iiHixCmAUDkN`^bd^H2MJj(&d zy6vlM1bW%yk$! zw__a%WRWxFwH?R0SU9CneIgT=4e3mtaFQ{w`h@pvPB=7EflIF6rT%@i0}S(ZD# z{w#sEZQtSC>Hyw@#CZsb1N=p`_Dld0xC6V*1nMoJfJeYsLjsSB1o#O^VGAGpHi&~P zp@K8UHhG@ki^Y`>VF(EqxH17@<|E+>HwsX12L^5xz)E1@P6DnH6u7g1O@azX3FsvH zzR#e;O`A+4mzt@Wp=W`jI=%sL@>kbVo!dGoT0oP;F9-9_jg81=&F^`VByZ4CPbb%Y z!R$D*{Z{@Soq+0r^J&{C0S$Z)0x4C(S-@0kK5g4cz@^Tq5>^2hxX%DH3Si(=39SGH zPLWUw_`tCe3xN=DjKoYJB-~X(-j?%y`z3X-=-RNNM4zB--z>)Q^u2&GSWI(3lGuqC zA31>(z*oaCe2RTLcDR_XZ<^*7*1v!~#JZ}g5A=p4q>R@%4k_{j^;`@vuW=DS00000 LNkvXXu0mjfz7fnK literal 4092 zcmeH~S6h?a)`bH`3{niBRKWlNMClN!1cD%mG$9sxktV%^fK;U_5Q>EED<$;ag@8(n z29WZCR8g8FG?7rGe!=|x zM#~RC&^pOAIcWnTC%kSyfB+##NJ6jtI!GO?;$Cv`1pr82I6Q&lr2#$eV|ow)4u?d@ zaZfi00uXC0Z*PEU!BET{+iZUzB$ij<{&@{RByi-3>u4eXSi2BirVdiasBfYc$1+{!arTf&j|S3V{%*HH1jUuy#I@5A zxB@@%Yfd`$)W@_CBxHt*t`slgz!n>KNIK|%pj%c$-fFw7!(9O$4`L<$3|%S)nzWS4 zZ>?u{4dzJddG(a?W5+g$onhO{7doeZ?|-RUb8Pfe7DCPt9WqHTVG%FQ`&|aG7Vhy3 zE(SrB4BhR^B2Ae7fP!Tei8aRw?p#(Vso4WVC=iU0wIGy}ZVL9uAz zqij$T18;i`!v~-T#Gd-g!zKuJp<$e805i)dsXeO$wk*3eKtZXgXlWei^mI{%oDk`q zGe*TXUS7*IR~jpI51Yt@9{0O5e{}6v`#=2>;~G zW!7`>6I_%fsP1Sf-RATBNkCxV)(;kr%2eG7Y}a<$5D$W#`K8m8hNj5&^^kz87Y2Hi zQUz2Hn&dEURt@Eq*ASgeD6W(tm*7GQmf%~F`I%{VuI!oh85@V8fN69=qJ(*@*>U-{z`4}R%fz-AoA^17Cm;jmhJ|-;FWmI=vgu7GCFMf;a^=`p$bYUFe;azZUGk^Zg?bN{ zYb@nU%tAe*yVAyIbC%Kdd1}Q68$YSNZTg#y6MMN*N#LQ*dT@~A^IK1-LTOFsosWnA zw!^jR!;VMjcA+k0yz9d|$BeaVVuWh-e6jHl)J}!4)~}$A9ooj0AKAm+t_9AAuAXOq zsMCK1J~25p)LD>*|1O$$DN;hP|F%`%?EtN~PQ$mS2&$vA8I_BT&HGY7sa|lO z%Kf9al(9>3Gn&!OJBPS4B%>Flx!CGn`9~pDc;Zz;aHV7Bqh}g!gf1lbPF*g>>T>W`F9nV~dfY4nZSWrICc1u8_wgw7{D59p5_NY1>(2Schc; z(@t(H;e(8g>Cj_W1^P@Rosz3fb;)x`Iz$f*#eLq;Z#Y)NC6#kjT4+?HyBLXP zk>KXMmk{H_tu1q*(OUmH85MnOJ85p*vRW5B^~K|Tq`-~$WjJq5&of6x%@n{7O*Ep%AzUU;Si6nz_oBc(7taSSjEvY#keaG7MT zT3NcTB7T!5P64fsNipTxn>MJ+DAcVJOv&vNNudLQcdV4{qulP zbquSSbC$fcS3Mi7PDQ7LWBopIBiUhv^=oG0>lQzc;z)>4bCad{tdN`(GWYuW_=x`u zk-MMLCRUK%18q|=L?6?tIm3^R$v_B!Q$O12KvRr~)!haAI4j!eXHQEoy*frZH@+pn zUc{$}!eg1??_b_!^{cNT*Sa_gV(W@`;)Xek7K~II?(7HqP?I_*(=f{E2JG4IF|=es zk9CbSl?7h)x4&1+HQkDR?S%bv@t%zi6(3S$D`fRbH*_WI(!9Cg%w0MH0K{F|(oA7e zb5nNV0|wGVOE=50{sid-Ds=RA?c|wk(aZ1;38~RVrZM_9l72DE&=72cfIu#`36)WS z9&Xw1(gv3hy&%rH3tWOT^mKfYwy#WKF7jX5I-G%Xw`S9l>B_TcV(oBhdl_Mxld5s>JFE`tCC;PSpF=<$&HQ7HJF zaUNq79cz5`tU`^&|YYbNRt1v%4=4G$WcOO)Ut9Th3K8PaViG3d(9`J6`Y8Ke{Bx44a=@@ zdUpqU_`Adj(wX-p;>`>GptYDrmi*l<$( z5$7eu2HAFoxGOtaJT>kewd>!6ql+<8sh@2LlFVko5vQD4l!q#d$V7FOY6Ggmy%qjC z^NHr1c_@DpH@U0iO+bjC9$JB2X`&Q1hW&W(@TVmVXtJ-mcoqg>6>e{8`u)oXsv8zW zR0rik7A{^}b9GZsdBA<89kSK927a_6xX$lD^>szxRi`8;Wo-fNZPU^3zlTzMJ^gX;eSDR^*O0VrilKId1K0eo9!Lx?t+$==w1W*6 znbK{BApfO+#;b2}^1Y>eqow+=2Vnx`lEtFDD@BmMl;h!?$*{fU-pJx=%Jvr_P6Y;i zm8)@NqV{x*)7783kiW3xQDSo;Z)E0&UCwWo&WQwWvJP@KNtB1mDLVqehOw3k)>mDX z>$wF-8^!adF8xm_`Q)B1gUqVuoByYu@5y3idN_q20dn)i`17NQsc{*jz9_ z(x_pOb*tR8PRzFq&G1tTO>$7CG(RAQ7g|B?v7#8ZZ_nwLrIQ5Q7iVaweS%RSSpMz3m4Jt%YXKy zvRAOgU}nejs57iRN@2$UQ{FuZeA1U$9O*4x4coz{`}6b24Wg)}+6bE1hJFpCS%a8s zZzk@!hHohkRo_Ghz0@)?txNea?1c)r;Ck@Vzb4l8uSzP{oJ#oK|qk*dnKN5xPWE@ zoE+2LC1<~wC!(mH%O`V+dBkHT+|n>|ZRw1q!CN=AMDYtkdL<~9EqWtX*L6AKCPX17 zVNX^a#7oVce#LfsSxs2{Cm1qsU>%(W?8k!yknZdj-zz zi1$)wTi-e0I0S(3yrm9^{LUC2&P(&`e=FbrZ`nP)5NsQM*%&ccMP26sC@p=>Dh=z% F{{yE8eRlu= diff --git a/res/img/btn/btn_download.png b/res/img/btn/btn_download.png index 774dba41668424ab72ff5e2f2951e9b28e543c5a..fc662d2ace91da062f5157b01df9a4e108ca71d9 100644 GIT binary patch delta 501 zcmVtf`$V`oT{Es z;D9ng=>%niW`lNvvO&3%DE(h#Dq?J7M`>xRSV9rRy!Ykz^Zy)c(DSf*&Oi9O0BM?z zs;YW{f}`zr>xN-i9HZvZ3Pe#f84ia8Kw}mJLH45naU4&P@PF|Pa8}@dD!?i{wJa<1 zecuypFP&XLUa{G1?svQ06xVFASmb;xp${ZUlH!Fqo4m#zclj5)0GLswc#pO#jT~`q zwE$o;W0=e)rAp$T>-U*;m zf(Ni|J4bVBu77!{`sMXfXf-2|5(w~A_W~sHuw$+o1*erA`d{uGtmK1B@=xI;BFe=z}kN;0LglJ>`9kbfH~v` zdoEXi>w+{tGnHC0pO&@u33&~$E=X(jZG-)X_$t_z6*smbb;DDR0>K{m?XBzuq{t}< r9LFg=&!aOzYiKp2Q$WaK^bYU|p}IgYyjv|y00000NkvXXu0mjfhvnaF delta 413 zcmV;O0b>4-1h)f_B!7NML_t(oN9~v4al$YRh3ibf2wi~<+6|IS&=JZ6g$c?AFhQIR zx&kAxK{G+p_c(`hgXKi2fA!2AM-Hs_zQ~GX%+tzOS(Y1PjK#a_`+nE9?RAZmSrfz< z0KCKelh?yA>;Z6Cqm={zAjhU@b{QaNAZH+F;D2QRt@b(A-+%p9Jl6?1H=xypG8AmZ zPW%G_SM>SUQ1B7}8W%-zf<`ILiy%N<*Ooz!m=N13#2kQc?sP8J+U+z8QU+d-)-P}I z14IlUVBX;-II_=+0Nl8ZLP!7_bNWQbF~mfO5P;VF2EZVEvf?kHDwQCx_H8_n@F~El z=r9(X(-G6|dw&`f9IKRKEe;ix0^*FA{p~J{;ofe%!WGTA-uEykFvU_nz81$HQfGgf-qVSq00000NkvXX Hu0mjf(fqur diff --git a/res/img/btn/btn_max.png b/res/img/btn/btn_max.png index 65a65e72ecd5273bf16f2e323cf9515830f5c1ad..97ab34589a678c7c175c15211fec12b22e1f6510 100644 GIT binary patch literal 380 zcmV-?0fYXDP)Z-V)^QFw zOoR`Mv_ddw=Kas*kFX}b#KiNhJAgdT1KYM!fX#3`M!*KWKH@mu={;`%s;WwdVaVhM zN5;B~UnNP>G6Gn2U3*>EQU3sEqnsE4%Ce;5630i8 zQ~jtzLVV*ziy1x@bO0)xRe@8z-U~uM@w~vCr=I{Po$Q|h0svga>kb$IiB2jrCO`eKNoIyHr`iVN#X1iJ%U3_D{_*?sj^B4~hw4>6_-<~` zq3|J=>HQ6bh6CR@IgaGBGyQLFaQIWDpdhfHnd6S~1N{@WdH1R~7#nR|ww&MN?x65} zN9Aip7M4!}7wtaFF*e?L{A_KzfWQf7m)~cqSy+ntXK$Bta!}wGd~5t(P+(|kp273P z|No!c@$YN&+&7-@ZLRd&8aQ-<3an{PxXPVg8ffuj2(8YlN`2PKW%#6=3xElNW<@c3~HpWc&GSlJT$K(6|JUq0-onQFJ z=l%cwy*F<(5o5Vj5ECWnk>RYMcxIwzV~Y}t&>@+bLLM4UqXMJhF`69cnj0P&H?|y~ z`AdsQUf#au{fd5I(Xju|kIU!dOQ)Wn_xayV_WhrB-sgFut^at9zM{ee?ir*P4hS9f zyiX22ma7$H`p5rCNvZZ&F^A8;#UCtx)V{Q0Y+NH zEdC+8&(A^Ob=#fy8jOuHN8f)aWnzjne^Tep$?-&^u6@0*z=>Uo->tnI6x=^r*UW8j zxW>ElejpQ*W!L?OuUS|&<(>H3CnRtp@DE?Sy26A~=Xd2(8XWo_mH!w#R(^;N`SDsr Uq}Tfnur_4yboFyt=akR{0BiNOiU0rr diff --git a/res/img/btn/btn_max_restore.png b/res/img/btn/btn_max_restore.png new file mode 100644 index 0000000000000000000000000000000000000000..6838947077d0763f0cf9084fca50bdb113aaf530 GIT binary patch literal 547 zcmV+;0^I$HP)35Y8avyl3rLU_K_c zfkV8~$`-pb^Y+cK^Q@KbJhVHR`EWyQAf%qnq0Px7)4*+n}dcAHk?^v&4^5mrd;sM(gSo@0Sn+|ZW z5BkO0!vO%$Zi05w#GK_Zd_^~(;ZOif00<8sF%Zl70H^S_+wGrDzJu7PR4Pwkp|9w! zCIXmDCN2!xm{!(;lVCeOJMcL@%K)fhap;npJor~d_rp4ZUn>a!H%8T&2LKf?z%%;q zpR55a6aWea3I+-W{tW|rSANtDZ*db+U*cM(9`Hq$-3ow@*4}~EpuRNlUhnmK-ku(~ zG6T}vsFViMn&SYj*^ZYGICBK2ERWPt8~~+Q1N2lu&oYm8tYrNH!KV(4i8hR$5!g%_oMsfWK63t= lq%RY{4Kska$n@?2egRKIlQ7PO+nN9X002ovPDHLkV1jTj?{NSC literal 0 HcmV?d00001 diff --git a/res/img/btn/btn_min.png b/res/img/btn/btn_min.png index a7d45677556b9dbd53514fa4bb9aa6c1b615faca..f0a668348800f4c692a1487603eeced7d6f14df2 100644 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZci7-kO=qW6p4fb76-l=_gE#E zu(&zHhybSr`}fB`INmSMwq@M{Ep2W718*9v7pz{*o$|3xL2SWRW`}40|Nagad@+H& zfW4%wjLpEvXx;MmrwZ2p{{NSch>P3D_>Ljq!~cJOcgt%$cVKsyNk~oAWohDHyc1>z c)HVi&cQX_eMJBj71D(a->FVdQ&MBb@0F5|AAOHXW literal 1634 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-ahlflbEK#WAEJ z?(I$6bt)~QE)VO{gsvqh-RNp0hPyTuQ(W+WHfKhlw@p5x#J_N=rBRq)!JCuVM5RBmC7s}MN2Z$ z(^xnr6&jbeFgW&!ygk#y;AoV$tWQAU#Kc8&X9_BK96NhOkcq`IXp6Bi6U)gRGp(E& z6x_SY(%c$GEgO-+c;J7lg8u%$w~yEVc=+-#Pvc6q#`$r7{``GyU;FL+v3Jk!Sn8fQ zy}$nN^yBCI&&&58m!B^@>v>f&(|y}{a`AireYrY4-{#{y+k&tO|4)3p{=H|p#sBUD zmmhbBdX};NeD=D&^7)L9A9r7`ulst@=hlBNE6o%7^DX7<_x(7o^kMT%`yUS{A3d+a zV)?tP_Ss?1PkRo;{}O*)+4z57`e*%X?;n5vcG+&pe%sCEW)Gcz?RI>heXsoRU)_0E zukXocT>UM;UgX+^W8HrPBo-TY9N=p_nZL2@gV!#<28GwWr{Yx|CTPW-zRoF-ve)tF zY8H;5quD>L7@O9ZYt&C=a9mZP3(RyAzOp@CFQnihy8h{F7LHB#7W@fiVp;iUYt38+ z$7|A4_IoubgzlNPURdEoRr9BCPJty|*FTjqu|(zv{L^A=3i%kdZ`88UU_>O4KhmXB Wolb^rVNU~A8VsJUelF{r5}E)=9Sl=Y_PYG$<%8uuO|*;xQm#1!_9!wlUOtX@|sWuEkt%gm1 zK0IIFznx$H-@ES4RmMUUl~s1N_Wtq-As;x5v|jG|uHX?nZTDP(6!S$d z+;Cm*G+~iK^eqJsZ?9t8W(DR-g%bxhbjP(SxH@jz;y7X2lxJ0Jj%=TR>J!EHayfQ2 z*LenY=S2rxc5DXBWQAQ@N_Z9G=@thGg#$zaq;id_;Y@f;t7k-0x2=q zeDim4O;~nV=fj22ih|~X<~fU`o8}1p{yRO6^+d|Xo5yx?@#hKT3Cw1BZ|XK7IO#dt zOr3ALA1j$(0?|K~?+sbavVSYlh zO!0)~#?Q{bQh>xR<`duR|9-o?Ew}&a-u&&~tMhJW|Fm|N+E??d=7oG!Q8P#PN8btU z?ekm3ru6wF+>R4WNqE3vWbmddT+zd|>#eQ865G|9^IRruln_YCx%cU|fJ@(p0A?0T zk?TMCl}|*laTuB9|IFo3a<5py*d){S`cJ!HicWK^b7%XWX9d(=Va{lBf&O*|?e zKYX~LbmHRva{20}t@oZiI4ItFsL!H-FM!(UvetHeScq9lUsT2C(r$6i_5V~%DWX-*Xg$^bn9&VEWz=}XZzxE zqX~UG-l(3m+2Q!+b?IMmU^&J!xzVTX(QONmSlXQvC)1n+8hoZ5hyj*yF*b|Ve>oZO zL6BR)Sk2(N&mD#0j}O=ykDG9QaQpHBq=TCC!Sf2?tVWOTc%LuXZF|r5 z{-OUBUuMZ~oObUBw;Z42F{j&qJ50-D?rj5BRc};7e*fkOn!S9lbkhyxfA_gbDah(s zC4al!Tc-Bm_~qiC^|uzB3kkG;`dvYkeK9*{2(We()x4B^lSLpUa*NCwB}SH&9uwtG zt2HQ`Ui36U6j)ojc72I3V`PaG(`8@n!QiMBwB-0EPK6VjGAtupnK*(bD%no+WpJG4 zditQ2kik(V2Dm^e1+MDc}9WM~Rm;?bWf>@XqqV$p^!7J(&7u2nj-8Jcvur!|KT dVypi!v*#%)Pc&c+1U6t8JYD@<);T3K0RU$myuSbd diff --git a/res/img/btn/btn_setting.png b/res/img/btn/btn_setting.png index 8441b33dba9ef8fbee60b3346a899ff38de6c7ed..7727e69732ebe52c49b5569c3cfa6c6b0f9ee5a7 100644 GIT binary patch literal 928 zcmV;R17G}!P)f%I=~ZkA<0lm;*!kEy)-^77KWySq!MY&xAbw%hF=JjMXf`7Z#V zs0BBl!`ii4C5nDQL4vimRfPTD@qVtrxOcPJw2qIDTf5!vQNg<4ydI!(Y^1;}#&~{| z!wkVa;{9NSnb5=pNH00(+W@^P1Rz#YIX#e)3JSmACz9t`h-?79z@AG{vc|a?Wc;d2c$aDqwPw54arWaC*ket_QwKINyet!M| zmdByJQn>EjuzCTAyBLO+i-7K*P&qB+)v>v&x$bkNGM%Y=dwV-m5XJ*s8n~r8 zBcZsKWtK%~4MBYf(&CfK(^%qL&;4cyyvH5#1z}@t;k802IvR=$fTjsH#BhDzS2|5T z?^QK1fMwcCUI9qY(!<#v3xLFn;G$19hW6Qnz*maX>{0ow(KmubEVjj%mPp3Koa7HZ(R&x7jz5O67lcr znZ0?y3=$13Fh#`j0nm~zE%^yXBuGV)FE8()9 z)}jSv2M5(60BLUfDxV$A@qKQ~FD)zrALM{9ZLpTBj%M^yVn((3@N^^Rr2*Ttl%Fj{t}zEV*XpBkY?1 z=s_tejgym;*k_dh6 z+cnecc0wlf)W_@kcwLjV5>~(8Z@<00on=`z-E1~(s9ZlkKVQXEd%fNe`eVaW9Z*%h3ObdO-)-`}VBe~ur)RttdEcq{;XS?9|I((QKpIMGc2AQxji zHCKtBM&?Xq#d!|>v2k8te*!>743G;1k@x`xbx5PvkB^Tl8aX*RVd#1C*vj|!_eVuh zl#C|iZlHUl(E*T7G7t&#FDk&u)!yFTf`+XDMhyR%iXmi}3P$T1>Ed%|S>Q-t=jG*P z9m>?D=9MQQ5JY0;oIYtAk-3229KRAk50fK8K`7th!MyJjWs>JW$k@sOHs;h`V@qu|tOpO+* z%aEGt6h^k7w>84**X!Fmh2?@6_5n;eV1rECS`1n}sJr*5|3}3XoiK?y}!gmryrj)5zp%y3M6%YktZ_B2l zO95oY07iKbyUkOE=SGHX0%NG(<(4`iIx4!H(F8!>r(6yHJv=jwu`Az#G~M#0;dxWn z#t}Z?H&66)!gdS_^)P8vr1J>36zHB2zel8y`30y`+)jopwF_9%!BFU64T=~f1EG?9 zK;2oQqZ1l6d*qILK{7S_kB6S;-<2%eq=>1Y#=x oLdL<8tmsW&1~@sR5rEqN1BBRvUsd>#vH$=807*qoM6N<$f)Q7|^#A|> diff --git a/res/img/btn/btn_update.png b/res/img/btn/btn_update.png index 1f08cd4caedfb55b71126c43f7aacdf583a72e53..d96ec8b5d35ab07b78891a019b3c510378380619 100644 GIT binary patch delta 711 zcmV;&0yzEf1>XgbB!8w!L_t(oN6lBujT%7^<$oS$z-9mu7&2H#uuBH!0EpAdCj=a3 zH-g0xcpZT!18)YN3_M39etr*CqoUO_-3*p-OC#pfRrTuCr;BRk#;bZ``;}4v;y8}h z>vdGG*Q4ET7r}{iI-RCvoCyXXMmsPX!%!O+4cjZJR;$T&yMO%}3g`r2u~>AP&1O0r z4l`Tpd_KR2;@2FbPRFtTc{CageXN`Sh>@r9c-%EY^m?<|(D1#bh#*NhFET+!c-iY6 zF9y)bUpG+mRsej%a{__B82^Fij*?6chr{<)tFcIj`u>Cv`HUk8}^(Gz};~5Np znM@|nd7kL^2!H1zo}UyeDZ<-zfzAV<^<~KPZfH_jKz=F)kIdQ*_y82r=VL>{NDyt= zy8?)Tmh%Cqfcj6Mo*^lFEjL`Eu518Ent$l6)Rv0LARR?70fe9Yz_HqN@E~{;3sM$N$F&YvQ2?YVz zIgt-Qa({tBJuy-$A#(;AgS!}jLzpAgi%A@x_d-2KIpcYX`vljc$QA?OCZUg2q1PL# z;{|0zWoJuG%^b;$A?`^b(`V@+F%7eR01^tGWeUNL)O zGpH2nfr32CdsUW%ctl8Dm2uw zqA1G!e*dd!nkUU5WKQut$Gw%C%NzcIZ1=R+BnDu34yP|rrhkL(0)TrMeJ}t@$kn;9 zV(n?QTHWgPK>*y*Y&Ls@v$BW0D3&mGZ2%DHZ+EATbIN4_(770kyB1p40Mz3B6%4Em zfOF{lnF2P*xBwV$an6{BtA*oR>(l@s=r@OfEp*SI%iKsV7r;}hU-f;`@@v5BSD?=etS6_aQ#Mw;DjN2MNh zIS|l)hjS)qm+jgfKDS`uBn!aq9*8gDyv;fDeus@aU7ng1VI*N8VF0mzfzzw7d+eh6 zi1VDRv73}{0swTegu2Z4;&mt(uy7@fj3$yWSO82Qwtrj#s6b_Ns8g*cJtdYW@*w(+ zFIGtEcJoC5lJbP@laSaNKvw80Kp?#PUm00L;0{XEW-F>cavtQ}4557s$s zaFF5Ik{oP90}106LJ=|O8ul1q$zhDUGh-a7r}JK8%Z_A-9cRIKmMa>2C!|cwB^>{R z&O9WX=x`dMPBOl^Wf*>R=+g}J0OY{3l*h(6FHs4*Y|kZ_cS>>wfX=cT^V!v}Jo(-_(=b63M2iXP6*4?XCrwe4{xKOVx6iEq2k;lbg}X3w6Q(i%0000< KMNUMnLSTZ(NnNM_ diff --git a/res/img/btn/net_error.png b/res/img/btn/net_error.png index 20e5d658b041d4460c2f38368b7babc4015bbf24..67b77bd1cab951d36f2a8b6f18b5df822f27977e 100644 GIT binary patch delta 694 zcmV;n0!jUW2h9bLBYy&vNkljB5QY)2GtK}q*o|Ou1jZSd2-Z3P#mUx* z0uFKpmLsqofyrQRq7#O*taJ@$Wx3k&oO*c*pAe{ffguctT?|T!( z3BXrIu7UfhF2@PLdcEeFKl(;ib6f_1D|t=@V6j;ATdfvTU&yPbefMw#7or}Xijfrn z$c;tEia+O7$$vr#;8A#NHk1_$(^Q-s!)m8;Y+0l<6GmAAESJj>I@zlw^l}n1^;ZXR zI2^9$^Z7;u^Uq={0l-)VxCcONnN(IV00^q~he~QOhPA{Fs=LauWd=Ofe*;S)qU@ni z37|`Hg7;Cg*jHWayHZ(@B zJ;-3}<9}o_$stbw_`ubWVBiVIw0E{#IRoPO_FE{)v=3CG*8+&h*b_``RQ6jya5?DI zwgF{;8>>e%+mXyzkjmP7{Z-Ea#w93Th@&`*%_kE!2o_stI-)zj3tTnf2%jG+k?BON ztpS}ukqx7+HFLP$QMcPo3b~m;of(iPQetAO z&Jmc4z+40-1Fr-~{6Pk{pGY8aRio)u@9b-^EZNd%&2H~>b#--5Z?*Epf7LJcU%3fD zuh$Ez)#^8Z9$~ex+BSeAu3X{udi}fG?Lyzcya4q3eL7rV1%I9!6UZ}wEX(W*0R%zN zx?C)0Mw`;W;*?7SHsbzn|4o>BbAM zaK?@4cn*ilFbt!zsPOI&*nC&-j`Pxz3Bcz1%|^0rG#V2h$1X6W?p3ij-fp*R*Cqv^ z+wHdN_4*spV}Jd||MQPH7e@%@1^X~95z;Yq(~$xI)Qo(D6-Q1`cXxM@FA!?S2*9RG zm_QnjNJU4pkN_|k3?5-b+9J^2;RcEk-W!*J5aD8<0Gb)np7$WscgyNzv)QZ!L;`?{ z{ulB!r;*)|tWcC;5eTPh5*2_{OaXuu6=CoD6aXu{cYhtd82NxGa<24nAPdk!N3;+# zz|z6P1%(HSe!6Nc0^#GF`ys^(q=qFLGaLgDp#VT4M;b^L2tHTMs<81WjjfS}G2hh; z7ZFTv^Lig3bnj6!1X{D!=zFH5<7B z;8UVBgnyqauSkIjUTc6A5O}6Q4k$TxOG}i_*i!)Xpc|3~U^<|O2xI4@ogETauRdXq zb=rntVCXXN#PR^TB}6!L^IueIK7GQ{Z+z%dj~U2Ps3W>W!Yz%usiGsb&;8Hq=$4MsVF6Hd*H zn&Kie{9ag*9e%Ks9cZN*C=K(I3~plJlYAz&`41ngs6S;74&DF&002ovPDHLkV1mo6 BntcEO diff --git a/res/img/btn/net_ok.png b/res/img/btn/net_ok.png index 7978ea1eefb1423e4443843d8ed4918911f76e99..756b3566811be772057d5927744b6606958b7a6f 100644 GIT binary patch delta 845 zcmV-T1G4<~2IK~iB!4SOL_t(oN5xl5j@m#F9W=n2xdGe&P7pXj-~=LQW8F5N;4J5#PLLRkzyhw%wqSuw)_Qs_Iv-zAil6`6}G`{D-RmOsCWO z<#K5j3Wcu#UXhzVY;lM9e{(z@m&4(Z&t8`ofbn?Te0+SI!+&Dkup07Ed9GTgt?|6< z_xp=H6qx|#^LgcPIDChZwit>GmrA8o5CrOQeFhkM!2{XR@{sMgWR+4X0MZSiAGqmV z2ywp2`5|blA(42lyhMB3S%bd$!ND? z#;1xqHag8F!y#2H7DslND1&v3EWWau>}DmcIGQtNrKJs{L?aOp%oDYiZ2=})P`D== z|8H=3$MoLPjfL1Xj#bND0BP5bwKSw}!j$=X1AidPa=E;)*+G7>#gm!raZGC_-SDIZ zPu8x4V_pyha)We-X#>g_@y;3IT*-{lNqY6*xHj{R_Dws^oicAJ)q5el9Qp419PP-D zXO)my3$4#uZYJIWEc|x$35IUB+tm@0XUK3Z=R&&%@NO1xuMZQcZB9bQU0qw2lpLhK zl1BK;D@w?;iD-t>3xHB!ZlDKzk+O@D5H~+i2!x+zYrOlJ_6^|5p{oE~n}j~{cL(qv XM}`VN;i!b|00000NkvXXu0mjfxa*3P delta 863 zcmV-l1EBom2KEM!B!4|gL_t(oN3B=OZW=KZWq3#|$sbI2AV7sL2yDB8KY&e_Rq_R- zUjVGS4E=&6Ur@U0G9v*JyYL5{J+GW&*(1mEuxHwlEC!E#@42tzYp>+^^m@I<>2&I0 z`7Oo(qk-Ye?FalGJkL8^uh*CDcDr^ITk>oRsrY<8&medrm4Di{i0=TiI3AD7{eDky zsZT0^6vY7quW2Pl2w)*4S1Of8xm@-!_Zfdj81z&GWV6}ary)oLAl>~ag>f&H-tTt1 zz{UJ-w>!FAE^~lYAquM1>M#fb0a$-x0NU*~(Lc$}p;WwbQEaY(tUJh=%X!Kgnnrv8 zAT9qTT^Jzg#(%aL+JG4{LwMqo?uiJ1?sgzO)M~YUlFMuglfFyYZ}`T_2~Z{dC`Z&w zr_-6?{Q-k<8s{k`7f=i>!tpBCK0y9=z6%fN2xZI{E<*FJfsq63VTeP7x6kkj0LuFR z?Rq95#INTGyOinSm%4=ED`hPT|n$4z0f?Be0#s%e1!1#X$<@5RCIFU3 zFDd?v7kGZgWU+yARjyUtUxwXN@jw!eacDg2iWE3zGQ2ZP1Cd903;;G02^nf=l8+=0 z)-As$f`7=X+yGG0L%`E6MnG90iYO-lRf^;t0-%M1ECx&hQB*krXp9(;2SiC=KC=vU z5VH01nM6g7YjsSEGSo_<1ctiFIsqk!KTur9I6}bJBFw40&cs(|fk;FbDsHt}Ur?Ga zSpNe_`^{FK=6CH>6wIs6f=8g4(52*On^2yfMSpt*GvxYlOfQsNykG;E_FZeyqV_E6 zh_tLGh`wtB>I%lFq>l}W5~49*)G)Xz$XaLintF#EYf5pMc-1=MSQncYkkR7D3`=aw z0YK63Kjj46K9OxXsXWB{)I4vpE+(oyr_llOV(D7*GTv-*dCZIbX)S){-O#vL2uWlw z{8;=Z8$#%zUayA;o1bzuV~4#!%$I3p>vTDV0$#Jo6Rr;x)9R`1Vq*oMYb0&s|1G@0 p2FBNtmGPxgUeSMoDc7z<^$x`(hBn`a=`;WU002ovPDHLkV1hpcmtFt> diff --git a/res/img/btn/net_wait.png b/res/img/btn/net_wait.png index d019eaddc5ef459e26e6894ebed7482958824ddb..d55eebfe4fac91437ebd16535aecf67e883640ba 100644 GIT binary patch delta 803 zcmV+;1Kj+k1-S;0BYy(`Nkls?j^OyhT_j6YR2*dEl zX0!Rq=kxP!w;NpRNG1SyEC_-~KQbH+8-+sQ3umQL=|SH^9)IUn#|6?0U_2hTN%4a` zeb=6jMx!S>`wgSJ-L5tm43_xKk->T6a5%L3{r=~<=y(B4CX-h(^oxzud%fNQztaHF z`3nIHA#)c1?9o34up|JrGyp97m+p~*ImtGC-0(&K1|$t^tV4!pt_V=HLh|~B)6%50 z%r6E2azV)|6MqPJR;9m)06eJ3EQy45stDYHl<epaw*nF^k7XGE)}8xMWk1U9-lpty;lZ*QZYvWq_#;IK;jSV-)^^47-WDs zA)*a0fvi?4l?dP%FvytLvXP1HyK_C4U_dpA$Exu98e8Ax8rqw2^lS ztM75#t75nW*k z0P^&M!)@&(&F2yjrYTv~q)ascsdFoQ5dlTnbWlG4NT9n}$^Cx6xFrozy4tQTV=oD_ z5XqGq-G39#rOsD|h)6uyE-6FZ2kaO>TLp6I=wet#nrR)-#eSL%GC^?-{lLxvT%1I} zQ4MqQ{tcz$+jQVL$wsPeKby)r8PTp;Ajl)##gJ24!Qw%shmCGf1OU32hRNc>(L{+? zSvT39(jtJd`B*F#r^dMSiMTCe=untZx-lUBUw^CsI9;^o5(v3PN@{K!N?D@2cBvNb>^*#%qxpl27Cn*nI=i4y^h)OUU;SzaUpHdoYavrBZ1-j?+CJ zkDcXm>0JXp761af2>gnGO$w?2rgs5QS&tB`pab3oKxQqnoqqvhV^aWX(c1T7v6w}v zWGz9pTK$2s8|5Hs9WdkFZZ}!2Rz_eefRg?#DnQ(IfVAfG`KNq8v^1BmQ5C_$ZN9%$M125kn-S{Lqwi>tC)?0S63q0jD)ld|>3=>r0{~(17WLOaDEILUK!zVA>*=29);ffD49E0KgkDY!HP( z(X_OckIo0CaxiI)qgVxLB$;?@mU!4nExD6epKSrs(4Z%W5vNSr4{>a%2jF+cRXRJ4 zc`1|<9)F16rJ*c^1kko7HMp(uK45W{x+lYq@30#YT|($W(M}!t-!M3Qq_0@la;3;K zGARKlxE%{;CH!r=L(&D7W{dIvh*$t|6fl&Hx_u~bSE&?80T7yXWD~{-DBq!@Hk-}T pwQCZU^-TcMK$FeYdLS*pA9}r_Fe3XgvH$=800>D%PDHLkV1hOtCsetFixedSize(35, 35); + QPushButton *btn=new QPushButton(this); btn->setAutoFillBackground(true); btn->setFlat(true); btn->setObjectName(m_btn_obj_str[i]); @@ -53,7 +52,7 @@ void sui_title::connect_slots() { for (auto btn : m_btn_vectors) { - connect(btn, SIGNAL(clicked(bool)), this, SLOT(on_clicked())); + connect(btn, SIGNAL(clicked(bool)), this, SLOT(slots_on_clicked())); } } void sui_title::btn_ico_menu() @@ -236,7 +235,7 @@ void sui_title::mouseDoubleClickEvent(QMouseEvent *event) emit m_btn_vectors[2]->clicked(); } // 进行最小化、最大化/还原、关闭操作 -void sui_title::on_clicked() +void sui_title::slots_on_clicked() { if (sender()->objectName() == "btn_opt") { @@ -249,6 +248,7 @@ void sui_title::on_clicked() else if (sender()->objectName() == "btn_max") { window()->isFullScreen() ? window()->showNormal() : window()->showFullScreen(); + up_maximize(); } else if (sender()->objectName() == "btn_close") { @@ -284,13 +284,14 @@ void sui_title::up_maximize() // 设置按钮的属性名为"maximizeProperty" m_btn_vectors[2]->setProperty("maximizeProperty", tr("maximize")); } - m_btn_vectors[2]->setStyle(QApplication::style()); + m_btn_vectors[2]->style()->unpolish(m_btn_vectors[2]); + m_btn_vectors[2]->style()->polish(m_btn_vectors[2]); } } void sui_title::set_type(QD_TYPE _type) { m_type = _type; - if (m_type) + if (m_type==QD_TYPE::QD_EXIT) { // 启动系统主题监听线程 m_style = new sui_sys_style(); @@ -303,7 +304,7 @@ void sui_title::set_type(QD_TYPE _type) } else { - disconnect(m_btn_vectors[0], SIGNAL(clicked(bool)), this, SLOT(btn_ico_menu())); + disconnect(m_btn_vectors[0], SIGNAL(clicked(bool)), this, SLOT(slots_on_clicked())); } } void sui_title::set_title(QString str) diff --git a/src/sui_title.h b/src/sui_title.h index c436ed3..648145b 100644 --- a/src/sui_title.h +++ b/src/sui_title.h @@ -40,9 +40,6 @@ public: protected: //双击标题栏进行界面的最大化/还原 void mouseDoubleClickEvent(QMouseEvent *event); -private slots: - //进行最小化、最大化/还原、关闭操作 - void on_clicked(); private: //最大化/还原 void up_maximize(); @@ -63,6 +60,7 @@ private: QStringList m_btn_obj_str={"btn_opt","btn_min","btn_max","btn_close"}; QStringList m_btn_tips_str={"功能","最小化","最大化","关闭"}; public slots: + void slots_on_clicked(); void slots_set_style_change(); void slots_set_font_change(); void slots_style_system(); diff --git a/src/xsteam_ui.cpp b/src/xsteam_ui.cpp index ec81ee2..2967ba2 100644 --- a/src/xsteam_ui.cpp +++ b/src/xsteam_ui.cpp @@ -163,19 +163,15 @@ void xsteam_ui::xsteam_init_foot_layout() state_tips_txt->setAlignment(Qt::AlignCenter); btn_xs_download = new QPushButton(); - btn_xs_download->setMaximumSize(25, 25); btn_xs_download->setObjectName(tr("BTN_DOWNLOAD")); btn_xs_sets = new QPushButton(); - btn_xs_sets->setMaximumSize(25, 25); btn_xs_sets->setObjectName(tr("BTN_SETS")); btn_xs_update = new QPushButton(); - btn_xs_update->setMaximumSize(25, 25); btn_xs_update->setObjectName(tr("BTN_UPDATE")); btn_xs_about = new QPushButton(); - btn_xs_about->setMaximumSize(25, 25); btn_xs_about->setObjectName(tr("BTN_ABOUT")); foot_status_data_layout->addWidget(version_tips);