From 31017602fc5b1df9a0fab6531dfaf683003ede1d Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 7 Apr 2010 07:59:26 +0000 Subject: [PATCH] Fix transparency of speed limits icons Dropped dependency on Qt gif library --- src/Icons/slow.gif | Bin 1805 -> 0 bytes src/Icons/slow.png | Bin 0 -> 1711 bytes src/Icons/slow_off.gif | Bin 1750 -> 0 bytes src/Icons/slow_off.png | Bin 0 -> 1693 bytes src/icons.qrc | 4 ++-- src/statusbar.h | 4 ++-- src/ui/options.ui | 12 +++++++++++- 7 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 src/Icons/slow.gif create mode 100644 src/Icons/slow.png delete mode 100644 src/Icons/slow_off.gif create mode 100644 src/Icons/slow_off.png diff --git a/src/Icons/slow.gif b/src/Icons/slow.gif deleted file mode 100644 index ea3250f6e2d74ec25effa20c6408af69d0643e96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1805 zcmV+o2lDtwNk%w1VJZMB0QUd@KtMp_FEat2k`Ll5fKq8Dk`?NwlXp@ z?(XhsX=(jY0M^#lEiEm=!osq$vgPIFw6wI2j*hObuK#Q@e1wRDgM9WKB6aIaXFydU|^QRRI4^0A^-p(bUy$Zf={Kn}vmi|2_bbkdSwG zcbHK)aBy(2u&`}oVq|1wjEszUczD%G3QJ2%b8~ZCTwKD%#oF51|CMS)L_~dkebLj? z|3&~{U|?lxYj9^}K0ZD?JUo7Wen&?~s#!d#si~%>rlX^yYHDi#enwPOREmm+9?G_V&TS!R+kp zY-?+ooSbKGbJWz-l$4ZgY;4WV&GqEoL_$K9latz=o!dnSQC3&|WFPtM>BdJ6gmG-- zyRO}PTkLvOprfPzY&^hfPyadqp>ABNr=`DaQ1bZtqo=3;g;n2aI^kwN=a6y#M+n$% zN9yqM_o0N{;^Sy*Y|l(1$y+-Aj%M14ZvS2?(TQ>5o15KSF2TaWfrW?WO#$*&R@&U% zdw+q2WLhRIFTS3W(xjx^y|e#)P+ezhp+X^}sH&@6K)XX7xV^r+X-IN=;4sRsjE@e*abl)YsSBmVbF^V|;IItveW>iGt$a-s{=ava_@IHvp1F zEtyR-RXQ^7VPP&WFV;l{{QLUQM-1a>X=`q8?w5LHWo6*u;r~|@|4QISFh6w@Kq#=j~PJjs}<^WQ&a^e~W8tkkQ zm`077HEWE{{Ff#GHVuP#M$99^4%0Vn2BzuLXQ;q7Z-xfQ!obbah79JsiR0$YKQ|Ie z+&I#t$&qp;La_PQ#!Z_x6Y4}gC<$E8e-7ldVZ#Q^2qIKK0GL4tNRA-{WMrU1BtT6z zZ9Y6mX>d`rN`cl8`>=-&oIQWMy#UhU!JiT-Xppho;mCjtf84;KvuBBb0C5VgxyCBq zt_7beu(5MM0huiidZh3HBvFSOD`o)y*pOivh64uJRJd?wv>KXyta-9zuh%IYGN|a# z(jvEy|41Ow0RdIKumK1eD1d1p(->1p|!{Gz$*qz=Fy=rW8{RKDbzc$B=kfQ4Rq}B0v`aGO&oj z6?x=g$004Skeonpn2^UUsl;$kKTL>%1tloZlERrC9FRm32h89F0#`7}q6I$a(Lf$` zXh26#62Q;^3rgtn&Lz$;(S^5G$+zMwVL%5}?8C_@t%TA=B##LHGtDnjbYLrZQ5^7Q6IINagaL9iphE-~{KE$}hsYs8 z1~dqOf;+PK(#{FbQ1Hz*LKrd*A>XZ##0-@J@B#=5EVIlUa@?W819qe#ff7$Z(?bS2 ze1XImx%iXG3Fp{Qg9k?ZFohwifcI^q%D(IeMV03-y! zDQAKUFB3t`Ez~gr426K|QV0g#Pyqk}2Y|6cIZ~WK%_cmUL4m*FoWV?-31^Cd1(;*- z#{)!sA%Y%o93sL4c&yNbHv?dx`ZAghV2nJCQ$PVbs$*_D1`2G@L=;6JB7hbe+yTcL zdsJXR1AZ_N0SO>lfy59qz^P3(Jfs5*BS*{-MGi%zP=Wwi1fjtk4EWK20TsC66&gjo z0S5;ajBxxNF2EpxAP#5(K@5%5;ea4lbAcQ_z=9Y7;sR|^LmCc)5ca8|4S{e28!kWx v1B8GC5-X!WO#lg)l^6KmY(c(a}e7 diff --git a/src/Icons/slow.png b/src/Icons/slow.png new file mode 100644 index 0000000000000000000000000000000000000000..84eed0980e8bfd501af767258a53bf575d554d9f GIT binary patch literal 1711 zcmV;g22lBlP)Px&08mU+MegqIKtMp_FEat2k`Ll5fKq8Dk`?NwlXp@X=!QwQ2^G~ z)-5e9!otF`va;pn<+QZ4j*gD5uCD)VGJJ%HgM)+rTmWKXV%*%^mzS5$&dxP8HOk7$ zsANq!IXPBVR(g7R|5X70P5@?RX3^BuZffAczAf#NeW9#OLKE`TwGkj#l_m%+W(bmL_|b=eSOi>)Bi>QU|?WnYHM(3 zWj;PWJUl#pett(sN2*yosi~=^rlzB#qiSku|9(bPR8)$Jie6q`V`XJXNJw&fespwn zT3ucLLjX}uPX7M>{r&y>`}_R-{PObh`T6}+dmnVg(wZ*$bt z)RdHzY;0`J&CT`X-b6w|m6Ma&ot@i72vJs7{bV2c?dirx4uo-RPpNWFv-`?xl)Uva)_cs8NMJ<_4GgUe=?_pss zFE7?b2K@W_&_@j8X=!V2Z|;|RWo2dH;o<*R6#q~f_CNstSs(vF2W%n-|8+u%Ur~`& zLgcct&uvfoH~{{!liHDa;Q#>Ll6vEPTZN5}fQpWViHe=2sI0B6|G1gfQz`%d{~RZP z@c;k-0d!JMQvg8b*k%9#010qNS#tmY3ljhU3ljkVnw%H_000McNliru+5`s&Gz&hF zH);R?11L#EK~y-)V_+BsgA5cEODn0VIV$lR)ZkU8CoRI1lldPAG76YP)QTH$Ddd$d z%l`jAGb<}QJ1YyQA(QEbbTc-El}cs*GxKwSCT7;w0=4|l&CmYN6v>Ol$m0CMy!`)p z!m8%(zP|2HRTXpo=jP?+ij<-o%wLq7larzB5~9Fp+~Q#A%xWYR;=+_skdrGffbieN zsSFH9roH7pXlxP84 zO*@B9S#xb;Mj5Hok{s+gViM&@=FXe;ZSQgmqY$eoT}=}^J39{#S=LZ}83ieBNh3W8 z<&t7Gc&N?&@?^=nJ0}kcsQLkciHV6hr>`#~P%%)gOr020RWvLdHd{Q~u;TNwqgQ|I z2&({su&1o7teoz?j7A`};gywT?YcS;rD~PiR~ml*>$50gipCaAO-)%2PfrfxIL>ge zT5-E7zRFT*uu5SAJ{_-J@28*hiQN=&>gO+qKy7Dj?F0^E)+9!wd)zFi`E~fZI`}|J zOXZ8$WkY|@S-f^(?8N>& zy;VOidjGal+v66XT2GL%`U>2qPZt-JOAC|%?f3G(U@K)6?~%Oo-%R!AW~Op(_Q7qd zph`h55Vw}^61J^lV7RgI?uS%&D?3Y%gtRq|d4BPU0K_S2yBE3<9VfNCG6 zp9u#$R8m}AT(VxkC0?nDfuUVVphDaC9*d-;^cAd002ovPDHLk FV1gOcSz7=A literal 0 HcmV?d00001 diff --git a/src/Icons/slow_off.gif b/src/Icons/slow_off.gif deleted file mode 100644 index 9e9fdcbe76c446d393fa402379c3482170ea4026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1750 zcmV;{1}XVRNk%w1VJZMB0O$VzKtMp_FEat2k`Ll5fKq8Dk`?NwlXp@ z?(XhsX=(jY0M^#lEiEm=!osq$vgPIFw6wI2j*hObuK#Q@e1wRDgM9WKB6aIaXFydU|^QRRI4^0A^-p(bUy$Zf={Kn}vmi|2_bbkdSwG zcbHK)aBy(2u&`}oVq|1wjEszUczD%G3QJ2%b8~ZCTwKD%#oF51|CMS)L_~dkebLj? z|3&~{U|?lxYj9^}K0ZD?JUo7Wen&?~s#!d#si~%>rlX^yYHDi#enwPOREmm+9?G_V&TS!R+kp zY-?+ooSbKGbJWz-l$4ZgY;4WV&GqEoL_$K9latz=o!dnSQC3&|WFPtM>BdJ6gmG-- zyRO}PTkLvOprfPzY&^hfPyadqp>ABNr=`DaQ1bZtqo=3;g;n2aI^kwN=a6y#M+n$% zN9yqM_o0N{;^Sy*Y|l(1$y+-Aj%M14ZvS2?(TQ>5o15KSF2TaWfrW?WO#$*&R@&U% zdw+q2WLhRIFTS3W(xjx^y|e#)P+ezhp+X^}sH&@6K)XX7xV^r+X-IN=;4sRsjE@e*abl)YsSBmVbF^V|;IItveW>iGt$a-s{=ava_@IHvp1F zEtyR-RXQ^7VPP&WFV;l{{QLUQM-1a>X=`q8?w5LHWo6*u;r~|@|4QISFh6w@Kq#=j~PJjs}<^WQ&a^e~W8tkkQm`077HEWE{ z{Ff#GHVuP#M$99^4%0Vn2BzuLXQ;q7Z-xfQ!obbah79JsiR0$YKQ|Ie+&I#t$&qp; zLa_PQ#!Z_x6Y4}o2(ITp2Xfl5VS{D_5h@@6%pe3L#}EQCGEgBBpeCC(A0DJsxQ5t= zJ#^sg`Qz;ckQNXAlt@8?Oyv$o24wi-1`eG)O9TXnQ_$-_VhcW1U}NWi0y0}3^hn_Y zNTLomR?GmfA;U5Z2MqqOsc_-W16i_Y_Bo!s!YLdwsOZqrg0_$QNRV_OQ02u25E&?d zfebEOFamn$o%IhIY;>aBd%7eO%mXDjVWAT=WOxGtbpg;{cLHvJAbJciM$jxcm;<3M z6XJu56?nvmhZW@zU?T!_0U$$n?~J(1E-kP?oIr4xkjE{l=)&Ry_|Sp}3bdpkWd{c& zk;DNrc!9tbG6*9Kf~54)Kpu5yKu1p!z|a5-O0b9rJ~HA#OFsGl5yc8atgr$YSbllV zpRx$Ei~}q*pa>!jWR*r8AIM=q2UYCzfSi=Z2*fW^bf9T=tN0_!pXbO@3^x`eVSpSB z=n%mL|L}p$A^vhmkO2(>pa4XicmN@VA-s-5NCyzS0_r(f$N+)@%Pcd89Cv8&fE{T_ zpu`i<^pJrLUm!8Ytxf{L>$k$JgN{0&qF1ap3JhSu4j(8YK@WcPflVykz*EK%I{1)- zwm|gzts%njun7;PKyl79k6Yl^&Hd05G8PtNDe?G;4QDh zWWxgwP*7mQ$`lAg7ZooYt8NAiNWee~BvgQjBjWJl4Gk&WpeYxG7}D>_JeXky1r*fa z!8ZhKsUwK$E)#*oEz~gr426JF2nOCz0RRFAfU!b3Qk=mh%o62O?Wc^28b^+fZ{wfU4sf9{DAn~lw+X422Dg!1R?@xp}`$+ ztg%N01~lLY0}+rwp%q9BF~gSOJl>2Ej2tmT6gd=;LJ0z75rhVFFyKc622|jNS7;RV z1{@qzFhc2fxB!C$f;dpiBr!BnhXaDx?1CI0un>SAfLzd)8fh4YQ1WWD5r`XXTtJ5b sA&?+}0d!ozh8uybwTAi_iNgiRqXv!`@PG(RpaK`jzy><-fB^vjJ87&xs{jB1 diff --git a/src/Icons/slow_off.png b/src/Icons/slow_off.png new file mode 100644 index 0000000000000000000000000000000000000000..428f76e35733fd71259f262e5dafc915819e7fe2 GIT binary patch literal 1693 zcmV;O24eY%P)Px&08mU+MP*e|KtMp_FMbQ2M6%*@DULaDk>_rwze`dGVbo~X=!QwQ2^G~ z)-5e9!otF`va;pn<+QZ4j*gD5uCD)VGJJ%HgM)+rTmWKXV%*%^mzS5$&dxP8HOk7$ zsANq!IXPBVR(g7R|5X70P5@?RX3^BuZffAczAf#NeW9#OLKE`TwGkj#l_m%+W(bmL_|b=eSOi>)Bi>QU|?WnYHM(3 zWj;PWJUl#pett(sN2*yosi~=^rlzB#qiSku|9(bPR8)$Jie6q`V`XJXNJw&fespwn zT3ucLLjX}uPX7M>{r&y>`}_R-{PObh`T6}+dmnVg(wZ*$bt z)RdHzY;0`J&CT`X-b6w|m6Ma&ot@i72vJs7{bV2c?dirx4uo-RPpNWFv-`?xl)Uva)_cs8NMJ<_4GgUe=?_pss zFE7?b2K@W_&_@j8X=!V2Z|;|RWo2dH;o<*R6#q~f_CNstSs(vF2W%n-|8+u%Ur~`& zLgcct&uvfoH~{{!liHDa;Q#>Ll6vEPTZN5}fQpWViHe=2sI0B6|G1gfQz`%d|Fvub zl>h($0d!JMQvg8b*k%9#010qNS#tmY3ljhU3ljkVnw%H_000McNliru+5`s&H5t@1 zcVhqm0~Sd{K~y-)V_+BsgA5cEODU0d$m0CMy!`)p zLaOHOzP|2HRTXpo=jP?+3YVfA%vY3~larzB5~9Fp+~Q#A%xWYV;=+_skdrIVkLtf8 z^3^2;)%ExE9d!BYRW(gg94uwsStRT83QDTInVFDPa?cmdDP!kKiRQP}v~%c`HP<#~ zl$Ja#!OoT=DqhaNX%n)_t zgB0%Gt*Zl3s#dvuC0ON_3XLtAnwqlgo}TQ+aU9`BhYkT1F4@alSt2-J4g)=pqIKD6oi^XHomo#xZw?dsqKDJ_*RVv`O1&0nzv2rDWa_6Nzz z0)t@nKd{Q9cf>r|ig>LAfhucmv=<3UnlNiPfK07$2x@C1jb89^F!927}fGtrGV_7&+Jzw4Vm0+q?vtXey`Wb{nV=XuE`%n3zO8ze~JQ6$3-N z5`TrZ?>!a?35nAzr&(-7Oii`q>?J^IfU3BpeFI%Pn4_f1K>;hu##_fDsKT!r=HYD2 z5&qCr>#SRkyK$hUtEMV*q@z?ZPaQ9tC{jWcRc7NY*E0}m;@djeu(y=2Nr*?UNM47j nssT^FWm8lUVjC^y1|t9fEqN0e;nJWH00000NkvXXu0mjfHDgoi literal 0 HcmV?d00001 diff --git a/src/icons.qrc b/src/icons.qrc index 079afa547..f62f60e64 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -6,12 +6,12 @@ Icons/url.png Icons/locale.png Icons/loading.png - Icons/slow_off.gif + Icons/slow.png Icons/magnet.png Icons/sphere.png + Icons/slow_off.png Icons/uparrow.png Icons/rss16.png - Icons/slow.gif Icons/skin/checkingUP.png Icons/skin/bg-handle-horizontal.gif Icons/skin/play.png diff --git a/src/statusbar.h b/src/statusbar.h index f90873696..c78949300 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -190,10 +190,10 @@ public slots: void updateAltSpeedsBtn(bool alternative) { if(alternative) { - altSpeedsBtn->setIcon(QIcon(":/Icons/slow.gif")); + altSpeedsBtn->setIcon(QIcon(":/Icons/slow.png")); altSpeedsBtn->setToolTip(tr("Click to disable alternative speed limits")); } else { - altSpeedsBtn->setIcon(QIcon(":/Icons/slow_off.gif")); + altSpeedsBtn->setIcon(QIcon(":/Icons/slow_off.png")); altSpeedsBtn->setToolTip(tr("Click to enable alternative speed limits")); } } diff --git a/src/ui/options.ui b/src/ui/options.ui index 7f592ba3b..f20487216 100644 --- a/src/ui/options.ui +++ b/src/ui/options.ui @@ -1478,6 +1478,16 @@ QGroupBox { + + + + + + + :/Icons/slow_off.png + + + @@ -1588,7 +1598,7 @@ QGroupBox { - :/Icons/slow.gif + :/Icons/slow.png false