From 58c0c77479bc60c5f0da1c5c30dfb1f1cdcbdb38 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Mon, 3 Jun 2013 15:50:57 +0200
Subject: [PATCH] [GreaseMonkey, AdBlock] Use 16x16 icons in statusbar

---
 src/lib/adblock/adblockicon.cpp               |   1 -
 src/lib/data/icons/other/adblock-disabled.png | Bin 910 -> 466 bytes
 src/lib/data/icons/other/adblock.png          | Bin 1296 -> 763 bytes
 src/plugins/GreaseMonkey/data/icon16.png      | Bin 0 -> 994 bytes
 src/plugins/GreaseMonkey/gm_icon.cpp          |   2 +-
 src/plugins/GreaseMonkey/gm_manager.cpp       |   1 -
 src/plugins/GreaseMonkey/greasemonkey.qrc     |   1 +
 7 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 src/plugins/GreaseMonkey/data/icon16.png

diff --git a/src/lib/adblock/adblockicon.cpp b/src/lib/adblock/adblockicon.cpp
index ef4ece6d0..1c66ad463 100644
--- a/src/lib/adblock/adblockicon.cpp
+++ b/src/lib/adblock/adblockicon.cpp
@@ -37,7 +37,6 @@ AdBlockIcon::AdBlockIcon(QupZilla* mainClass, QWidget* parent)
     , m_timerTicks(0)
     , m_enabled(false)
 {
-    setMaximumHeight(16);
     setCursor(Qt::PointingHandCursor);
     setToolTip(tr("AdBlock lets you block unwanted content on web pages"));
 
diff --git a/src/lib/data/icons/other/adblock-disabled.png b/src/lib/data/icons/other/adblock-disabled.png
index 453bb7b967c099714a382b854f721e4968faa971..7524a7e42c75d25283e5cb11edd249254fc3f744 100644
GIT binary patch
delta 455
zcmV;&0XY7S2hsyCiBL{Q4GJ0x0000DNk~Le0000G0000G2m}BC0JZuz>Hq)$0%A)?
zL;(MXkIcW3Fc*IS2XskIMF-sm0}V1Ac`sDt0004FNkl<ZD9?q_F-TMa9LMp`d!2OW
zNlMVwDFhvEk<l1}Q&SKTw7RskwRGMfv^9m%&{QCfjR{RnwY5bAR%Q^Xhu$R#XL`Ks
zy?=ulHT9i-!;jx@_$Cf%`j@#sDTGREy%Q0U#ZE-*=9_;TX)DBGq0(x1Uc_`v#`(Ay
zQ*k5q@{NsBE09oWt=#@lo40Mkn3G=mr0!9%-5r0>zn5rsW?t7G+mgA1A)~H4ZOB5=
z>z=xwQmZ}mO~-<=LI|0zP1EVf2q~=kE|W^+3L$mDmUU2~FBA5Ka|RsIHtUDyO8Q9Y
zIjU?xuBv||QFp~N$CT|HEc`U6V#mIo3<LU>jG;(L$&4FPwT7OaL5ohPYRC>Q+HbC@
z8}&q4L&H~3)txb0wBM4T`R?ZN#@%$;uu1D)8Fp5)=zg4-H;16Pyt13$ipwz-m*Q&7
x#9qGiUNiod^?9wx<2Sqc>X$=V$^Uf!0(J?b^r{c{if{k`002ovPDHLkV1kbi)oTC%

delta 902
zcmXAme^63c6vugCMJ1JkX*o63WTWjr+pdngHQEn?lqr$WDJPoUX4-NM_b+$LX}7Q+
zniZC4m>PzrrXmj?in@YNc<?}shsm$hGSkeg%+$<Zh}AVdGxwbP<D7fG_Z~a>_VS%K
zIP7TZ%Al1b5{b%+VQ_)>UmO%Nu<B!@dx0aT(pd=<3g!7gT)*hYKmk<1Ih?=*2VcLV
z)oKZXa5|k}!sGF>va*tsllgppT3T9WW@c(?YDPu|j^k}@Z6FMQVVDua%w{uTHe0P$
zlS!{ut5H;~L(w)IH=A*ptWqwM!Eg->!wQAM(%z06FoOYe*lZ4m!z=)47K@d5>~c8}
z1X0!3x1uP9X~B&~9DiaZni?An20hs9d(rE3I-a_m&w9Ew8nvz!#SQv)kWN^hbXa?z
zKLat|9k8@@0z&}P_0-kV-IXmAigI%Daz&-3C9u2(L24TtR5^F<<cb8MyLq`{@!fm(
z@(T+K?iUpmOC-_<#ib?EhYw53%gY{BR8&<~%Brj6H8KS(udP)ml}LSEU4yC~C~N+|
zNuzFVY0-e%dQ1n(n~dOZOhA_9al2O;km9i0ywZV6@Qi`}mxHechF%X2zZnv|dpkVx
z{@v(@k+F}X6XRo(pC+b0PtHtF&CSltyXO`>^V+I(3uw=gzq#yq(h{=I(q)v@Yy4<5
zT0r2g$jB%<;6Mx;5O)SNDkU@PhA>+!&M$0SM5n_r{hZtFp7-KeWC8HSORE4iq>)I_
zP8MT-!uk!HFbiAH@n70`u>*wz{2^M%&*QPeuviZia@+S(9eHr`TIXy*5H;~^g$hmL
zoj8QNir5In%)*`Hi9KVtNY@^n3Xcp5DXT6EHAb91tb=}Sx%gr0*_ot07qk-gisio1
zQl87i_G7|wo}@y`5&S0zv+Y(u^gllixx>#DUmoF12eACQigx@m`NIsKwTU4t7af)5
zg>rKneoEYueYz=rLv^t1WQuY-Yu(hU_0_?gA|~W>fq8IS6zekP)35#mI%L1Pg)tE~
z{Lf$M*U2%Ji7R#;2@RK01Gsk0K@Sb-{@QV(_)XwT)q|UFKV=(Zv4!CCl*!MYQ_U&=
z62I3NZHD;OP>yeHUzJjPT+$nrlwP8Y=%v!3DZXdbKE&QPy=-4fMD*Yq>^DUix213x
P^oGP@vKb2c$t&Lg%p?ah

diff --git a/src/lib/data/icons/other/adblock.png b/src/lib/data/icons/other/adblock.png
index ce13495cb93442679beccd71da28b2d0e1dacb0d..6ca1f48f7a8d9c9fa15a892f911237aaaac3003e 100644
GIT binary patch
literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008QNkl<ZIE|H)
z&ubHT7{))DIL?nYG3jBf5{n(8wpa=&yX?Y>hf=(G@ZdpMJnW@sG4@aBA-I%6d+brE
z2qL(!7S>%nEXDc*f6&A>t%+#|(;Tc$GM#))XTE!|iDJF%=lJsS@bJFR6JbBu@65jD
z`o4*j5-BByVN7gpZf?mvgb=b`uS+SV^gJ)9R;%w6MVV;t0~~0Jn5H?gwzhWl=%Yv0
z-?Oun*VlP0C3;sEKQx;hJ9$$1@y;E~ahxlvs?ut;asUwk!!Ra_#p2c8#YO9%nHiFf
zLwRhBL|-5ABS(0>ut5LP63za8ez|uq+}_@<rPJvt-}iG7AiK4-buIqjf%Vt)H0H(z
z|7sfNb2$L?c$`Ek#f`IP`85{fNnanM_wR?U>(+XEdw*8|EX%U~$mJMXUuVg6`R(pq
zRKp+)Lu42tr9=q9tB)TU$mdxY8&eXAL;^r*-@qsoXfzu5LJ(0Dh(rj3;IoL7e9$!B
zo;$~@dL3hRwex@j0KV@dgrEtu_P%m#WQ6F!gDBA`?<*C~Pfiki`oxP{w>Yk<_`Xla
zf$O?xnuf0HsH#d31Vm#oLRDo~Q8<)Jk-2!0XSZ)NsA*`rPQ70L;$U}o7t=K9jz-a%
zO<JuMuInO%06<k$Xf$x2J|!KCQT}`%rQ<*dfj%^Z+1-t07`!i+X*+XW7t=I(K0nV$
zEQZ<Dg*G_Y5mx{l$9aDI@@3wgI>pb)B+usNFm)Z<wy|xSoobbrH*fM&GD$6y;qdHi
z=s3>HPLP0XKA#`&>FKdQjE^g&LV;2$MS66U?Q)qn4<B+S8s%^%Lwsr~tkr6(!^6XK
zonGwaI=iy6QuI78czxl5TpSpX^R_MjJaIxUpFS;%moCYjot<ELdAR^&+g;dKrc$Z2
t5r$zPzrpjopi-&4{kBXI_Vd5${2$DyaKsOmz;OTo002ovPDHLkV1hbIa)JN=

literal 1296
zcmV+r1@HQaP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RW0~-@83|ey5t^fc424YJ`L;(K)
z{{a7>y{D4^00fXpL_t&-8D+s=Xq9Cg!13?%zUS=hJ=-~MbDpWI@XvI~un-gf;J}hJ
znB5dPZwd@D>METV-3VPs|0oMeEm7-2XA+B2X6cf&Ii;*5G)&Wm$C*1bH)lJ4-sgGV
z=hp@b%RV2)IQ#eSr?s_}Pj>B!#j2_nB$COPI46u!N`VM!l-AmYLqk75zjm$e?(U|!
zxtY6SjMLiM${0VH+`KH4Ss(THD;103D+SJBl)^cOmripw9^VPP+}zyEc#3;;9zXt0
z)2&-=6?^wmQC?0c!o^I6Le&HwzS>8*=TWeh+mAoarTY3E4Rv)d&6qXIafi2W-#*4X
z*4W4w2M@m9G&tCn+_p_>tExCZWeTSkFM&rN<)IhWakQd>GgGIMo-~Qnp|54;l`HFh
zId|@ZKhB@`8Fk{s2^4p9c6YzqbmPW`)Yh%kR99mP1%7XBW%@JE@auQq(J*%|S1(+k
zCX*rl;fG8~r5G9-VtDy-dZ$g>v0~}c7a0}X-`*Y%J#TZ<z`%y!wb!I3Q>U`la(VG$
z(3%-h#26()4Dfv)S1MsVk5nRo>*$b~t5>i4s<YFU^7%F|s;F4FyuSXGWLq1VAgLG`
zVW^^lg|EJfNvFX%L<Hv?P6Tldm(QaL1t=7#PN!A6y`4uAiFHMhWwCfNnb4Ondo_K1
zNGgS5lriXH5pfP<43TqKYl)%=6Il|40z+C;N+y{MR656vTuyoA<q6MPE0J?xEh?9T
zQi(_#N@0l6A)(e7W6;K+wMIhC)sYc;pL>=oYt~R09!3=lMAl-XNIb1I#V}-y3=YEZ
zFxDE3wLI|P98453eePVmM1m=E=5Q;QqqlK34Xd8SKYNx5#Ud(SKo^VXFeGNQrdTQ=
zfK?vezzw2ekx*-rH8te(d6ZH_)}nl$(D$iZ`2>GoyGHr3WB8#)@_BT=Kv-5r%osx$
zhB&~A;2}iDfC!PbpcEp)7_pYgjg9!ePxj<V=47)dr67BiFh7D$RT6U|SYwC)r@%)c
zN|7ip$BBSaj3?sogCzcuBh+QHAcC?Mi6TUVSWJYn`|szUc#IT^2!Y5E1OeiC+)F7%
zF$~EZKMvM`rzoPtudgQtc%Ogz>CZ>6U+=oP<$VT?7V$h1*({N@R903J1OY)15Cj21
z5Rk5|rT^3^CSUst6pTbxuD|()`nH(wIs9cu4|k+LZr^+8-1hDAXCfhe%9A6THi;II
zD2l`wBgPnUBGRABNzc4_;!rZ;`|i?PZ^<Ve9ml3kn>vv(^XJcJ%*2}N>bJLSIdpON
zZs`SgB_5Z<8#hY-&6{FGq#z={{rH3QELkFv^5izS?0fIYww*h_pE+YjhEXe9R`MT{
zYHO?84;(m@-Lpro#p99#Ig_cAQwtZ$PfbnITUI6-<hD{Sw|%>Gbafq@-O!L>9L4{o
zKiakHvsL%qw^I80h%1Hf9G>S90V0B{tK*yD;S-zIuYam<VBjX>D8^Z^U;(F3pJvIT
zMH82<Sn+f`2+Cv><0!yt?SAR$`J$_<E7#J}LT6_ucl`^~x^eGg=)s-<0000<MNUMn
GLSTaXLtlXa

diff --git a/src/plugins/GreaseMonkey/data/icon16.png b/src/plugins/GreaseMonkey/data/icon16.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ec669de652bd9d31ea9acfc3c51501124404ce6
GIT binary patch
literal 994
zcmV<810DQ{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-39{<D=f3|{l)+Q18+%0
zK~y-)U5{H#TXg`&fB$o#7fM?SDYv$OIB*k3Cr;S18MiD0!@{O!$$at>@xeq*)EJGv
z%m?vhnP$#8CozjLGfUK{JdkZBZp%=^L<h_j#-)@=8RODI51jV&oa2Me2fwH9<@e?H
z3I3N4+u@bIfBK0IBpX!IrerP0BUzKJrp1?sFEaRb7d&|i#9i=68x*PVLNC0z9T6#}
zM3w2tn(STCX<yG10KV|Zyrx@d%Npw+3}DLu$2$eaZFuP-oam&;Q$VLGb2@L+HMhzG
zsVpuDR((!J5bQ8*65Urw0!RR<1)JA@gQI&W(^u)Xvz*m+HqB{}(ZQ=gmEYl!OrF(q
z<kt$6;k)MlUFg||Go^8)G*tFtX}F5yM4W}$B?{d#&HEn1Q(Vl=--nnQ8ak6)v~TEH
z{9Yf2m3MaH)imCYFXF7*Q2Bi869)){A{e^PxnswvZEhsmz8@{UOduRaOKArsUq+G(
zJ<?<>J}N(4CBGY~kG!FZT(thdsN<f8T5zi_0@Zbt*WF9)<`xu5!l9_(aH8uOX*xC~
zqPw^A=e22<l$Q(JwmiCxoS`}bp%8wLkL&aEy!y#!xFZdWrqXnLe2Po4af-cuN~>#G
zNL$1wXD}qYTw2Rp3zHKwq%wJOwm^0`xw^2<=?igw9f%QMUSTw0arE2sP*RH5=S8Rm
zOvV3VIb#k;Y0c=pF_u6_!R2s*uZZ~A1WT7=tfX^<{2`Lx53n&<16iG5RhW*)TbP}i
zV^!08<O-LWSWRn(nj6c#JKA<rfJ|MmjI1O$)VYg>#s-=iDml2P1uc1-#ko6F)K)M%
zJTm24*Se(((<F<s=KG;=DY?Ah+}WS7moj|x)-x2@28%=2Y26TEc4UHYdiqF=-$Ifl
zOd*1XgiCq331LF&*32@hYJm*BXMV(3>%+*J6bJp7mWAwA2-XCM?!2F&{(k0?sdUyP
zr&Mni*61Jh@OUg?4PO3P+O>Z#joa=cmDVwG7D5uZ-44pieH6MSu3qZrhp*0)S<9W2
zRZ;?=Yb&ay^K_xdb!=0#-npf<iOQNVvZ{b3SeU=V%tV6G;hRj3O|N8D*54~|a`Mx`
ze+K}bi=x;j8x=)7B~TC8mKqWQVcWtMQho_3|4ZJmzOyXrijYZuehmZQZz1z`^fsf2
QzyJUM07*qoM6N<$f`sGM;Q#;t

literal 0
HcmV?d00001

diff --git a/src/plugins/GreaseMonkey/gm_icon.cpp b/src/plugins/GreaseMonkey/gm_icon.cpp
index 640eb834e..0fa08a5e5 100644
--- a/src/plugins/GreaseMonkey/gm_icon.cpp
+++ b/src/plugins/GreaseMonkey/gm_icon.cpp
@@ -25,7 +25,7 @@ GM_Icon::GM_Icon(GM_Manager* manager, QupZilla* window)
     , m_window(window)
 {
     setCursor(Qt::PointingHandCursor);
-    setPixmap(QPixmap(":gm/data/icon18.png"));
+    setPixmap(QPixmap(":gm/data/icon16.png"));
     setToolTip(tr("Open GreaseMonkey settings"));
 
     connect(this, SIGNAL(clicked(QPoint)), this, SLOT(openSettings()));
diff --git a/src/plugins/GreaseMonkey/gm_manager.cpp b/src/plugins/GreaseMonkey/gm_manager.cpp
index e598870af..c031e16f1 100644
--- a/src/plugins/GreaseMonkey/gm_manager.cpp
+++ b/src/plugins/GreaseMonkey/gm_manager.cpp
@@ -271,7 +271,6 @@ bool GM_Manager::canRunOnScheme(const QString &scheme)
             || scheme == QLatin1String("data") || scheme == QLatin1String("ftp"));
 }
 
-
 void GM_Manager::mainWindowCreated(QupZilla* window)
 {
     GM_Icon* icon = new GM_Icon(this, window);
diff --git a/src/plugins/GreaseMonkey/greasemonkey.qrc b/src/plugins/GreaseMonkey/greasemonkey.qrc
index cc023055f..b76d74384 100644
--- a/src/plugins/GreaseMonkey/greasemonkey.qrc
+++ b/src/plugins/GreaseMonkey/greasemonkey.qrc
@@ -19,5 +19,6 @@
         <file>locale/uk_UA.qm</file>
         <file>locale/fa_IR.qm</file>
         <file>data/icon18.png</file>
+        <file>data/icon16.png</file>
     </qresource>
 </RCC>