From 7afc241ff2982b763de630983865de1715a1e9a3 Mon Sep 17 00:00:00 2001
From: chenlelin <chenlelin@kylinos.cn>
Date: Tue, 21 Jul 2020 16:28:46 +0800
Subject: [PATCH] Change the style of setting button at left-down of mainwindow

---
 nmqrc.qrc          |   2 +-
 res/x/setup.png    | Bin 444 -> 2152 bytes
 src/mainwindow.cpp |  16 ++++++++--------
 src/mainwindow.ui  |  42 ++++++++++++++----------------------------
 4 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/nmqrc.qrc b/nmqrc.qrc
index 69c4041d..b3a79529 100644
--- a/nmqrc.qrc
+++ b/nmqrc.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>res/x/setup.png</file>
         <file>res/s/conning-b/1.png</file>
         <file>res/s/conning-b/2.png</file>
         <file>res/s/conning-b/3.png</file>
@@ -78,5 +77,6 @@
         <file>res/s/conning-s/10.png</file>
         <file>res/s/conning-s/11.png</file>
         <file>res/s/conning-s/12.png</file>
+        <file>res/x/setup.png</file>
     </qresource>
 </RCC>
diff --git a/res/x/setup.png b/res/x/setup.png
index 718e9f6ef4e1975539751b8b34173f077d0663a5..fe242f89ca8be8b54c604ea34999ae85660e2072 100644
GIT binary patch
literal 2152
zcmV-u2$%PXP)<h;3K|Lk000e1NJLTq000vJ000vR1^@s6a!@wR000CadQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cvg;@e{AU%j1SAj=%fVo(W(TwUY1xiX9_NwV
zldq{Uu|)(HqFW#w)_?w<;V)bqOAJ}mN-ZVg$~9MRs94;ux;-i8?YaL+M;qPh!`Z-4
zdHwjW?dad2myZ`NW6*M|4|cS$9fs&Myj{sh_WHPX5_;bCln+C7-7BS<Uc0&+hWgQQ
zbLF`6>DDg%f4EU7P#S`P67!lc>+NZ~2Wh_>ZpD)mp&zA!IwcJdDP4>KkelgUWQ^AU
z-GF?lg?seR+8y}Z4t=`AvK$zp@@WIfo&JM%z8*N89`S7hASw^jIqo@!&AINgYq<c?
zazxYyHeJl1;{wRj_F6$v+=9AprJ`7Dv4ipvdt6XDRbsF*17#Z2XwtgLP8}|0URfcT
zJIHaJCFROJIZxROP1aP?NCy5ouK}Fp#HTN`ja#?zIvGYDgsx05MtJ4R625DErGz=V
zLqyR|tl$@WT*D1#&Y$Q7LTDbm$p-MH9Q4Pl_(7<GLD^t7Ot8geH?atP#8%pPPUt6)
z`x2s{<1he-Ft)%MN?;%sN<xLAGAj{qG!WF_Ij77E7$6ZIaFTOMg@dxOkBxVfw!SP}
z*wxsZK!jj5DY&VrfvlVb@uS%gLrs!o5h<c#L8`QpN-k1L(c+t2)1+BNi>jJdZI&#X
zSTQxTYOQij*aM}Os?}<(t#N1=sKHi4{|3#%OIq?GOIdWWr7o=_e0uKEOV@6__BME=
zfo)=xp~FTUZKbecr&#kUYgu)*wXSU<)@GV{$}Cf-%{tr3+QI5Wd4V-LSmTW;@24kg
z&<53u3G(ekoHH=SnZUR@0|;n#&Z1Gy?94f5u`(8gFq{<UCJb`MKw(~qWzxyr2XjyH
z7Q~+7jelY;ICbw}E`Yj6-acV%c%JJUWBV#}Ok=|8L!ZVLaL0(pF0H^Xn}ud+o>kWw
zeG=9zQ=gP)^9<<S?`8O^;S&jq#VZa2rpd$8qu}Q<Tq>vJ0<^Ead`^Z}UwD*pFmh_}
zs%#F$_!}8se8I{NSGjjD{Aym*WPnaeeIP*sU!{sr%o9<8;H_<$+I0YO?&Bvf+4so|
zu-^gDjiFwwBN<jMM&$eNnnzln3NYIu`-O=7V?!Rwb;DM+RsEf<@CIl8H}sz~bO|9U
zPnrr34J}pd(KtXh96*r)k+_nvXJ0JxZ7VnJYfW<*vx#_aT5!0<x5y$$V98g$(lWU%
zILERd*{u7QfR3kDZHRAL{;wITHR1f=hl+fkG#<0avywOKr^WEy8x=iqQb?Yk-@5tN
zEMHm-Hww=Y@@Lr~{5C!QXef6-xFC_>%<UT_jqfvgczVdpuvFvp9Ty)$OCC+H*a?@4
zPMm@8Egt>_U^}p<C2G|+0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ>8^J
z3RVzt$WWauh>AFB6^c+H)C#RSm|XfHG-*guTpR`0f`cE6RR<SmT^(EnLGS~_$<ayC
zMN0f%QfLw5!Ery{-Fw`<1B7~+X;#M=py{@mPA0@`Zbb~eB7}Z~(TljuEMr!ZQt%yL
z_XzOyF3z+3&;2>N)x5=kfJi*U4AUlFC!X504bJ<-QC5;w;&b9rlP*a7$aTfzH_k<u
z1)do-GwC_vD6v><W2KE*$<&A^iDRm!Q@)V(SmnIMSu0mr^Pc>Lk-WaV#C4iONMZqt
zkRU=q6&onSMx0ii6botEPx$x;UB5&wg<Kn8<d{bV8f4cG{s+IiwF(pCUQ#3hbiO#w
z$1o7u1sXNS`95}>#t9I72Cnp$zfuRLKS{5(wAc~QvkhEaw=`uBxZD8-o($QPT`5RY
zC=`JAGy0|+(02=Tt$MvR_i_3FWT>mu4RCM>j1(z*&F9_W_TK(I)9mjDTyk=r;*cus
z00006VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru<OdZ9
z5g$Y(_tXFY0y#-UK~y-)b(CFb&T$mSKmX@hwzg$kN|b17Udo-7cuI|;Mw&Y=t+d))
z;c95PaYIuUa)A^VrWUP{<Yg%@dE3~<q;Th@FtuT6&&S2iQ~&;Z{OZ^Lyr1(w-*bMb
zl<xHObcwD|x2c_Jz1pP~)G9S!EEdx`$QYxpRxhh>)K_YUTC1K=ht&~vv`nJeV3`aj
z)oVeoQtzp+)thQv$XnF$Y_JNIBuPk}7r?Ke$AN=D8*mQz8S*jUPui(eSzc{dKdJ-j
zWA#*--$!L?Y6^9+v!_ozt+uK8M6Cp_1DAkLzy{zgFaR_GM}Y;vH=q}I4pad<fk|Ky
za0FP1x<(x<Q$>gRL+w`AM)hAqp6&IpT0lLl4#hZ>l#LOnIg_AP{i1Hl$cNM()N1vH
zI;buQWv|*3bdqswSFZ$J9ky51#*)Fp0N_CIcVlSFfv{G+9rPjfsoJ2D3uN~KPk{d5
z9|2o}PBP!E0S3VR0AXKgK6V5E%Tw9w)yXnFYmQzvrDV(0hiVsUYfN|+p>^tS^?ca$
zM4%3piHV7Hk`c9#sPlkZz%cL<r~&Q(-+_8yKTrThfj;0v%vl5Q7g!H;11+dIb)$Mg
zJ)=HT&;D-%;_i+O7>OP2QuEBr%w!FBsmD_MQgu&^L8%Sfvny9D7RlvuIWngPs0_Le
zI3CM>5ttv3!U~`^?UW=5b0PunfY#{YAn+d8415m$L5x!W9M5#A@yoe*Nej`7v`uFq
eTdC%<E&2zDtWm5zQ87mV0000<MNUMnLSTa9aP>d{

literal 444
zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0004lNkl<ZIE{@}
zQIW(T41ITV0+3J%m4JjwsDw(Wgq47VmB2Z`!6Bgz-hJ%L!ZN^aW-^on9+~7N1xZZQ
zlRP^1gXB89J8~=}1IbHTg9nmX_B?oa2pmb?NjgPl;7RIqZsS8f2ELIztG$8Opr&2m
z9~4;tWPM+Fl>}gwz4dkFTk8(s4*&r~?OVwc&?vpz-7k{n2wE3Km#Y1#)gHLX4*<S;
zVAWY?47fVE1Ib;!AnJML{*td(pG<Ov4yFO+MgUe!-|;1qClqN*BYQ9mq8j;wa8@()
zz@vCN>&n;xbtIpxxT<2*;sz{e#RJ$xfCqD`hG<i9@X>vvh(nVK%lnP$yiJC7sJKb-
zj4ey2;F;uMxf;>UqKE?9SccPxZWqb5ZjhwTF^N^4cjeIR0j2$G*#R5?o~*D6n`XWa
zp&2t;Iam#$h}YIUJJC4wXT@)G7eE<8@5G^`;3Js<yK0Rnqcc@LKfFE2-KIR78ebjD
mugSFAo$rdXa{M#(v%CK>nG!~UgYQ@X0000<MNUMnLSTZ@LC1Ok

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0c233dc6..7752eca3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -207,9 +207,9 @@ void MainWindow::editQssString()
     btnBgOnQss = "QLabel{min-width: 48px; min-height: 22px;max-width:48px; max-height: 22px;border-radius: 10px; background-color:rgba(61,107,229,1);}";
     btnBgHoverQss = "QLabel{border-radius: 4px; background-color:rgba(255,255,255,0.12)}";
     btnBgLeaveQss = "QLabel{border-radius: 4px; background-color:rgba(255,255,255,0)}";
-    leftBtnQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0.12);}"
-                 "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.2);}"
-                 "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.08);}";
+    leftBtnQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0);}"
+                 "QPushButton:Hover{border:0px solid rgba(255,255,255,0.2);border-radius:4px;background-color:rgba(255,255,255,0.12);}"
+                 "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0.12);}";
     funcBtnQss = "QPushButton{border:0px;border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(107,142,235,0.97);font-size:14px;}"
                  "QPushButton:Hover{border:0px;border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(151,175,241,0.97);font-size:14px;}"
                  "QPushButton:Pressed{border-radius:4px;background-color:rgba(255,255,255,0);color:rgba(61,107,229,0.97);font-size:14px;}";
@@ -378,9 +378,9 @@ void MainWindow::createLeftAreaUI()
     ui->btnAdvConf->setFocusPolicy(Qt::NoFocus);
     QString txtAdvanced(tr("Advanced"));
     ui->btnAdvConf->setToolTip(txtAdvanced);
-    ui->lbBtnConfImg->setStyleSheet("QLabel{background-image:url(:/res/x/setup.png);}");
-    ui->lbBtnConfBG->hide();
-    ui->lbBtnConfBG->setStyleSheet(btnOffQss);
+    //ui->lbBtnConfImg->setStyleSheet("QLabel{background-image:url(:/res/x/setup.png);}");
+    ui->btnConfImg->setStyleSheet("QPushButton{background-image:url(:/res/x/setup.png);}");
+    //ui->btnConfImg->setIcon(QIcon::fromTheme("settings-app-symbolic.svg", QIcon(":/res/x/setup.png")) );
 }
 
 // 初始化有线网列表
@@ -1755,12 +1755,12 @@ void MainWindow::on_btnAdvConf_clicked()
 
 void MainWindow::on_btnAdvConf_pressed()
 {
-    ui->lbBtnConfBG->setStyleSheet(btnOnQss);
+    //ui->lbBtnConfBG->setStyleSheet(btnOnQss);
 }
 
 void MainWindow::on_btnAdvConf_released()
 {
-    ui->lbBtnConfBG->setStyleSheet(btnOffQss);
+    //ui->lbBtnConfBG->setStyleSheet(btnOffQss);
 }
 
 void MainWindow::on_btnFlyMode_clicked()
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 560d4b6d..c9492a52 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -66,32 +66,6 @@
      <string/>
     </property>
    </widget>
-   <widget class="QLabel" name="lbBtnConfBG">
-    <property name="geometry">
-     <rect>
-      <x>2</x>
-      <y>490</y>
-      <width>37</width>
-      <height>37</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="lbBtnConfImg">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>498</y>
-      <width>22</width>
-      <height>22</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
    <widget class="QPushButton" name="btnAdvConf">
     <property name="geometry">
      <rect>
@@ -303,6 +277,20 @@
      <enum>Qt::Vertical</enum>
     </property>
    </widget>
+   <widget class="QPushButton" name="btnConfImg">
+    <property name="geometry">
+     <rect>
+      <x>11</x>
+      <y>499</y>
+      <width>19</width>
+      <height>19</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
+   <zorder>btnConfImg</zorder>
    <zorder>lbFlyBG</zorder>
    <zorder>lbHotBG</zorder>
    <zorder>lbFlyImg</zorder>
@@ -310,8 +298,6 @@
    <zorder>lbBtnNetBG</zorder>
    <zorder>btnNet</zorder>
    <zorder>lbBtnWifiBG</zorder>
-   <zorder>lbBtnConfBG</zorder>
-   <zorder>lbBtnConfImg</zorder>
    <zorder>btnAdvConf</zorder>
    <zorder>btnHotspot</zorder>
    <zorder>btnFlyMode</zorder>