From aed739761eda5bd5712cd55f0ed20161ecd977ab Mon Sep 17 00:00:00 2001
From: Anton Keks <anton@azib.net>
Date: Thu, 8 Dec 2016 23:21:51 +0200
Subject: [PATCH] provide @2x start/stop/kill icons

---
 build.xml                                     |   2 +-
 resources/images/buttons/kill.png             | Bin 802 -> 724 bytes
 resources/images/buttons/kill.svg             |  66 +++++++-----------
 resources/images/buttons/kill@2x.png          | Bin 0 -> 1417 bytes
 resources/images/buttons/start.png            | Bin 622 -> 494 bytes
 resources/images/buttons/start.svg            |  59 +++++++---------
 resources/images/buttons/start@2x.png         | Bin 0 -> 871 bytes
 resources/images/buttons/stop.png             | Bin 339 -> 338 bytes
 resources/images/buttons/stop.svg             |  57 +++++++--------
 resources/images/buttons/stop@2x.png          | Bin 0 -> 423 bytes
 src/net/azib/ipscan/config/Labels.java        |   4 +-
 src/net/azib/ipscan/gui/MainWindow.java       |  18 ++---
 .../gui/actions/StartStopScanningAction.java  |  14 ++--
 .../azib/ipscan/gui/util/LayoutHelper.java    |  13 +++-
 test/net/azib/ipscan/config/LabelsTest.java   |  24 +++----
 15 files changed, 111 insertions(+), 146 deletions(-)
 create mode 100644 resources/images/buttons/kill@2x.png
 create mode 100644 resources/images/buttons/start@2x.png
 create mode 100644 resources/images/buttons/stop@2x.png

diff --git a/build.xml b/build.xml
index 9810f9ac..c58f5c8c 100755
--- a/build.xml
+++ b/build.xml
@@ -287,7 +287,7 @@
                     &lt;methods&gt;;
                     &lt;fields&gt;;
                 }
-		    	-keep class org.eclipse.swt.internal.image.*FileFormat
+		    	-keep class org.eclipse.swt.internal.buttonImage.*FileFormat
 				-keep class * {
 					% *Proc(int);
                     % *Proc(int, int);
diff --git a/resources/images/buttons/kill.png b/resources/images/buttons/kill.png
index d8781869fd2e279c131858047f8c073dbb462e7a..9d2f103d2dce2598a569f7c4772bde94d6549194 100644
GIT binary patch
delta 674
zcmV;T0$u&02Gj*1iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyl3fBMt
z4c7reD4TeZMks$#Nkl<ZIE}4S!A=uV6g_WB=jqIJlw_o|wJj(pVqzldhUkI~0hACG
zjTICV8$ZI|&<z_GKq5lag_4NT#D!}VNn-?oV7h3b6x&A&Gkx!kt2VWW3*%khbMMKy
z=i~zaxyV(&zhOTt*3jUuZ7S6R_oLCVLtgLqp>VjncKLs9FgW2+l%-f8&{GX~D$C*U
zlk@fU1Mz6ooZs5&J#Ly`7V`OJ0AwT(7;7P9psQ5!tr61GY8Z=&Lg5<#5C9kq2D^{x
z`tyfvZH8^z$QFxuytbBEC*-!y`Mowp>AxVQ&$exBIu2$uEjO7?AFe34$=K?;VRRHZ
zkF@H#sz`r{c1pFcj9osds;4g2)%iH**pU)%Dc!UQ8BT0(FI5OW0Pb8aH*HaR`lsVG
zpU^aw2!Ret4~7Y$LI@N%$16fI42Vyq)30ki007M8axWVxJ>y6jiK;3ULO=)sTL?^-
zN}G(3JCmu@%zh~V09-&y*WH^T00<#!`_&3aJQ{x;KWCc#eU@c%&QVt23V|jev=yMI
z)imc5j4khpF&>Fbc3Rez0l(iTgaC6KjBadX^HTDogivsfaH*vK0D4;t<5QwgSgD*4
z3x#fkbiMCdDC7fxqLdg-r7~I99a^yMnU9<^065^fxU{olc?fy-n}SZp7W10cr6`L3
zh^lIOAFZxtvaUP)G?|?J%-D;NrnPSq(rigd->d4zuE#S}K7*8*9sphuiOdq<?5>ot
ziDdFkwLc@l;JA>o-*MgRQ|a`(Jua6?ZZ$SG{So~8qy2mR0xtgnSb%eLA^-pY07*qo
IM6N<$g1$8|_W%F@

delta 753
zcmV<N0uKGu1)>HaiBL{Q4GJ0x0000DNk~Le0000E0000D2nGNE0GZrhe~}>@3h@8{
z4e<d`1O9iBMks%uNkl<ZD3MK(Uq}-H0Ed5fx4Ai)+FXsD4*ztrQs$rGz+!5o$Uzk9
zaB>t*MIx89Abc}=uUDTWs0h-BA`DSUAtGJTG92kPRNO34=caDW&Aa7xy)@~2{NQ`}
z{RmMMVWnxsne6Nj#dUQWV_RDb%W>=Yhn1!!3Q>HkP^o`TZVV6S0I;$g7oj|(qYAZB
z`PI?iU+Z@|^SAf+dykUIH;losZ>4EzHt@c`y}gCs*}1qD2%OhdRkf@yFTbYDYW3`c
z!9i1j$Ab%r1l)eVEEtXU>;{AH{PXkUcPy3$+4?#qTUjA~hQl~WCTXo+ZzNOc^u&tK
zC!}c_Btd_mD>oOS+pU}(8FAn3>}-&)tx<<dOE?B_AeZA@d3hAT5cNG0`SRFqk5Ov%
zmEy`uNh%Nk1E5qQA(e>)@!RV~ES17+ULH&~+hL(zZ)Q2}2O)|g0H9B&8@$@s_@s$p
z<ngH~2!a5f=dsW8n3Tz2>h2C}8K!~dI3ECzne~5;QmLm4F4t~as|B*MG8!8siTtuM
zXc^{qCOQqRG_BC&<t^N|+lw(h4J4DNp&^}ybafS9#>ZdHjEz-gJmnc3%{i-7I`0h(
zROdRK<e$AggarYgrBYP0EMi_S3V9xzp^#)N9PSl>NycCZQkPY#PeTreQMI^8o&<x~
z<9UC)OeCN%8lxLNpJ;4umPVJCp^3-g4}~PrlM~yKAWV@2MLBmP5u~M3gpx_Th{bTJ
zuW!4$wYBz}*V{eea>aEVhhvgNL@tM>q9Pl>BSI8KIBII1wKg@`X6ELI`rh8Hg2F;G
z%W<0kaEqob6(uFl58`o!p{tA3l$L%3aP2wt4u{F~&}6k<R~HpoSdROJ|G25uHkX^t
j>iUij3xFP$;}U-Xqum-L2V*x400000NkvXXu0mjfeJfj5

diff --git a/resources/images/buttons/kill.svg b/resources/images/buttons/kill.svg
index 1ede1df7..266906c1 100644
--- a/resources/images/buttons/kill.svg
+++ b/resources/images/buttons/kill.svg
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg1872"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/mnt/work/svn_sf/ipscan/resources/images/buttons"
-   sodipodi:docname="kill.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources/images/buttons/kill.png"
-   inkscape:export-xdpi="90.639999"
-   inkscape:export-ydpi="90.639999">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16px"
+        height="16px"
+        id="svg1872"
+        sodipodi:version="0.32"
+        inkscape:version="0.91 r13725"
+        sodipodi:docname="kill.svg"
+        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/buttons/kill@2x.png"
+        inkscape:export-xdpi="180"
+        inkscape:export-ydpi="180"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -192,17 +192,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="4.2356563"
+     inkscape:zoom="62.784865"
+     inkscape:cx="8.4030845"
+     inkscape:cy="5.8253905"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
+     inkscape:window-width="2044"
+     inkscape:window-height="1301"
      inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-y="48"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -218,26 +219,9 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       id="path3507"
-       d="M 2.3806403,4.3351339 L 4.9974297,1.7183444 L 8.8477198,5.5780768 L 12.719028,1.7067562 L 15.327877,4.3156056 L 11.448617,8.1789857 L 15.303628,12.033977 L 12.711087,14.626516 L 8.8477198,10.779874 L 4.9309049,14.696689 L 2.3220555,12.087839 L 6.2468104,8.1789857 L 2.3806403,4.3351339 z "
-       style="fill:#b7a6a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.78578949px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1" />
     <path
        style="fill:url(#linearGradient2977);fill-opacity:1;fill-rule:evenodd;stroke:#551919;stroke-width:0.78578949px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1"
        d="M 1.9526587,4.5216941 L 4.3244204,2.1499324 L 7.8141816,5.6482519 L 11.323002,2.1394293 L 13.687567,4.5039944 L 10.171548,8.0056204 L 13.665589,11.499661 L 11.315805,13.849443 L 7.8141816,10.362989 L 4.2641247,13.913046 L 1.8995596,11.54848 L 5.4568131,8.0056204 L 1.9526587,4.5216941 z "
        id="path2969" />
-    <path
-       id="path2983"
-       d="M 4.2641247,13.275856 L 2.7137464,11.619279 L 6.3063994,7.9348215 L 2.802245,4.5216941 L 4.5014175,2.9287199"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eab7b7;stroke-width:0.62863159;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#eda8a8;stroke-width:0.62863159;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 8.3245558,9.8957978 L 11.510504,13.038956"
-       id="path2987" />
-    <path
-       id="path2989"
-       d="M 8.3478962,6.0843261 L 11.533838,2.9411681"
-       style="fill:none;fill-rule:evenodd;stroke:#eda8a8;stroke-width:0.62863159;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/resources/images/buttons/kill@2x.png b/resources/images/buttons/kill@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6488a117b10c08ced097930bf6541f979a93c8f8
GIT binary patch
literal 1417
zcmV;41$O$0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11qMk(K~z|U?UvbZ6IT?*zjJ3C$8lH^j5A*1ge4?kL68Df)iw*8
zDufDw;x<rJsj8HR{vG`ncxhi+P=OMbKD1S(f`C-eMXgk|Wl37dMsTbwB&j_P8P7R=
zNQ`1<Y^P7W@JW^|-*e9Qn=|L$Yv83`u(V=}F+kfE3hiyIs7O6XrBW*`+5zahLZLm)
z9*_A~i9A)z9D%?YV!r0mwA)>^wZWB|uMY&y6Z17&(|+s<25bK}K-L_<$(?J~KmnWB
zwtGuKWX%B_-^dIlQpX~_#UPde!~jhKfzJS(-0%0JyS^UXkqBwP2C?nlSU4Oi1npaZ
zKE4CM9%k&dETu#uB67RSFzQPJWX%aUb-*z2PVEBt*2+qJ7!E51Y*5U%@*x)U&Ju89
zr&4%T1OO0ZM*G~HB9V{~^*TZ1b|4V=n1EAn27~B|L~@pzyk5L-7>YzT67$VtK3@P>
zXgdXi=LtB`qG@=ID7U0-qt!GOL_$pTZBYOc@d7}lt~+%LTfJVq=l7E)veD&o-RcSk
zYyH9CIT4BN(sjIEAP)e@>4A~A4R`x|H!Rz3xj!@0poq{=SqWwaGebnc%vh&ssL^%$
z(=@9E_(*`}SIWxphRgLlW@-E=5qdoy7NU_1u<w2{Ia3he_vz_Oonc%mv#gc}v$G8Z
zV6)eoQ*bH7@ccZrl$Wbkw|iNPh~P1Rn{GD?(FhZ@U5>|xi*^72{+XJxqjhyXFwN$^
zWU|o`!4|J~S@9~Ru-olc5lvh6)Xa<#0M~V$g=mzSJ9@^(hMZoF<4JgLeB6%K)m=e4
zz2jjj)ntiaOGSmFk<<5KW_+(y*1WwZkr;6DDF~1UvHg*0Hf5Nx+2bh*Fl5{K4qyRB
zNu=#!A~9IVqbR@<h^sKo=7G7n#&s?ii~_^P%$R1z<xGZIWJoF1dconH=d0jdkX6;)
zy8<E$0A%riDI{6=5D{hO=jSt}YL^6v0ot@-oB{Cmp6Y7sTD`hxv9&}vs1y;fN!Rrs
zR&s$A1n34_2n2eBsB5p!hr@n<sagPlIwBkpQHp2-TUN;n%n_g)a6JtKz65Y|zu%9}
znwk}vXB7dk&$g8UN<u6f!dNs~HmB<s0USMO80a(%$7%0Rr*Ua!CX-@T;l;CHY0N5S
ztYxMFrK&{at;X{5%lAz)Sri}^jh10*>LP&7L%|?AgF(k>?@Om~ZgP_UWwwVi8I1wd
zDzyx<(zdbIwrNPysx?hJ(pX-8DIX&DGMbt?4dBS(a2UtJVaJyBrPKIge4GUs1alLB
zt3N$^hTE3q7$3@H(3(z@h-}tfuCMdga{v@k07Qs*y^h5mm?q995-cJEtZ8jMiNruv
zJpL|#tG`$l?qo{tyk+}12f$|jKmm78_xH=slao1teW?^akH=YnLDu#5p2v?z0pJtB
zLOdQ5;QX()jXQZ~#S=}#ZI6cqc&K#!a6UlJ4BSg5&23(9k0Lts+ta7(Yus)MxZSun
zJBv?8MwmqgS<~9G=Fjs0i6)a@$*NTi36bp<5kkxu25`&mW*c~<xm@iRMn<0G15o}C
z01z{b^-8H50JiP-`RMw@ggkG1p7~NOZr^hNj@OG|2oNIr+p?^VD-#oOryNIsr4TF<
zRYVV2srF*#S#<z<_Fs|$`iq$t1;|2x=qNPpo0XU^h46(!?PS}3^o)&-uQczaUWon!
X!j<yTg|~Rm00000NkvXXu0mjfGLVaj

literal 0
HcmV?d00001

diff --git a/resources/images/buttons/start.png b/resources/images/buttons/start.png
index b8aab9bef74af4e6498b4b0aa2221d2a77efe23f..7e728f252e27f3d3975592deb464a9ec492de0bf 100644
GIT binary patch
delta 408
zcmV;J0cZa11nvWnJPOwU01ejxLMWSfkwz$gYe_^wR5*>bkG)F*aTv$H_huJip669w
zQPA2_bCF_35e-2R2!VfqTSHrGTU%T0y%5#V(30ZNREu*hExm|}r>6eSe!u%Q90n1R
zC-fbj7aqQ!=XrqtR&c?*3PeUGJI%$v03xuY^h@{J?AT0C06`ILBM~%2KhNm%=JKz9
z`A~ecD5<gn0GzwQO&kCqha?yYZLnS-u+D3iXd_k3yq<gm%+-m~+G$iLqy?LN!X_=a
zwcEFALRuhJ3-#-UB~-Cr%D(M&^}>&HRX|x$G^X>NV9Y!OAb0|}KLI?70QWgtS|ps5
zJp(u(<WL6{9yC!s^9JAmy`weZg{RAZEWc@GL1k(?zTD9hVU&R}2b5A!#=xip#vBL(
zkksiug)^Xe)2uoL=eV5Cr(7H$vxc+rc=;UYv{X=~BXi0Zs9bzhX@wt@Z{K%4T^)*>
z)#3GVOJ6j%JsI25qh>i23nzOr1AsAS_<J^Yqc18io8d4;EMEWs002ovPDHK)LSTaG
CgtkHe

delta 537
zcmV+!0_Oeh1MUQnJPPUn01fH^kR->okwz$g>q$gGR5*>Llg&$1Q5eRbbLO5qR~>Wa
z_QBkn>7pzG(IBEg24tMe5e+m3T0}S-iNIP!{R`2eDE$YbMIVc3QEu)~h*Vh8rbR^1
zR#LR?%|7VP$2o6{nIv#xvR-%&hxa-BczHN4BO?4y@n#Qpc<v25<8=KqfE3O$i@mac
zGfr<KpAix4jKcslRNv9wwc&!-e(mB+sDJ43;Mwxi-vP$XT<2QnK3AA=lMw+RVzpFi
zr+dJOi8g_blZn*&gKx9;pfefFFW=t)xZP=Sb^1z2pg%%ug4P<Osdgs~tqF@C77<Iv
zV4bkGMYGY(R5tB~b1O3dV3?-KzG5AJ#qvW$Q5mJWqNsvWsl3qx0N%>LM|grB<8msS
z-V@HPTxuHPrqBd~8dPm8&d=K!=eV&|003BTEF9du-@Gt(u767aB7%4!aHzEpQ=?~y
zGycU0RzvZ8VS(PiTVkrJpsEU0rJ<?{N@-A%z<U@-5%?31fnCQ?$epeLC`c)P?-}9h
z=aKm9mODejbHM<Jy6San{x%ZbEvP(Fkb6Dk2gbew$V(}UK>Z^Xi^U-T?TyBsxITH;
zN?K;Ve>^4+=K=tuQp%UVeAaB4wrAa?iR`IQ!$&+DfRs|c-4skS`My8x`+ip=?{5M8
bPu@>2sTbY-cQO?K0000<MNUKnu0mjfCb|Md

diff --git a/resources/images/buttons/start.svg b/resources/images/buttons/start.svg
index 2c7a5522..535d1ff1 100644
--- a/resources/images/buttons/start.svg
+++ b/resources/images/buttons/start.svg
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg1872"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/mnt/work/svn_sf/ipscan/resources/images/buttons"
-   sodipodi:docname="start.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources/images/buttons/start.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16px"
+        height="16px"
+        id="svg1872"
+        sodipodi:version="0.32"
+        inkscape:version="0.91 r13725"
+        sodipodi:docname="start.svg"
+        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/buttons/start.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -172,17 +172,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="4.2356563"
+     inkscape:zoom="88.791208"
+     inkscape:cx="7.0178887"
+     inkscape:cy="8.2098974"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
+     inkscape:window-width="2364"
+     inkscape:window-height="1503"
      inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-y="48"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -198,20 +199,10 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="fill:#b8b8b8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.84880513;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 1.2050968,5.8329871 L 1.2050968,12.324209 L 9.3185041,12.324209 L 9.3185041,15.112864 L 16.007791,8.9817273 L 9.3185041,3.0286874 L 9.3185041,5.8173413 L 1.2050968,5.8329871 z "
-       id="path2316"
-       sodipodi:nodetypes="cccccccc" />
     <path
        style="fill:url(#linearGradient2953);fill-opacity:1;fill-rule:evenodd;stroke:#113c18;stroke-width:0.8566674;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 0.48356757,4.4222692 L 0.48356757,10.91672 L 8.4783011,10.91672 L 8.4783011,13.706762 L 15.069746,7.5725767 L 8.4783011,1.6165739 L 8.4783011,4.4066158 L 0.48356757,4.4222692 z "
        id="path2945"
        sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#bff3c1;stroke-width:0.91482568;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 1.3594592,10.504175 L 1.3594592,5.2964542 L 9.2337933,5.2964542 L 9.2337933,3.0285762"
-       id="path2955"
-       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
diff --git a/resources/images/buttons/start@2x.png b/resources/images/buttons/start@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..59dba3e90e794fbec9bcda49a54e9cd94196b21a
GIT binary patch
literal 871
zcmV-t1DO1YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^~_VK~z|U?UYSuBV`!Je@~LhM?amE+G(M!7h$QOU||n#0=?J|
zs67fI3RMqY1wj@Mf+tS}Po9)r*gcer3%lz<q*~jwP*I`cK|FY<m^4~5sm(TNXXbr8
zq?NSNZqu~sVg17}|Ce|E&-3G*hZi1og&Qr9yw>x2Y@q$=%5SB$O96;K(RN>uR}zEm
zvC4Yst9tXHMgc$s0M+Yu%DKTXR+9n1N=AtHM*&{76V7LS!+kAH1(2xF{Zf+nl{moU
zPQrZMmUg;Nla18dtTQ!W*RECfLI4s5d$OHk6v{tVu3E~Xo$4ENGuibM;q7$K7pRQZ
z3sS3?W6?9+h3^}DKVW<10p-;Sh-L{Gb64^|9hZ%O3|Xxf&TtoM6xHfuYP=f7)OgkX
z^}bI$89!9C<!T(_P+qL`64s2J>YH>k*~~Ej(E50s)Vt5%`vJZm5bVDXdvn5G)z>OI
zWMN_|yYssp1ZF;&c3v(lZG3tZ;9Q3AI7J4-L?<jEMnny>_O;$On+gCR-60}l;Send
zq955Q=YysK0MIEghG+*0yz^Mf`IwRF?{5wOKtc#cR7_G4c+K{EZ#EYIAO_m4Rj>Li
zoZ%umvlK#W5c(wq@UvLq=bHzhz_$?kRRDhQgz?hC?|(K0Kn(<o0jw*)H{$J0l~xOX
zAM9W34EW%E>7mu;_gaI<M4_fRT;K`lE|fp7sQzID(cA7$e%k#W@91}8r=4|_{zjU$
zK9!(rs`KCL+AI2O-Pu-CG$P1{g-q@(s*~^^MbyZQh(6aq|4HvJKXI_|ive46+iFTi
zRCv!_%DsP5SQ=;yfSq=-(H^VUneL*pvB&0I(U_7ELEbK8ax)LhpW6)V<vccLU1N3>
z5q+bO+4$r%xpM*Vi$3{V1vP<spf9?a{N2-L&jr9#6odyTFBF&a3-x3h22f>Ngs3qx
xzO|hDuHJm(CtzeWES~2sZ)O{=^}jAd{{UBCVcK12lPLfI002ovPDHLkV1jv`j&A?}

literal 0
HcmV?d00001

diff --git a/resources/images/buttons/stop.png b/resources/images/buttons/stop.png
index d65587b269d8360dfa88f743a412a15070a54d51..d88e22f2668c64933f7dc8a99cb62470270f7c95 100644
GIT binary patch
delta 285
zcmV+&0pkAC0@4B@iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyl3fBMt
z4c7reD4TeZMks&JNkl<ZIF0R+F^U2~5JjIe4lXOqh=GZ)2(HQAWY;Tr4lm^myoZsQ
zh{<5$bWL}4JF9^xYBVs3fgcJA3f`{|9~!E4U4Eex!RP%kfM0^t0!))+ts#8ZagAV;
z!DIoxeRHd-(R?;zm}RIjs0b>86a`Wg__9Pr*c-$0aQJ01@WDL*pr57;dOchm<Dv)$
zbWbPTb&f}{_W7G;dIMeo@X&)@p7ZbAr8H%U7eTGXi{PzARoPe71K?KWza&}t5Ps^o
j#;{Fcya3-cL35n}!yR8vnOcbv00000NkvXXu0mjf*O_!B

delta 286
zcmV+(0pb4A0@DH^iBL{Q4GJ0x0000DNk~Le0000D0000D2nGNE0CMZ(e32m=3h@8{
z4e<d`1O9iBMks&KNkl<ZD3R@sF>b;@5JjKOuAxW((Wm4F93fS%kRGK(bo3km2|Bu5
zg;PW+k&s14Vx--*cZLFtMN%Z`^Q5P*k>+bAd1|%ZLX1PsXadR?lP2FIjFLyt*V&Bw
zZWj?jRllby`#fj5UNc@U7Y3j|7*K3BIOp)*<D9!%&-rHY2!QQ$CMh){AcDqtqg2(|
z7_X~M=@0yuE*OB%!+~8<5WL6NhCm1bUzYf);zOh<*)-ig&*u-nxp3F(VX_QUiVVlA
k)xx&hFF(GOWf*HY0k}Seb8qA}aR2}S07*qoM6N<$g3Hu+xBvhE

diff --git a/resources/images/buttons/stop.svg b/resources/images/buttons/stop.svg
index 4490f83a..24be4962 100644
--- a/resources/images/buttons/stop.svg
+++ b/resources/images/buttons/stop.svg
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg1872"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/mnt/work/svn_sf/ipscan/resources/images/buttons"
-   sodipodi:docname="stop.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources/images/buttons/stop.png"
-   inkscape:export-xdpi="90.639999"
-   inkscape:export-ydpi="90.639999">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16px"
+        height="16px"
+        id="svg1872"
+        sodipodi:version="0.32"
+        inkscape:version="0.91 r13725"
+        sodipodi:docname="stop.svg"
+        inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources/images/buttons/stop.png"
+        inkscape:export-xdpi="90.639999"
+        inkscape:export-ydpi="90.639999"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -182,17 +182,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="4.2356563"
+     inkscape:zoom="44.395604"
+     inkscape:cx="14.383949"
+     inkscape:cy="7.0687265"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
+     inkscape:window-width="2105"
+     inkscape:window-height="1286"
      inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-y="48"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -208,17 +209,9 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       id="path3299"
-       d="M 3.4558176,3.36694 L 3.4558176,14.973645 L 15.005065,14.973645 L 15.005065,3.4243982 L 3.4558176,3.36694 z "
-       style="fill:#b7a6a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.19625533px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1" />
     <path
        style="fill:url(#linearGradient2965);fill-opacity:1;fill-rule:evenodd;stroke:#400;stroke-width:1.19625533px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1"
        d="M 2.6253205,2.5382265 L 2.6253205,13.424149 L 13.457353,13.424149 L 13.457353,2.5921172 L 2.6253205,2.5382265 z "
        id="path2957" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ff9c9c;stroke-width:0.81793904;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3.5972584,12.822792 L 3.5972584,3.5634348 L 12.810368,3.5634348"
-       id="path2967" />
   </g>
 </svg>
diff --git a/resources/images/buttons/stop@2x.png b/resources/images/buttons/stop@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..81d7cb9a47528bdd485dd34b7f7f92b79aa9cc3a
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10VGL8K~z|U?Upf4!!Q(vzch$W6(Dt?jGel$qKXZH#1)V@1Ut9j
z3Y>xgDO)d)127fT0U@Eb*nUnJn$T2niVTrp@V7ksDf0UqFFyqSn8?*UgQE^~i>-9w
z-S^-*EED+f7Px?`9PWYGcj!0dIov$L-By8fcmwuY9{wdEFi7B~Z0tBbiU2OhV@^gR
ztkzf&lu|4g3#<s42v!7Z%xZ1SW?zJ?=qat4DMhMOdG^LkmjD2V{XWOTA)*wb^}1Hq
zO|`m?V|KHw6sXbh|BLMs1cE>i2m(PM2n2y3(3psxrc)+qx{g~#^^IiK7-k}k0<KW{
z3LLa^zdA7t9^kp$*PbAPYrq}gen|wk)!{|2&MEZvw>-~Jm_wedB7fk2@d+|A#9E@g
RUs(VE002ovPDHLkV1m)nsX71v

literal 0
HcmV?d00001

diff --git a/src/net/azib/ipscan/config/Labels.java b/src/net/azib/ipscan/config/Labels.java
index 7a9169ac..7eb9cc76 100644
--- a/src/net/azib/ipscan/config/Labels.java
+++ b/src/net/azib/ipscan/config/Labels.java
@@ -81,7 +81,7 @@ public final class Labels {
 			instance.labels = instance.labelsFallback;
 		}
 	}
-	
+
 	/**
 	 * Retrieves an InputStream to load the image, specified by a key in resource file.
 	 * @param key
@@ -90,7 +90,7 @@ public final class Labels {
 		String imagePath = get(key);
 		return getClass().getClassLoader().getResourceAsStream(imagePath);
 	}
-	
+
 	/**
 	 * Retrieves a String specified by the label key
 	 * @param key
diff --git a/src/net/azib/ipscan/gui/MainWindow.java b/src/net/azib/ipscan/gui/MainWindow.java
index be8384ce..ac970b0a 100644
--- a/src/net/azib/ipscan/gui/MainWindow.java
+++ b/src/net/azib/ipscan/gui/MainWindow.java
@@ -19,13 +19,16 @@ import net.azib.ipscan.gui.menu.ResultsContextMenu;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import static net.azib.ipscan.gui.util.LayoutHelper.buttonImage;
 import static net.azib.ipscan.gui.util.LayoutHelper.formData;
 
 /**
@@ -166,28 +169,19 @@ public class MainWindow {
 
 		prefsButton = createToolbarButton(controlsArea);
 		ToolItem item = new ToolItem(prefsButton, SWT.PUSH);
-		item.setImage(image("prefs"));
+		item.setImage(buttonImage("prefs"));
 		item.setToolTipText(Labels.getLabel("title.preferences"));
 		item.addListener(SWT.Selection, preferencesListener);
 
 		fetchersButton = createToolbarButton(controlsArea);
 		item = new ToolItem(fetchersButton, SWT.PUSH);
-		item.setImage(image("fetchers"));
+		item.setImage(buttonImage("fetchers"));
 		item.setToolTipText(Labels.getLabel("title.fetchers.select"));
 		item.addListener(SWT.Selection, chooseFetchersListsner);
 
 		feederSelectionListener.widgetSelected(null);
 	}
 
-	private Image image(final String baseName) {
-		return new Image(Display.getCurrent(), new ImageDataProvider() {
-			@Override public ImageData getImageData(int zoom) {
-				String suffix = zoom >= 200 ? "@2x.png" : ".png";
-				return new ImageData(getClass().getResourceAsStream("/images/buttons/" + baseName + suffix));
-			}
-		});
-	}
-
 	private ToolBar createToolbarButton(Composite controlsArea) {
 		ToolBar bar = new ToolBar(controlsArea, SWT.FLAT);
 		bar.setCursor(bar.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
diff --git a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
index b65de20c..d57ae87b 100644
--- a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
+++ b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
@@ -31,6 +31,8 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 import java.net.InetAddress;
 
+import static net.azib.ipscan.gui.util.LayoutHelper.buttonImage;
+
 /**
  * Start/Stop button action class.
  * It listens to presses on the buttons as well as updates gui statuses
@@ -64,11 +66,11 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 		this.display = display;
 		
 		// preload button images
-		buttonImages[ScanningState.IDLE.ordinal()] = new Image(display, Labels.getInstance().getImageAsStream("button.start.img"));
-		buttonImages[ScanningState.SCANNING.ordinal()] = new Image(display, Labels.getInstance().getImageAsStream("button.stop.img"));
+		buttonImages[ScanningState.IDLE.ordinal()] = buttonImage("start");
+		buttonImages[ScanningState.SCANNING.ordinal()] = buttonImage("stop");
 		buttonImages[ScanningState.STARTING.ordinal()] = buttonImages[ScanningState.SCANNING.ordinal()]; 
 		buttonImages[ScanningState.RESTARTING.ordinal()] = buttonImages[ScanningState.SCANNING.ordinal()];
-		buttonImages[ScanningState.STOPPING.ordinal()] = new Image(display, Labels.getInstance().getImageAsStream("button.kill.img"));
+		buttonImages[ScanningState.STOPPING.ordinal()] = buttonImage("kill");
 		buttonImages[ScanningState.KILLING.ordinal()] = buttonImages[ScanningState.STOPPING.ordinal()];
 		
 		// preload button texts
@@ -98,7 +100,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 		// add listeners to all state changes
 		stateMachine.addTransitionListener(this);
 		
-		// set the default image
+		// set the default buttonImage
 		ScanningState state = stateMachine.getState();
 		button.setImage(buttonImages[state.ordinal()]);
 		button.setText(buttonTexts[state.ordinal()]);
@@ -191,7 +193,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 				statusBar.setStatusText(Labels.getLabel("state.killingThreads"));
 				break;
 		}
-		// change button image
+		// change button buttonImage
 		button.setImage(buttonImages[state.ordinal()]);
 		button.setText(buttonTexts[state.ordinal()]);
 	}
@@ -255,7 +257,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 				else
 					statusBar.getShell().setText(mainWindowTitle);
 
-				// change button image according to the current state
+				// change button buttonImage according to the current state
 				button.setImage(buttonImages[stateMachine.getState().ordinal()]);
 			}
 		});
diff --git a/src/net/azib/ipscan/gui/util/LayoutHelper.java b/src/net/azib/ipscan/gui/util/LayoutHelper.java
index 9515605c..d0d18947 100644
--- a/src/net/azib/ipscan/gui/util/LayoutHelper.java
+++ b/src/net/azib/ipscan/gui/util/LayoutHelper.java
@@ -7,11 +7,11 @@
 package net.azib.ipscan.gui.util;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 /**
@@ -47,4 +47,13 @@ public class LayoutHelper {
 		fontData.setHeight(fontData.getHeight() * 4/3);
 		return new Font(shell.getDisplay(), fontData);
 	}
+
+	public static Image buttonImage(final String baseName) {
+		return new Image(Display.getCurrent(), new ImageDataProvider() {
+			@Override public ImageData getImageData(int zoom) {
+				String suffix = zoom >= 200 ? "@2x.png" : ".png";
+				return new ImageData(getClass().getResourceAsStream("/images/buttons/" + baseName + suffix));
+			}
+		});
+	}
 }
diff --git a/test/net/azib/ipscan/config/LabelsTest.java b/test/net/azib/ipscan/config/LabelsTest.java
index 573e47a0..aba1ec56 100644
--- a/test/net/azib/ipscan/config/LabelsTest.java
+++ b/test/net/azib/ipscan/config/LabelsTest.java
@@ -1,25 +1,17 @@
 package net.azib.ipscan.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import junit.framework.AssertionFailedError;
+import org.junit.Before;
+import org.junit.Test;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URL;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import junit.framework.AssertionFailedError;
-
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class LabelsTest {
 
@@ -59,18 +51,18 @@ public class LabelsTest {
 			// exception is good
 		}
 	}
-	
+
 	@Test
 	public void testImageAsStream() throws IOException {
 		InputStream stream = Labels.getInstance().getImageAsStream("button.start.img");
-		// Now check the first bytes of GIF image header
+		// Now check the first bytes of GIF buttonImage header
 		stream.read();
 		assertEquals((int)'P', stream.read());
 		assertEquals((int)'N', stream.read());
 		assertEquals((int)'G', stream.read());
 		stream.close();
 	}
-	
+
 	/**
 	 * This test recursively processes all source files and tries
 	 * to resolve every label it finds.