From 6b4a9d9cd9e47ec40b5da6c93a28d3669ceddd4f Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 10 Aug 2015 10:50:57 +0200 Subject: [PATCH] Settings dialog: improve layout a bit --- client.qrc | 3 +++ resources/account.png | Bin 2777 -> 1439 bytes resources/account@2x.png | Bin 0 -> 2777 bytes resources/activity.png | Bin 1993 -> 1129 bytes resources/activity@2x.png | Bin 0 -> 1993 bytes resources/network.png | Bin 1459 -> 879 bytes resources/network@2x.png | Bin 0 -> 2556 bytes resources/settings.png | Bin 3677 -> 1950 bytes resources/settings@2x.png | Bin 0 -> 3677 bytes src/gui/settingsdialog.cpp | 37 +++++++++++++++++++++++++++---------- 10 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 resources/account@2x.png create mode 100644 resources/activity@2x.png create mode 100644 resources/network@2x.png create mode 100644 resources/settings@2x.png diff --git a/client.qrc b/client.qrc index 19e1bf1f0..f1116f63b 100644 --- a/client.qrc +++ b/client.qrc @@ -10,8 +10,11 @@ resources/warning.png resources/warning@2x.png resources/settings.png + resources/settings@2x.png resources/activity.png + resources/activity@2x.png resources/network.png + resources/network@2x.png resources/lock-http.png resources/lock-http@2x.png resources/lock-https.png diff --git a/resources/account.png b/resources/account.png index c227f8d776cc3ca292afe2f5d886605fc212ddc0..e2eede81db25c64e702b6a29f782675bb5f67105 100644 GIT binary patch delta 1397 zcmV-*1&aFF6`u1QIiae1y1e%W$xosv z`a)GBXBu4^;CbF_B#)-yP}T2^F>k3Oq0S~j-}j#vk)tG$<`R)Zp69*bN~ej|p*1b``I+{XQYbxzxas=CiMr%P_@L%>z~Z@~VX zWt))XDuBFg-VNNaP3U3{_}ez;CP-R0zTj%@|{w7672CzuM-so~x}^t7@Bb8>|~(Jp-D}=5j8VTLUm)lb7VpMx(K4lM`?= z3F^?$P!+(KW!`yJ?bzf59MuCUjLlr*gsBP zWUY(;{_N7y()BE~W!4-e`Fqk>5m|7lWjiu|YmSoqCuwXJJ;6=vN&`eBvqKA+41rRq zbT5GYN#j-Z$uJBbq2mH0;IKIwhGE_qbHo^PjO0VA+V#VT$REa-^UY@S!ph2ulTw>i z14uFq!-qSa&eJ3xho$1Es&+)=TVu@R!oq^p{-6~DMn*>NQ`KW6p8`-!FYAt2RMp9U zcDsFXd3iZ?ku;S7qobqcD2iSLFp*YBw;;I=;7i~4&&|!v)qCdY#ej0TJht)RkM{b* zwy-fgzV?0p)7jbCuFn>AWk9)HE~@Iws=DJ3ejBK&o~>4^A9r(_B(VXdQfXX7UMG2X z&k{3$s$Pzw=$)kXgGB3qN~IEbp7+XsZhv?HAo-Z@`)^k&mAy&g6RiZ>?e;Syhto;R z6eH{F>n{N~9T%8%C3t^2Jv)NYBteNXKtx=>+pU9SqH~E!GobGb0B}!|prjcvlupZz zAXlkWf|;3_^*aT{8W4tIeqdmrU{6)Aa)pk#AZMg zMMZ}P9-P7$6FU*c8sK?eKaPI@faiJXGk|0bFqtXmE@VY zphOj+N~IFya=9ZUp965vhB`-o=m5B^s*}^x(?2G;q3fdP#Kc5NRi9PWL%U&4U5PyfMEbbxOH$cAQ`A?0ATY{l5JIO0cfc_YKvrxWYZW^ z7m>O#=9)3)S`Y-+E?v6xr_FB&Gx>COH={qdc^2_6pWfr{o^kmC00000NkvXXu0mjf Dr6r(P delta 2746 zcmV;r3Ptsw3)vMRiBL{Q4GJ0x0000DNk~Le0001h0001h2nGNE0K-0E%aI`(3mdNh z02{9XUK)`ckwzzf3RX!(K~#90?VVk099JF1&$+X^cH|_DUE3S#IPunXoUalRHmFfa z+8|IW@c%7hR1kzBNQ(+e(?p7dMC5=MDQ&(Kvq|j4 zt=H?1I&Hyg@7_NTUZW^Y;$6?3xpUX^lPoK-^q;dkXV1NVb7%H{DI$njxhUHLV(bzd zV1*MKV1<*gEg%d?t^u$Mz*Ycl09pa8tNsRncK}S^^!p-!e~HLU_-ez2jXDV=*{zh? zFCx1DYzDwOO9+6=By(Epzl+Fa^D6Dra0Vdx0LeoD9zy*m{chw$BipUqs%vEu>zYGXTleiA3Uu0D5d|xfu~DR4SE!@3}S{IAs8mOe7M|0@!9-%N-al zm&@N4k$KxfYQ?FQz+^J{X+-zr1Hh(4BJnu@zqc)`FWJ_y6eOQmwQ5zT zZ5_4ZOai1*sjmZQv8|&9Qd;Y80C>i>kXmpe0h*ecx&b_DTSp!2O{G!~*cMR>P9#9} zrjBiY8FfMO5di}j5}<5p&`7_}|H2XEOHuoRI`fMhaxxmIr$IU zB5K8%1gP>`+X9w?q%*w%0LKhaEEb0VoFa*c{tOk1#edp(4 z8%iSb6Wb!{#i<@ai>zP2ev{Vv#{imbYgt4@epW0NU$?EJUYtt+02mt^8wT)yEP#q_ zEmdB3@#F)J8UO&s$H#LdUx4K=UWmw2&&W0AI6lY?9YYrP6n& zr>7(T?BAVmHUSnX6bdf`c*Vk@Zvgm#%O@XbfCK;*8c3$o>F*%CMpE-y>!-)Z$Ipj! zyuffi0RTWmq);flKr$D`;Q%~;-v}okXb=McfQXa<{3Ync9ss`{8yowZ<(F%WhA{vD zG&eV2K(JQ@(_>>}e+;mG=roi8u3WkDzEWy9z)$~K+pp0y4P}5TfsM^1-wdj@EgH@M zA`;jmMVexYuBzlb@uF8H#=9{gwqD-?(SZr zlzLc19s#f&W_Jr;iW?+T2>l?_kl^@>o8fFWMGU3z0U!h7B9mD5X9@ z@*se2+j{Ci01Q@BVKB=5f+J@DlH9m)FJ8QV80rnD&%$zoszAjwQ7^I4K#29ONoAdSxjrPNP{hK2%LY7WEz{r&yx zE0xMqSXiHr@qviU0{CS3peSLlR!2LUSPN20;o2q5(ge4M* z4y_}*Np?ejL2`|$TE-GUYwhwj@2+9Y0LBu4WQVC*F?WZgu{9QxR{^mBLPBdDy&(Xx z0Yby%9Khrd5YGX^!|UzsZOP~JzFXAA3E(J+M8Zf47)gKw2M%~7+f3Aosf}bZxdsNh zrW;9sLZNUk;>Wu}MMR7&2OCKMrBu7^r;Ar0MhswoY7P*O{~;qH(U}7P=&1J5iwOym zaRRJlA~gqymx04aDHW*%h!=rE##92tLx8(PV+h!}b7wQj)h5Km)I~HBKx-X;`t1;n z%RtZb;zb}kB(m9T%i!RkuNy+X6F@}b1h7P@RPsFx_)dWM63`yiOF>`X8#Hkh5F5Y} zCe{LfOe_So$IHOh@NEF!2@nqf_Aqfjz{DKD*w>U|>O(|)H_S9K2XMAeZUgX^-vTBK zkT*~xW*I1@F8i(Fdk83(%P%IA$*ll3`K=XG7r)Boa@YJ8G14F+o6WX~$hWZ2y*nmY zrT`qt<#K;EQOszEkZd;F3*hru=;$3^8=6CZMC6Q8>gej#t52UidD2)*`aqgQ?b@~L zKBd&-B=-SmxP5j)O^`gNwLUsC zGjnQaXlOprV}*4mFPqJ_0C-3#^`MAsM`LybUoP(gI4>gS5{bm%z`%g-$z82jYZkqK zd-v|PL?W?`Zu4KAu)_Htj9Z3SZV)Ut00000NkvXXu0mh|f=}eu A;Q#;t diff --git a/resources/account@2x.png b/resources/account@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c227f8d776cc3ca292afe2f5d886605fc212ddc0 GIT binary patch literal 2777 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 literal 0 HcmV?d00001 diff --git a/resources/activity.png b/resources/activity.png index 8d4ae9f70eef2d52e0bab0d7a21ee096bb8f9eaf..a05e841c85f02c6e14def6bde8bb4e20edee4248 100644 GIT binary patch delta 1085 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 LNkvXXu0mjf*jaI+ delta 1417 zcmYjRYfzI%6y1>LM@UEvR7j!;sDS7oXr!^#JV-!Lpb?c}B-j9gfD~dB3rNW~kw>&R z!c;AVFhm|hfd+_H(efr#K+8iZ0&Rr^sUuY+$XMRc5B<|0d+)ht?>TpNc4wz?cZd#` zC4mP?mUK%10Ljl+9E4Cl(${)=U)z z#JPsrWDcdDq*AGoyJ!?7owZ2>-QXxXxpckK7y6`b@FF;5NNU56-}i`H+5E-e$m=uP zhRq>oW~T=GU1z>wiFd6H^ML;FExbVd)_Y>~-+j`T*QU^#(xA$}zU>M#f7;yKyg9zO z+uJf0K2)xlRxYiE&9_W1eSPClrjt8tqr>2YV?`+=rO>-_2~JI5ff$u$`){Cwz|Ron zZpjQm4aU9i?7enLom^a8EXCXF6JU-BogERP3yxLggzObiWaH**T4=Yd2kgtV1{@*o zCp&F$b@|iPZQ_ol`FSn0L6L;cC$PBZRVQ>xAKKQ5DzwaXnL-vSYVKL6WI35i%#hH( zCIa4(y{`AqVQ5d*G6vW67nRBi$W8V;@HF7bMF>5B+2|e(8{0#PYlH%$m5-IA&WwVc zxT3dcNvm1J#W;5*VL5bC_2+!D<9Jh3)7ed!iD-CthBfm_c?O8mBPeu9I&RY*gLgEpItiz}BOf zBo;ux6ToGrtABA&H(8v}-K2e-*Vy=D2wrcc-JWKYScU3tTGGUH_I*lRJHI`JCgs5I zlx9?G3QeZnYI?vT$k`#|{*s#R4>?!USBhcd#vLkd}wj zw($iC^^Xg~D#YT(rwm#Bp9j?H(@V@Kk+|`B!ki=(opHV)jAwS_jV9Dz1k8Ux8@>c8 zSs=6IS~PRu_4{F{m+d%upCLj{#=*J9OJ_XWel?>yNtCD4bAz@b>WpV$zyz&F<08uu7g|bt#G|Ii2T{>q^g6%ReJqMGf=+2xZM$8lY7wRCf6?I>`l9;~t{V)vO*bmK;Y zsjjPtJ@f&$Vckj~g*D3vG-a?zwlxjjVRS5g(v|9ALrr`jr9+6F+ij_v?i0~~3C$7g z^eN4|8ljBYp9bU9-jt5L0rDG&5u5sAW;ofILQT|%NVg$-z8w*I_dlSTO}ti=Z%(B{ z9hKK=n_DoGtU2xR^9G&(UFJmCX-x|uBL2Jg{NNw75jo_`*#~#m&GyVL>_6`8;x!LQ zxs30+xB5A|h(BPV_N>1o-;9!w1vMRZDz8jyIo2-xv!YekEXVPl=sO6}4}9`_qWM?C tj~MVVpwz!&;G)r;a<5N8{`h8R`ERFB9XbxbdV&0|z|T8ST;nBE{Rc@xPQw5I diff --git a/resources/network@2x.png b/resources/network@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5190c9a82e9d2058cbcdd803813e424eb22bc413 GIT binary patch literal 2556 zcmai0dpK0<8vkZlv_e=ZmsDh;W0TP%8Qo?GlWR6kDchI|2@&I#$}CY)Zfzy$V)iZ( zU2KOaw@Ib8OQdq?Ce1NI)P&5|m^t67efH@*=Z~|VnP;u<{l4G(d*9#teeYUn9`39; z$_tbM0CSu++Is>(fsYh`DZ$%MQN=;$JQ=@z!YTX&SI;rt%9LmLRyumHYrNvv3+1a) z_D$1d-@=jGAZj{vOdYhcfWZn1aS!Dm^=uZx-z~dAwVgmHH0aI}2T8tC?OXXV$I^-Uc){ z1B4CzDvn46%W-0P*c#a!oIgL4(DqT^HzF>0W3lmBEqL^pE5&g(;_U_=SqLQ7_C&~R zfr-*W`4P;+h(h05R97H!yWIwOX|J z5V#jD?9-rxoLCRMvLJu4?XaF8fyl{{qt=w5oX?6Lze}iwwP>DOGw@ysqv2=`As+oC z>F>5XkB_IfRPyu-Pd=-P=v%0y>vv3>=_1UM{9)R7_wEK7#j#2PDprvW zl#i=1OG#YQ%^t`_Z_6aP9DjSLEof}g$NP;0f78+?6f1P_VB=l@P1DpmdiQND`R}imnVp z5{i{9(nj@@ixmwB3(`-625%fboWnHm`KUm$i;A@FSEx>yEJ^Nbbv7w&FJRQnUTXD1 zMIagJh45PX~V_=IW}!#Bd69_Lf=e#{*EFgfkZbC^B!hU zED{|Jk@?d?EIvB=pU>Nip=9d%>*=bS-*!XE&e(OwJYca{5G*lml$^=Mo?d)e9eG!B z=5T{rYeczxWsgs0W~S`?7t7Y6yGPaKtuwm8-DdKAd--YzNSh6o8iVYfJ}!@_cQ)bj z(BNF{uckb}+yUop5W5|0kp1WA7KQoU2x3JTmbMQXzj+cVf$v7pZywcPsYvnPEI#Ab zKom1BYU2&cRJjRq*$jirJF-4souIy{mHtuH=1=+7V8C3i0$-aa+cS>9b_3>Wf{m`Q z_pq1=;=#UEv~MHWiC%(t_X~J0YX9s@Ul+FG*=*96%3m;RK*DZ{6h4l@ULheDy`;?&-26T>CM_KNZ#MHCp}qtqOAy!o zDKV>>;yu`P%{PnM=tiuNu8?6gV)&|Dao=o<3VAxi4wNiKRNp@pvoL0*J&|lUBDv ziCBV(vDbAYEq3E)pnEnLy2b-_=w<6K5JqSu>3Tz*DI7P{*z0R8=>4zj_Sc)O{2BJ* zftJ(H(qVjrCcFN?P?Z9;I1&aZFtO+ORAxd7dNQVZQ3UG&1~rlrL-ctmR0H4YxDOX- zDx=q@#jJQr+2Kj`^3#IP`8rU&G9$canyT??J>HpwqPZ3@HKtM&JZ-N2THEfC z1<-kzprOk~jzi6W1s}zIo{~8xEvF;L^+?kpMMusFa<2r~t1n&~EYnMdueb5Rc5NsV z4LD9n{}{i_bEuvmGoprCA-YYF)slmS@8+1V!fGyA&1)jX2UG4Nzifho;L_5#}kS zbV6LP0Tg!u+(M>8M?C9TS&K)dfxp1A4LvDp;!$XzWNKpQ$@xTwVCf4@kYBb3P3Ku7 zOiS})@P+6Of}6KO=nNg{yab^$vJ6{cUk>QF8iO`Urk24Tr}tOClq;;}`#KJMp0R;n PYQV|C-Tt~A=g_|ZM150c literal 0 HcmV?d00001 diff --git a/resources/settings.png b/resources/settings.png index d868ea845751ab15ac126b2b762df72c8822cdf5..b7c6b11ddc4ca97c4d9ec8b6b85ddb0948a97de2 100644 GIT binary patch delta 1912 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

G4myWj} zXS_bI8*S6Hg+k#(JRZMUM82WRX2=bh6p@pDY4pa0{vzudcb zZ;xeJkBGm&?_N zKtyES;9m<#4h;?6Me-n4pSfG>^|bK`$kBvCxV6sA82ruu+h=c ztCnRQ1u%7^El?zD4!&pKA$iHr7A=sxRL@G|^XJc>0q`r5?hUrPH9Yu$4`t#;M@O&5 zVzGb2*XIrvNIv_2@y8$69Q@6~*x1-RB>x>>uYr8VkKh9hegs_4J@?$x={U~zVzGEx z$J{mm3=a?gwNmQ14qMmby6%%>V`KlT!`9&7V8piV+ics;o;!C=%fwDC_*#9-yK&!c z-cLNiYY|gDY`XGmm9T9auIn1J-E0K5+)7AeXu1pl_+H+Bc2f~%fEK6eGJsObHT4dl zlrm%3N184JEG;d~qP`ipwGhvCQ_*w+@CH*%Y@~eKkAWJ~G~FWr03wmd$#S{82;g1- z^_GrF0eIiCtcrz~HzU4|1cvxe(>(%0Hby9b7AF)yixUc<#R&z_;)DWdaY6yKIDY|! XiJombDcL{_00000NkvXXu0mjfMP}e& diff --git a/resources/settings@2x.png b/resources/settings@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d868ea845751ab15ac126b2b762df72c8822cdf5 GIT binary patch literal 3677 zcmZ7(c{tQv_cv$^1`U!WVJHg2YtK3~GK7T6I@YmdO@m@Ei5mO%A}LF`R?fDND2y|*#aRb>;=){mu|QZ@ z7{VvO_pZBZ5Ec;_?3K5!Bf>mk$^>O#bMM*Ob0se%^kM_6K#q3^LQ-ggW^?=_16`)8Jbg2ksmb~B_hCzTyoKQVNp ztWkil13J8kO4!~PRGmm-HOR*5o`dhKyf@jb3~oGZvB)zhTs{kuo<=RC1vJBhi5__Y z%~2yssf4o`sxCS3udGxCbb_8-N(Pi7u9=TJo9BT1rXQ^|_4sLsnwR}dOCH7v13-TZ zi>iz(*!vFt3m~oSKfNxWW$H{M77te;ta~Jc-})caTUGphD*cUf)Gi#z@UQpR516Jy zfQkCnlkun&?Ub!_@nhAeXz5x?{hAEO@14Ksu=gLc3LC8paJgi9$v>$~rMI@LLL^uQ zEvnuwdwa`Po~~f-FSIvoATM~3jkVL4XdDT}egH@#R@SwbpLvpc=cVAmY{(KDWjk4c6!l+shE9Ugl8lRo z-KFJDFyvwvw)XJHYjp@>w_8I79?}sBgnHk>&3gbXGVn6axQ_+nO|oZG#re|9EHCXk z4=cfhP6MQS4h{}#jJ=WM%p zN9M$b>P$H~xgH}I8vsKq04Z4(bAV`udIkEkb8~a&;0!1g#1;mSK|xO!q7@Yt%f4^y zvI0>tQ*pN)*?QQJwYp3fF0XYmI6*;z9lC%z*#*zhaS33zjLv@AzqHkZazXvqFpYby z$ARA+K7=5k;KOaTwR~V_{Y)~MJY`fEaz+B$c75GDFmPPYqELZVnlGMiSacFhQGzQs zV#(RXckkY{SAI|rwUiaeM+)KR(^}l`-`~6APse!>@&cMFG8g1T4mm3LV0-_3{c1J) zj@YD(EIY3)IaXXUSO+b4Yz^N|taNBV028HM7_^aKc6N5#kSqEs_$162W#JYwbpDe( zf-v7CIOH9{;pph7!$mcUg)7A~LzzSNanLM|lqfGQo;S!~Bv8#pRk>KGjd5{tuS!X; zjSgbc91%OlFbvLYd0osU|@h9v@02N zhL8&2g%Z1aJiWX$RB=-yBO^Cu1s;L${2ft%7#Q!!%M6=(p00mw`XhOcmDSZlVM4pw z+|b2KKzn=e;^(|3y)5*V`asIDKR~%WA4@Y(&x`zqlj=E3JGpT#Je6RKrVC&}AcvD>L>tvCZiy_(nMq-|M1c(dZbp z`Z-JPU6x`ccd;ds{0BQuzAy z3gXFRm0G%K2}a%J7FT}Y`8J-=dy%iiq*yFX#Z+kpmN=)KoTwJsjYOhm)yi>($Mu~f zxe}hIG`nWtLsR5FA)pz+Xz0qmU>)oo=YFEsp;cd6Z8QdMZf>4N(}{geFP7KW*V$`s zY)Q#2X%6^maX)?Oh-ep#M;)IHf1KP98WyHMG&>vV)0&8Gf-5_$)ovsdJkSnXPZCV* z?ggERx%Ms`zM0q9*r>ld99oHEikofLT>HXBXeb{3Nh0ScRy$Ce+`vI+me{511Tk|G zOwmS-NWb>;KbDp#Eqg!mL@(XPDX;~#&ubP5y3B^o9L_D$O^ria`G8ve^Uh4Eprr zaE^UlwjQ@EXa=El0(9UjtKUqtye{kh%yE8=5(?eM>rVr zmsz0-0c*zraJ5}31d(g`qUf&YV)8+JQQCzMkd(_zuGPh%=eM}CvFAQk6Q(BrXAMAB z7bN?>(7>~oKQGG9&o__2R4*N*QKH@$52+yES62E9brc-pUfk57998{QgBbGwoKL$Y z^l2RVwV!37Ms!cy5CBNLP=8uE-78u-7y1hX^UW|jFD1QmFd1fAu_L!!gYPH&&L{iH4MmS*GokIM=bf%VFy?jbrs|?R@DW&YWmE z>rksmsH8};UiilM?iSDHD?&m-#M6o0IYo`ZuZYh8%R6@WA|eh}KYc>o;PQE8QJJIY zjA5&>U2f{^?95$UT>Q=Yp~8OpMop!y{IL{);`81II(Taqd-pVd{HNvN;p>%L9(B=R z3o|oKX@&FD$pf8eZ zQvjl{Qs9DaKiX@czaMX?>@LBzy0W%*l+IBQGBiDXAeC_doeA^w^!&lkuO|v45Fw-; zvk5RQ$k~}f5w3Mo$-l;%S7W}}dONjzR<`GBh1D+slfO11xu|cMb*BURHoQ&8^E<{Q z!RoWE0o0x4$HG=Fv-))d zcFDW^IfNv$e{c}^`{&Pllb=L4!=*DxXhcqg%?0dxvoj=yvNvVbk2*R!Di0Lb1%U7} zIpm`k)z#Im5kd$1`%S@(Gm5|ys2=c)zCR??bG4hky&ZC)MC9hhZy~eerDbKwHe72f zE55f()!x{=S!sG)#w1zvsJ*nsMMpCR(dut(-xCkpm?gv9DfNWnY;>MS7yTfyk39$B zGqnjC(t%&%j@9#s#(?(Y@sbMZq);TiwQ)oZyYqikO*}#qW{O z?ARG?ZXA0@sJ3UIqr_%V`#(8U9W=3`aPZ`h$T%! z8x9}5W^V4EFXavfgFj|={eeptmNJR|ewMuc zB_Zu_tgIkvKLzn{O1UFnH-aa&Q-jB7p^v$IpY?1w0|aJgmjaHhQ6IaCMFG+YfT8@? zU)OguA6G$ZRG?AwwEcZ`v3i{OSI3P~pUWb~Hy^_kgk9X+;9TN4DGd@{Eqc|W{v+?> z4F5qfTM#=`TM^l_k2_Z&J+mpv=YaD`em*AUO0ltt#d59iCgX`fdhuA*UNv}4>H*0k z`086*9k4_{n+OcH*2xY{VoOO$!6Y-qL9w|={?Zs;p=VIj^O+8&B^fDZ62O34i0QXK zFZi7PuF*Ob32gHwnP-!+QcO(*hp3oX>+R{#)?6gIO;b0IM`rI2C;OKD%8HZO|gebSJi zLRyQ>py~V;^U@%iT*f+geY2X*E`b;O{fe=1b&uQI=&tc49znF;!A7t6_?g2mA15Xz zw51th&ead_J*iALqSzb3yW&#uf+_18irfn1Jq4YTqQp #include #include +#include #include +#include namespace { const char TOOLBAR_CSS[] = "QToolBar { background: white; margin: 0; padding: 0; border: none; border-bottom: 1px solid %1; spacing: 0; } " "QToolBar QToolButton { background: white; border: none; border-bottom: 1px solid %1; margin: 0; padding: 0; } " "QToolBar QToolButton:checked { background: %2; color: %3; }"; + + void addActionToToolBar(QAction *action, QToolBar *tb) { + QToolButton* btn = new QToolButton; + btn->setDefaultAction(action); + btn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); + tb->addWidget(btn); + } } namespace OCC { @@ -54,11 +64,11 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); _ui->setupUi(this); QToolBar *toolBar = new QToolBar; - toolBar->setIconSize(QSize(32,32)); QString highlightColor(palette().highlight().color().name()); QString altBase(palette().alternateBase().color().name()); QString dark(palette().dark().color().name()); toolBar->setStyleSheet(QString::fromAscii(TOOLBAR_CSS).arg(dark).arg(highlightColor).arg(altBase)); + toolBar->setIconSize(QSize(32, 32)); toolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); layout()->setMenuBar(toolBar); @@ -68,6 +78,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : connect(closeWindowAction, SIGNAL(triggered()), SLOT(accept())); addAction(closeWindowAction); + setObjectName("Settings"); // required as group for saveGeometry call setWindowTitle(Theme::instance()->appNameGUI()); @@ -75,24 +86,29 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : auto spacer = new QWidget(); spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); toolBar->addWidget(spacer); + QActionGroup *group = new QActionGroup(this); + group->setExclusive(true); // Note: all the actions have a '\n' because the account name is in two lines and // all buttons must have the same size in order to keep a good layout QIcon protocolIcon(QLatin1String(":/client/resources/activity.png")); - _protocolAction = toolBar->addAction(protocolIcon, tr("Activity") + QLatin1Char('\n')); + _protocolAction = group->addAction(protocolIcon, tr("Activity")); _protocolAction->setCheckable(true); + addActionToToolBar(_protocolAction, toolBar); ProtocolWidget *protocolWidget = new ProtocolWidget; _ui->stack->addWidget(protocolWidget); QIcon generalIcon(QLatin1String(":/client/resources/settings.png")); - QAction *generalAction = toolBar->addAction(generalIcon, tr("General") + QLatin1Char('\n')); + QAction *generalAction = group->addAction(generalIcon, tr("General")); generalAction->setCheckable(true); + addActionToToolBar(generalAction, toolBar); GeneralSettings *generalSettings = new GeneralSettings; _ui->stack->addWidget(generalSettings); QIcon networkIcon(QLatin1String(":/client/resources/network.png")); - QAction *networkAction = toolBar->addAction(networkIcon, tr("Network") + QLatin1Char('\n')); + QAction *networkAction = group->addAction(networkIcon, tr("Network")); networkAction->setCheckable(true); + addActionToToolBar(networkAction, toolBar); NetworkSettings *networkSettings = new NetworkSettings; _ui->stack->addWidget(networkSettings); @@ -100,11 +116,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : _actions.insert(generalAction, generalSettings); _actions.insert(networkAction, networkSettings); - QActionGroup *group = new QActionGroup(this); - group->addAction(_protocolAction); - group->addAction(generalAction); - group->addAction(networkAction); - group->setExclusive(true); connect(group, SIGNAL(triggered(QAction*)), SLOT(slotSwitchPage(QAction*))); connect(AccountManager::instance(), SIGNAL(accountAdded(AccountState*)), @@ -167,8 +178,14 @@ void SettingsDialog::accountAdded(AccountState *s) Q_ASSERT(toolBar); auto accountAction = new QAction(accountIcon, s->shortDisplayNameForSettings(), this); accountAction->setToolTip(s->account()->displayName()); - toolBar->insertAction(toolBar->actions().at(0), accountAction); accountAction->setCheckable(true); + + QToolButton* accountButton = new QToolButton; + accountButton->setDefaultAction(accountAction); + accountButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + accountButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); + toolBar->insertWidget(toolBar->actions().at(0), accountButton); + auto accountSettings = new AccountSettings(s, this); _ui->stack->insertWidget(0 , accountSettings); _actions.insert(accountAction, accountSettings);