From 82a48732f19d202bdeba37de8551957dc845e112 Mon Sep 17 00:00:00 2001
From: Anton Keks <anton@azib.net>
Date: Fri, 9 Dec 2016 00:08:24 +0200
Subject: [PATCH] use hdpi icons for results

---
 build.xml                                     |   2 +-
 resources/images/buttons/stop.svg             |   6 +-
 resources/images/list/addinfo.png             | Bin 871 -> 0 bytes
 resources/images/list/alive.png               | Bin 875 -> 770 bytes
 resources/images/list/alive.svg               |  93 +++++-------------
 resources/images/list/alive@2x.png            | Bin 0 -> 1682 bytes
 resources/images/list/dead.svg                |  90 +++++------------
 resources/images/list/dead@2x.png             | Bin 0 -> 1556 bytes
 resources/images/list/ports.png               | Bin 0 -> 766 bytes
 .../images/list/{addinfo.svg => ports.svg}    |  93 +++++-------------
 resources/images/list/ports@2x.png            | Bin 0 -> 1552 bytes
 resources/images/list/unknown.png             | Bin 741 -> 577 bytes
 resources/images/list/unknown.svg             |  63 +++++-------
 resources/images/list/unknown@2x.png          | Bin 0 -> 1127 bytes
 resources/messages.properties                 |   4 -
 resources/messages_de.properties              |   4 -
 resources/messages_es.properties              |   4 -
 resources/messages_hu.properties              |   4 -
 resources/messages_it.properties              |   4 -
 resources/messages_ku.properties              |   4 -
 resources/messages_lt.properties              |   4 -
 resources/messages_tr.properties              |   4 -
 src/net/azib/ipscan/gui/MainWindow.java       |   6 +-
 src/net/azib/ipscan/gui/ResultTable.java      |  12 ++-
 .../gui/actions/StartStopScanningAction.java  |  39 ++++----
 .../azib/ipscan/gui/util/LayoutHelper.java    |   4 +-
 test/net/azib/ipscan/config/LabelsTest.java   |   2 +-
 27 files changed, 141 insertions(+), 301 deletions(-)
 delete mode 100644 resources/images/list/addinfo.png
 create mode 100644 resources/images/list/alive@2x.png
 create mode 100644 resources/images/list/dead@2x.png
 create mode 100644 resources/images/list/ports.png
 rename resources/images/list/{addinfo.svg => ports.svg} (60%)
 create mode 100644 resources/images/list/ports@2x.png
 create mode 100644 resources/images/list/unknown@2x.png

diff --git a/build.xml b/build.xml
index c58f5c8c..9810f9ac 100755
--- a/build.xml
+++ b/build.xml
@@ -287,7 +287,7 @@
                     &lt;methods&gt;;
                     &lt;fields&gt;;
                 }
-		    	-keep class org.eclipse.swt.internal.buttonImage.*FileFormat
+		    	-keep class org.eclipse.swt.internal.image.*FileFormat
 				-keep class * {
 					% *Proc(int);
                     % *Proc(int, int);
diff --git a/resources/images/buttons/stop.svg b/resources/images/buttons/stop.svg
index 7b71c80b..95530540 100644
--- a/resources/images/buttons/stop.svg
+++ b/resources/images/buttons/stop.svg
@@ -15,9 +15,9 @@
         sodipodi:version="0.32"
         inkscape:version="0.91 r13725"
         sodipodi:docname="stop.svg"
-        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/buttons/stop@2x.png"
-        inkscape:export-xdpi="180"
-        inkscape:export-ydpi="180"
+        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/buttons/stop.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90"
         version="1.1">
   <defs
      id="defs1874">
diff --git a/resources/images/list/addinfo.png b/resources/images/list/addinfo.png
deleted file mode 100644
index 8cc74aea5132a1e8a3c8d735ea32ebb421204fc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 871
zcmV-t1DO1YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^~_VK~y-6b(2qQ6Gs@u-^}dHtiATmI`%p-u?ay?K?$<d12iWp
zKthNjxS*;+2n7%VA#v!n5(hYNDiWwI2gCt5ae)dB95~QYPE-{kt&%E%xRf|fVkcSS
zge=+hP7fp@;m?zvMk9T{H=n+lAzEuJSH8#E$pk$_2)dg=RA8J=F@yXOya|2*aQ(k4
zbJ6m8vKWx>u~L+it0Hb}&lg)%R#~uHlZZg!*XL0lsD-t%H#{@<dhd(N{@{v$e2<l&
z2KrmOoYwrNwD`*GMk57`21AGm0dv7)FQ)MOoxWycuCclF<C_5hpa4JxF1s64wy@b1
zCpVn|&8ARU4oeABN^I=vz}|!1tj*5;_1zB#OaL$n$6{Nh&A;v_y7EBhQT$fD1uq(V
z3kk8J15*fW?CQjDf0@?)nJxjyF=s13*8X|RuJxH584CYK$b7`4MC^T7O2niDXAG7y
z$&<c*(;njYs9}=rPHTerb_7#?2+jIFN@EpxjRvBHfw$!{m<%V_ShaS-AVe4XD#LhQ
zuOMY5(4uUpL;@4j(-^Ld;?>M7(n=w1+eq6AYjZiQFXX{E5JdA|7>wa5r$%Sh^HB9X
zp#1KRDWz~7XDJ|~6r|vo^?jH^Xx8Kw4a4Am91`!#U<_Huf%_3BWeiT_HVM#63Besw
z4z$Vn5-d1h0cRJyxPSbpSARBN^a&wP=(7vK$d-8b!#1rn0GL92@?_U>P#v9w*Bb<D
z*@hX%wr?yw<^AW1{&=b)SX+$5O!;<bN+Gkbrjs@X2TJ<k-9Mu}!J)dvt+OY;KXZ{T
zwtal{=^bBAZEJ)>ucB0F>P$QdH>nV39JP^2eeKFEUAo=y_XS71IJX{j<l8T;_)GwB
z@7mRMgCnJ1N5X#-<9I2i_=J%NRMU;x!&PK;m}F{}F?N1U`>LOJA3mx-2w2q3pDyj0
xuGhcSS{Jp}gb>n82zi=P>iRdQPLD6I{U1MD6YuN9sC57U002ovPDHLkV1hUuhXVir

diff --git a/resources/images/list/alive.png b/resources/images/list/alive.png
index b168860bb0cd29d21f7c3ec39ee6f892c0bc69d2..8ef9b0f082e538badbae7a7fe92cf91740dd0854 100644
GIT binary patch
delta 672
zcmV;R0$=^>27(5VZhwDCL_t(Ijir;zYZFlv#=n_6k9+5lq|MBvO>Hz(tW`nK`Y4qy
zMT_(=(4rMwNH>BD!G#5JBZxvlH!5yi2^MWc+~`6oMGKZL+%(iSq0rVgeI=7jCY^DS
z7&}&19{9mMaK3ZzJ$#2lFgQiI)F()E5MHGd93&9p@{%}HaetjB`3Cth(!)+b@av$e
z7n_J6zolwpGQPJnY{U~#6bi}&6bmbuotZ4m%}sAsJh#uzKKv4BplKH@aC9=>-fcA{
zItZmA7!yIM2+C?u5o_y9c=hJ_y5khj6w|}w0KfwPCut+`eO+dAqJuD26W3sMBqWnb
z^q;>H7B%HH4u4+N0Dz~F%RQnRI?%lPkU*IP$|SID&^pydZOJ`2ak5L(l+ZN*;6;TE
zG$#*-*|yv0UtdtoMTwy2_$fx1JW&0DBpx%&7Vcjn+b$zL{R5e~9Ev3u01%Bt;R!H+
zAztuBPM`R^fX0SAtfmmc5n3JCs*RcSG8Pv$5H(a7rhkU0p&{93qJ4i1qRO_=ol^x)
z7MJ{@-<r+jkj>-*rXYleY3VRb6;Y$wK&Ao;c?Uj$fU&!qyvzG3HR5@H7z(0DV8(P<
zF&(B=qjnBOWmE)isyYL{{A^QB+l16T1z8sA#Z^M}+_H3hN>3DRr*sbh_|oKqSzakW
zvf5n-0Dl;h0>x%b59F)Pn)m+O_|(?ut(SEp6+Q|#*7fYW)=s|^Z;b@S)^BlUb-r>x
z_4K=4aC!mwfn5N=$>(lgmxz4xNbD$0G`7eMVI5jXLf+e`q`rPAEv_xUD7d9Tj1Jj5
zmZ=_RheF`DdR3;LCLF&DzQ2+$7sou$9YN~O{27k=|Bau>e#g%gMjf^Q0000<MNUMn
GLSTZwt2C$p

delta 778
zcmV+l1NHoZ2I~fpZhz=WL_t(Ijb)QbXcJK!#=kf3y_q+enI@BEYMQpzE-tn1;&Kxe
zinxFW5e1cE4=x~HJPCqcJP3l~au5$H9z2Mmpn?}G9z=z<E_H9MZH+e7n5IdSCX?sE
zCM5cY@9^OJeti7-KO&_>`Itt>ddjq2AY`>$$kkEKe<_STpMT0{ZcBoz>9I?Naz7~o
zOryhAsCt<Tb8Vz$x!3V~Q56cqB?V;CaSVTbm5;@S`jhF&&6C3yKU4rrqr)VW_c;yA
zsv}K{)%GP4zi9|xqj~5$hY%b>=ZHr8(baX!ji)CUWIvsI3jhiL5LLSvoVn1cZC;`t
zInW5=4`ZkpE`L*NYa6y~-9;l|>s9B$Qvv`KkKMVFdCX1qEz7mt+ah?-701i>nNmm>
z9J<a+u=%a6sBdahVu|qq0HEBvva_aPQTx2Q0C_X$V#=kZz`qT2T?OY9rsXA1-}H(|
z>g|1n>H1n<AWTx!2O$J>U4<x9DwV~+=P~?_r%_yZjeiryx3o*Y$Hw+C$x!#YXB-0`
zKfz~v;177<vppF7o<#rW7{(Km2n5Y(8E9+{qGe7sh|rMDyGt1~*2`ToD>j-$Y&2PM
z6AC2=IaUb}44Ke0j?}~ygkX}>f}v!Qdnl|N{vF0C9LGY)u@I`B*7V!(GdQN}5}-$s
zoZOi*K7U9}uu@pnSVh=z{;CM->U%6#*x3vrq+7{#pB`Q_Uw!Ov8kYbdbY5W&mA7y#
zL=z*Ji1p+a29yb3Rn@i9DX-djJTvlhhH6eU65XSfmKF?}2!u@d0|s6X^~r}X?iLQr
z&L%94o!Ec$*qKuAW9_x;ZgvmdyE7O!=LFh_ZGU@7(AJ?D65rB;^7^wUn63WE9G)xF
zDrb*o)<(`&d?o<6f8}!XyTOr19}}+mB?&c}Rhi9lZoT2=n=O*}2_;1-J=qYcxv*i+
zUilxOI5*Cp-55_Kc1S4~Nht{-q=yjFYkR#{w;w$8qul!ke(@9wP{g6300000NkvXX
It^-0~g0mcM_W%F@

diff --git a/resources/images/list/alive.svg b/resources/images/list/alive.svg
index c76660e1..1efde9f6 100644
--- a/resources/images/list/alive.svg
+++ b/resources/images/list/alive.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-src/images/list"
-   sodipodi:docname="alive.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources-src/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="alive.svg"
+        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/list/alive@2x.png"
+        inkscape:export-xdpi="176"
+        inkscape:export-ydpi="176"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -101,28 +101,6 @@
        x2="11.453006"
        y2="13.71922"
        gradientTransform="matrix(0.922118,0,0,0.922118,0.175474,0.130764)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2825"
-       id="radialGradient2831"
-       cx="4.9103961"
-       cy="3.521287"
-       fx="4.9103961"
-       fy="3.521287"
-       r="1.7569307"
-       gradientTransform="matrix(1,0,0,0.230769,0,2.708682)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2835"
-       id="radialGradient2833"
-       cx="7.635891"
-       cy="7.5757427"
-       fx="7.635891"
-       fy="7.5757427"
-       r="7.6809406"
-       gradientTransform="matrix(1,0,0,0.979472,0,0.155514)"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -131,17 +109,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.0197962"
+     inkscape:zoom="62.784865"
+     inkscape:cx="1.405341"
+     inkscape:cy="8.5437536"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="3200"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -157,16 +136,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2833);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2809"
-       sodipodi:cx="7.635891"
-       sodipodi:cy="7.5757427"
-       sodipodi:rx="7.6809406"
-       sodipodi:ry="7.5232673"
-       d="M 15.316832 7.5757427 A 7.6809406 7.5232673 0 1 1  -0.045049667,7.5757427 A 7.6809406 7.5232673 0 1 1  15.316832 7.5757427 z"
-       transform="matrix(1.065189,0,0,1.065189,-0.150507,0.235349)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:url(#linearGradient2786);fill-opacity:1;stroke:url(#linearGradient2776);stroke-width:0.99201567;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -181,15 +150,5 @@
        style="opacity:1;fill:url(#linearGradient2801);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.5407355,6.7873036 C 9.1751305,6.8110199 8.8203305,6.8737522 8.4745365,6.9890169 C 5.833184,7.8694678 5.6597197,8.3365829 0.83824667,7.161914 C 0.83292457,7.2695189 0.83824667,7.3700027 0.83824667,7.4788921 C 0.83824667,11.128625 3.8550112,14.106615 7.5812348,14.106615 C 11.103631,14.106615 13.989222,11.456573 14.295408,8.0840321 C 13.322861,7.5669099 11.368764,6.6687221 9.5407355,6.7873036 z "
        id="path2788" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2831);fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2815"
-       sodipodi:cx="4.9103961"
-       sodipodi:cy="3.521287"
-       sodipodi:rx="1.7569307"
-       sodipodi:ry="0.40544555"
-       d="M 6.6673268 3.521287 A 1.7569307 0.40544555 0 1 1  3.1534654,3.521287 A 1.7569307 0.40544555 0 1 1  6.6673268 3.521287 z"
-       transform="matrix(1.845112,-1.498211,1.41749,1.950184,-9.74995,3.740622)" />
   </g>
 </svg>
diff --git a/resources/images/list/alive@2x.png b/resources/images/list/alive@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e6e3d9cec8ab908ca6c59ca95b1cf5ca397354b
GIT binary patch
literal 1682
zcmV;D25tF?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000{i000{i0R)_2F8}}l8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11`kO@K~z|U<(FG*99J2~f8V*x?#!&cyLRk2cI~8+b5WBf5vV}~
zq&_7rRIMl?66Mk&QSpG_0mNHDxK$BSsDwlmfhZ3s2n0&F6{RhHf%c(Qs!}PXAq|O}
zIF2uMeb0I?Uhf<p)?UwgcZ16-M;gt!&G-L(=ljml8DWbh3?Dz}oIEVZ{Xj3!1Edg{
za*A=3Tyer*3W@SC@BeCft9Iqi!$T?zuRjLzeH^=MA8Cb6hG=6cm6oYg${<p;rc^1C
z=!`h~bYb>q<Nq^&?>~M-iFzJ5C?d3V^pn|sHyu4Y3ER^cqpOcqK*ZAg6w{L<+`4(i
z6$;COP!z3xl%JS=8qQWe6hIh0@kN~a1-N9G>7{S)QQ9(H7^^Wx)r5`F*iCJv9Pf?%
zlegadyDJp)g7B(YwV%sPo%&!)073A?Q-VCJjB$N?@0X6A!J6@PaT{+pfigz1S}yVO
z@b9=aJ_^EBYxE~_*BT*oypi(1@_CdxZ4v>y4nHL6&i*=2t&NG>*5bx$d_Tdx2R_1b
zF~|Eelbw;0k5@WA_8aEjs5AvgrM`N=X*n;(n4Je6l=kd)tX0@`kMAI6V)Lxs2#fU$
z`}W+!<n#oyi?aj9$hOMNh4XO$wO)yod(LS|_6{DEbVpB2Ove%~*0y?0topQ?=OrwU
zo%k{xot-$5ui5?IJk$UXrk^~9mIs3NF1mX6ZZfjrWnCytlTg^k)v-p=7KS|h;3GIK
zN|ZU-0N{-KhSNgt-A6FSG&QoNP{fk72Dt`xc>iGr`gal;Ii5K5?L8X+U0+W*rH*^a
zcCy?0HaxXWJT*-`wM`&5L5T<=!hMJC11(e%>d_j2FXdxsNoKou)#BM;q($b}lC(Cj
zF$Y98cKW@0_k&hAc%%m4wA$yiB9q<G(nvfRtAN#~ab7*3Y&vDK?HRJ^EEsjqdY=(3
zy-ox_NVPm%Y_tBg_Tqe=(HpZ&O)inouaHV5=;=+<Kagc$XD31E)j^~)X=V$H8IFG^
zWcayd<BZ<!aJ>E25}A%wIy+Nzb*Jd=Nw+-la=9W`-<{^tJL61_FCqed;1L8Ke&8`T
zyUdM|8T??Bp58Qrd%EenD}%L~wy+(Pf}-sPt{bP^5+YQJ6~@OF7#~{zKtxEVleDLO
z!c-Dt6@`46nGbHWFrVMpMoQ|$gTNyQY_%SGR8}k8yfMq%Ope~Z43Tr71*}=DhCtLr
zqy#S^6pI^6<(y+-p}@jIfmTIpg&){W;$BTW-k<a>#bOz!6;4Z$zYfg<n2MG$QG%C@
zV6mlELor4*@!Z1?t1A%ikB^T`-*hM$0~~<SIvTDh<D8il$Zkp8S{*ZPH;H@A#Y2mD
zj^)*Ypw)0KgvHCJN6~UI=SDF`-ANY!&(j2<M;Ll*?*w6(AV{sf!^Ea>k1*vCgbA)p
zT>~W`>Q6NQ0H@TiBkkzyZ+US6AdxTx;f7EcCaT6$n*{5|t99Qu{NasZhcM36#4B|G
ztG+vpR=4K#CFcjWxp>mH^sG*By`EYh_waqo-!5Gszfuq)_g((+^Ku;kum8B<lspxg
zNRqpzQMx`9N#C~gEQ~FA4KB4YH<`4|EX{N7!pi^`Iik<RZPzX&Zv3^k)xakQOLF^Q
z_qHs{GgSyb@ESdftwLQMtbwgVB@%{wsmRc|Q!aARZHPX_^Uu^>%i^xOiWfYIme;4v
zzv((yB%MjN^sIi_*YY3+=Xr*?+#*Bge&R~2rN}w=1<pTvd2?tRZ^aJ`bx3*Tw+P2N
zY>(?(-7hP77du#*96X!0pVq>g@4dq>U->;i&PDD^y!gzYo8?yX|AG@Iv|8GC(&4^^
zDA}Ff$F9U6QnC2HZF%q{lA4j}G0wdDN4Jn)65uM4`V21({i~@?OMvzA(DyzH@<ZSl
zfNuhKXvYERPIZz^wd4B<R$ZCpa*m5*?{azK8qPTonZZRrAX@k-FP$pgN#ei!nyrHj
z9fjz#R4)>{Tg)l|!{A;(m(KFS$=h2oy)}S%`Sef^a2G1tK|~7eCMdfp+RSy%4y}A>
cd;j<4KN5u4rrTJWCjbBd07*qoM6N<$f<&AsW&i*H

literal 0
HcmV?d00001

diff --git a/resources/images/list/dead.svg b/resources/images/list/dead.svg
index 34412e9b..077cfc62 100644
--- a/resources/images/list/dead.svg
+++ b/resources/images/list/dead.svg
@@ -1,21 +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-src"
-   sodipodi:docname="start.svg">
+        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="dead.svg"
+        version="1.1"
+        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/list/dead@2x.png"
+        inkscape:export-xdpi="180"
+        inkscape:export-ydpi="180">
   <defs
      id="defs1874">
     <linearGradient
@@ -98,28 +101,6 @@
        x2="11.453006"
        y2="13.71922"
        gradientTransform="matrix(0.922118,0,0,0.922118,0.175474,0.130764)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2825"
-       id="radialGradient2831"
-       cx="4.9103961"
-       cy="3.521287"
-       fx="4.9103961"
-       fy="3.521287"
-       r="1.7569307"
-       gradientTransform="matrix(1,0,0,0.230769,0,2.708682)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2835"
-       id="radialGradient2833"
-       cx="7.635891"
-       cy="7.5757427"
-       fx="7.635891"
-       fy="7.5757427"
-       r="7.6809406"
-       gradientTransform="matrix(1,0,0,0.979472,0,0.155514)"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -128,17 +109,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.0197962"
+     inkscape:zoom="44.395604"
+     inkscape:cx="6.4711238"
+     inkscape:cy="8.1147734"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="3200"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -154,16 +136,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2833);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2809"
-       sodipodi:cx="7.635891"
-       sodipodi:cy="7.5757427"
-       sodipodi:rx="7.6809406"
-       sodipodi:ry="7.5232673"
-       d="M 15.316832 7.5757427 A 7.6809406 7.5232673 0 1 1  -0.045049667,7.5757427 A 7.6809406 7.5232673 0 1 1  15.316832 7.5757427 z"
-       transform="matrix(1.065189,0,0,1.065189,-0.150507,0.235349)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:url(#linearGradient2786);fill-opacity:1;stroke:url(#linearGradient2776);stroke-width:0.99201567;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -178,15 +150,5 @@
        style="opacity:1;fill:url(#linearGradient2801);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.5407355,6.7873036 C 9.1751305,6.8110199 8.8203305,6.8737522 8.4745365,6.9890169 C 5.833184,7.8694678 5.6597197,8.3365829 0.83824667,7.161914 C 0.83292457,7.2695189 0.83824667,7.3700027 0.83824667,7.4788921 C 0.83824667,11.128625 3.8550112,14.106615 7.5812348,14.106615 C 11.103631,14.106615 13.989222,11.456573 14.295408,8.0840321 C 13.322861,7.5669099 11.368764,6.6687221 9.5407355,6.7873036 z "
        id="path2788" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2831);fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2815"
-       sodipodi:cx="4.9103961"
-       sodipodi:cy="3.521287"
-       sodipodi:rx="1.7569307"
-       sodipodi:ry="0.40544555"
-       d="M 6.6673268 3.521287 A 1.7569307 0.40544555 0 1 1  3.1534654,3.521287 A 1.7569307 0.40544555 0 1 1  6.6673268 3.521287 z"
-       transform="matrix(1.845112,-1.498211,1.41749,1.950184,-9.74995,3.740622)" />
   </g>
 </svg>
diff --git a/resources/images/list/dead@2x.png b/resources/images/list/dead@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..452adaad5d63303674a0031255ba8e403c540f8e
GIT binary patch
literal 1556
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
GLSTZshT=v5

literal 0
HcmV?d00001

diff --git a/resources/images/list/ports.png b/resources/images/list/ports.png
new file mode 100644
index 0000000000000000000000000000000000000000..d33e5226e75c70fdd968167016d967acf744acf0
GIT binary patch
literal 766
zcmV<a0s;MrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10((hBK~y-6rIX8R6Hye#zqxbg-nn_qOfpHDq$#vw8)zYdFBHUO
zl`i@R2!gMbbR)PBTv!k{f*=%hqu{b4SdgO2t_lGymQoj%s;x1tq_Gc@W@ehnjEgoU
zN!|Iu;a)E1_i@kR90~1`($@o{3a4Yf>z#(=Ga^fMnUe4Bp7&DW)fdYXaN2<8rT1De
z=`rbpYOuac&eRhb9YS!Z3WK%nV0H2LZee+&;<)x`;aUA-n?cvrP=a%RzWbD!NDf3~
zl`#m$pfU!P^Zk=C?3Al`KRLT&S@z|XiFzIY2mq)-Zz_E<5>E|8WWg8&=ldY%5C>+0
zG4%E(apl$}T?E*>q1y-n0O`4@USuIQn9iE?U(n$%IEUaIeSImMJwF)ow7?wzAhM8e
zq=%xqXaPH+)^~+coV$<{3daoqAXLT~GZ~iD7O)kvYzNE5B7T-iu=n-=08vu|;KeWw
zLO~Gz^kWIpau|td1bQ$Cl_}V+?Bd({8cJJRFf|P^U5BY@IF?RhAd>+Xypi3sgH%>f
zg75bfHcBXLl-h<uCIoTAKuptM9vCo1LDjMV`1I>zR7k^XOowIRbqo{~N)a~<Bn$)b
zjxd5DKynuVfVeJRHP)<}OvoY373B!jjD%rees0mK+0GLHAS+Mp73xXPyII5m0Ks`%
zawlBbse1YR=Y=m18gBuB0>C1*?&ZqJ_NTgreN9or0dd&0X6-RuNAcIX`+9PE)p6_*
z0Djvp0FZJI`CZE7``HuyYAW5ubuA1{2-ww{J2R8F%jL~Cl5LO8jiYvCnVLF24ozub
wL<9rFgh(0q-XF(uW}Uh>we$$Z&iwz@UzYsIVg_}ioB#j-07*qoM6N<$g4vo+UjP6A

literal 0
HcmV?d00001

diff --git a/resources/images/list/addinfo.svg b/resources/images/list/ports.svg
similarity index 60%
rename from resources/images/list/addinfo.svg
rename to resources/images/list/ports.svg
index 81e1f2d8..ed2d66e6 100644
--- a/resources/images/list/addinfo.svg
+++ b/resources/images/list/ports.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-src"
-   sodipodi:docname="stop.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources-src/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="ports.svg"
+        inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources-src/start.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -101,28 +101,6 @@
        x2="11.453006"
        y2="13.71922"
        gradientTransform="matrix(0.922118,0,0,0.922118,0.175474,0.130764)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2825"
-       id="radialGradient2831"
-       cx="4.9103961"
-       cy="3.521287"
-       fx="4.9103961"
-       fy="3.521287"
-       r="1.7569307"
-       gradientTransform="matrix(1,0,0,0.230769,0,2.708682)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2835"
-       id="radialGradient2833"
-       cx="7.635891"
-       cy="7.5757427"
-       fx="7.635891"
-       fy="7.5757427"
-       r="7.6809406"
-       gradientTransform="matrix(1,0,0,0.979472,0,0.155514)"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -131,17 +109,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.0197962"
+     inkscape:zoom="44.395604"
+     inkscape:cx="7.7943455"
+     inkscape:cy="3.9238194"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="3200"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -157,16 +136,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2833);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2809"
-       sodipodi:cx="7.635891"
-       sodipodi:cy="7.5757427"
-       sodipodi:rx="7.6809406"
-       sodipodi:ry="7.5232673"
-       d="M 15.316832 7.5757427 A 7.6809406 7.5232673 0 1 1  -0.045049667,7.5757427 A 7.6809406 7.5232673 0 1 1  15.316832 7.5757427 z"
-       transform="matrix(1.065189,0,0,1.065189,-0.150507,0.235349)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:url(#linearGradient2786);fill-opacity:1;stroke:url(#linearGradient2776);stroke-width:0.99201567;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -181,15 +150,5 @@
        style="opacity:1;fill:url(#linearGradient2801);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.5407355,6.7873036 C 9.1751305,6.8110199 8.8203305,6.8737522 8.4745365,6.9890169 C 5.833184,7.8694678 5.6597197,8.3365829 0.83824667,7.161914 C 0.83292457,7.2695189 0.83824667,7.3700027 0.83824667,7.4788921 C 0.83824667,11.128625 3.8550112,14.106615 7.5812348,14.106615 C 11.103631,14.106615 13.989222,11.456573 14.295408,8.0840321 C 13.322861,7.5669099 11.368764,6.6687221 9.5407355,6.7873036 z "
        id="path2788" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2831);fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2815"
-       sodipodi:cx="4.9103961"
-       sodipodi:cy="3.521287"
-       sodipodi:rx="1.7569307"
-       sodipodi:ry="0.40544555"
-       d="M 6.6673268 3.521287 A 1.7569307 0.40544555 0 1 1  3.1534654,3.521287 A 1.7569307 0.40544555 0 1 1  6.6673268 3.521287 z"
-       transform="matrix(1.845112,-1.498211,1.41749,1.950184,-9.74995,3.740622)" />
   </g>
 </svg>
diff --git a/resources/images/list/ports@2x.png b/resources/images/list/ports@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..17e507154a65decae7844d8da7a33a061872c948
GIT binary patch
literal 1552
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
C-t55u

literal 0
HcmV?d00001

diff --git a/resources/images/list/unknown.png b/resources/images/list/unknown.png
index d949a3ee5097e8a0c5ffff0946f9178ef1cd6b89..ede13a80e8bc4c04e24e49a393f3c2851f5404b2 100644
GIT binary patch
delta 478
zcmV<40U`e71;GT6ZGQp2Nkl<ZIE`auKmf*Qf93#AZuYugzyB!-3UU1U@$*09i`T!H
zfB*hJ<>AvG%~!87{9-@@%rHhm5UVMl0Q>rg2o-rbIUc4T-~RnkR_0~T%2MNd^Y(|y
z=l6ef?%e;g2HgNg7$Yu_#gd7c`2Zs`<IB%q{`dX(`S$`7Gk>!N2Nz36SDOxhM(%}A
zKc4@TK5&)c3$g($Fa`(9pKD)!{*U?1{&(G)tqgx5qJIvA2C@V`c=*jtQi9|6wa@?5
z85n+_#cIH;)eIjQ82+wCmUOpeko^7YpNWJx2gCChKUkTVe&0v;0t>nT4EQ-Sh_iEX
z98J$q=bt|7-hb!6e;Ip^A7^++lmVeG4E)SI948W!)MSnwfA#(DgKyh*@Bh(+O)V2P
zK~6!=7C%2($=kO+{ycyF{Wg>B-=lE36f1}i=e+ykzWx6|Z}!i|#tf|Z)M9nP-#`C(
zSXmhvm>C&=o;}O(8=nDK!{Fb){~vSnPICSG|NjFa*H>aS;QxPyng9O&ll{-Y@Pv>7
zSV2Sp`{x}SbpHo<v40_?7Hb$VFfcGEEAtX%8CEZ_vN3IGY`&nz#>RMuC{ri_057km
U&cH=;4*&oF07*qoM6N<$f*YFgh5!Hn

delta 643
zcmV-}0(||!1my*gZGQq{Nkl<ZIE{UgO-NK>7=@pEzk8i=bdprkaWYUB;x84NM2n)N
z@&|>cQ47jVm>@ySqD_WT%UZO^Fc(2&5{$Emf)>?6%Adr<G=jvGX%dUbF~`xtxpQv|
z8<}+MU7q)x=R3TgWEcjq(@?8g)db-Zia4|uHgdHHMnuQ^Ykwi!yQa}QJQ5DY`lVRF
zc}GIEEJV-IV_BBc(lnFJmPkZ5n40qQ{Kb4=bZlvHdBvz0eIK6R0%$&^?p968#~U}x
zQnKtx8&F+0@cWlp@CSMM`iJqvvpByL(6YzJ!#aQ*HCimn702luYcxDC_>-2_F)m%6
zVE+4h>#}`Gl7B7Jl2udHa6Ova0LZdbqpGs(^DPq$hUxB}q5NPAmgHjIyj|F6WZR{K
zB(;0ooh1NDbfIZ_N1uD9Ho=@$8C(ga*|Uo=Fqr)^9J<h)Zw3tjuMa8<_DH~SU~&U+
zzc<ta^myEzSAmLeUq2Q0zq*&xajnptp02Rq*YG@DB7ec0L1u;>{t~6l-w1H3O3gEw
zm9g8m%6HgoiTM4?+_^i;tT%<a`c{Nc0ziqw+2&QYq=DpQwY{+^*J`(0&~<|c59jdB
z?WC^$B0`7&aKhni^Zs*#*b#!gl7uud;YZVS1_pm~_M8hL#1e4Q;cOd<dgB5@p~#1>
zuFpjgU3?Z1U6S()4j_a8sE!S93jpem9L@~tDCV$+@@`}@0*%ic&bEQg#_a&Y<tnnS
zx6yDm4Xpz1ct$y%xaAeqWCb3_-Nh9ZdAjLLf375(tPx$3Q&TgyhsP5i^{ws)@VGmt
dfxQ2<`vXBR<FQTlxD5aR002ovPDHLkV1oMuLG%Cs

diff --git a/resources/images/list/unknown.svg b/resources/images/list/unknown.svg
index 7e8e04f3..b442828e 100644
--- a/resources/images/list/unknown.svg
+++ b/resources/images/list/unknown.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/list"
-   sodipodi:docname="unknown.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources/images/list/unknown.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="unknown.svg"
+        inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources/images/list/unknown.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -217,17 +217,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.2698308"
+     inkscape:zoom="62.784865"
+     inkscape:cx="3.6698457"
+     inkscape:cy="9.6823155"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="3200"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -243,18 +244,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <text
-       id="text5336"
-       y="16.115181"
-       x="3.3766122"
-       style="font-size:21.2743187px;font-style:normal;font-weight:normal;fill:#acaa94;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Arial Black"
-       xml:space="preserve"
-       transform="scale(1.013346,0.98683)"><tspan
-         style="font-size:19.14689255px;fill:#acaa94;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="16.115181"
-         x="3.3766122"
-         id="tspan5338"
-         sodipodi:role="line">?</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:21.27429008px;font-style:normal;font-weight:normal;fill:url(#linearGradient5334);fill-opacity:1;stroke:url(#linearGradient5348);stroke-width:0.90000004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Arial Black"
diff --git a/resources/images/list/unknown@2x.png b/resources/images/list/unknown@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a77c2093ec85cca26ab0575ace5d3d08b2c37ace
GIT binary patch
literal 1127
zcmV-t1ep7YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11LR3WK~z|U?Uzq%6m=BGKW}Gt*X}|gq%>`5)P!P7Led%~sBLwd
zDu03&DwITsh6^5yK{QcB`~w&hqk%*v9(vMnki;lxXd4x!Xwd*!i<RyHjRq)*rL^6G
zl<v;V?|EoT2wBQbw{Y@%ndD7=?|t&-ec#Lo6R4?)X@M)jCZoF6Q)-Pz*eDnS<5$lJ
zM(H$$-G@4yPXIGf&g&(ag0UEOX}-PD2wOal0#BiIPL#5FGbk#K5RC?LT|@ssibUcP
zzn&Px^Aw}}XuHmu?~l@(6Ts7r!41Y}vmLT@@#0d6#Y!kH$>a2y%k-Te!SxJ<g?W_D
zi4YE3ob9>HN4rmPEIx=TCoiX*ns}U{Yyj-cR5~4C{rYk#FQ37ImNWeFbDs_-({k-2
z2!$<O(QucnSzXH3Efwtg;1q`r_b<o`26uq-!lXO!Or!mhXV_U>5}~JO7}tOr`aMtD
z44P0QBgU9{23h5LQdnI*n-@2hkxY*8{HEWvf6#S2oY_Z@a&b}}7}vRT!>A!4s_)J^
z@9k}l<6L`xWsKKcf(L)<=({iWZ~+zN5gu4HQ(C{d5VAB>2kEbF1`x;;REUF|240!*
zk6ZP5tGDO+;sE>GNeY4O0G%h20L&>417K9|yjgL$K?nBia}NV|XOlqik{~#a0^p6A
zFrawZoX^++KQbz70m{mv0Q~va@F++?|G4D<OX{pu2+tN2gthje0(yH>96LUw2)(ZB
zw%<~KW%br-K|TwG0<!t#3Q?2~KmMC^+6c<Fc!rsoGCf{zty})6?LM(2WR7>-ub0l(
z>89sq>m$`ct$EP?f*aU7lP0ubCN(@}H5rvp!(l7%<{On#eosDI-|FJGt|Y*BcGz79
zXtw#XCIx6*YS$RU50-7&+qYH8+_}@)^7;u*b`N1xzP&h{Zj8qn_LDQ~8E9%Eq)IbF
z@YT%=q@p69x8La^kr+bIukV<aZtz>&7l8AxRS(RssVQRN!UFc~KTBul00IYtQFl#S
z8!5lV!N&{)ka`2u))oTL(%OT-m9#idwNJA6Xx^+P#Q;S`5z=WxU*8A{-R<pMm~3%h
z0D|TNMDi?Bsj)4qT*{@mF94NM$B2OE=@=Alt^mIGz|LLWK3qPP07^HoJdsFZ#@=`a
zx^o5awTM>6nCV2v&J00I2ZOl+WIY2<E(`7@Y!6zFJs>H2K*RRH(wP0_Z36(E4^UY-
zi>j(whzJPta|Q4{ggdt13&4t%hpxII7v=m#l&gGq;K-3)6woR1q91@1z<ckXy!vA@
t9=k07YGeb-A{gC6A|M{ea|QTc{{ckinLpDP{(b-e002ovPDHLkV1hz626_Mh

literal 0
HcmV?d00001

diff --git a/resources/messages.properties b/resources/messages.properties
index af326e98..4462cb5f 100644
--- a/resources/messages.properties
+++ b/resources/messages.properties
@@ -175,10 +175,6 @@ button.insert=&Insert
 button.add=&Add
 button.check=Chec&k...
 combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_de.properties b/resources/messages_de.properties
index 173c62f7..681972de 100644
--- a/resources/messages_de.properties
+++ b/resources/messages_de.properties
@@ -154,10 +154,6 @@ button.insert=Einf\u00fcgen
 button.add=Hinzuf\u00fcgen
 button.check=Pr\u00fcfen...
 combobox.feeder.tooltip=IP Auswahl. \u00c4ndern Sie dies, wenn Sie eine andere Quelle f\u00fcr IP-Addressen zum scannen ben\u00f6tigen
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_es.properties b/resources/messages_es.properties
index e42821c8..f25d540e 100644
--- a/resources/messages_es.properties
+++ b/resources/messages_es.properties
@@ -147,10 +147,6 @@ button.insert=&Insertar
 button.add=&Agregar
 button.check=Chequea&r...
 combobox.feeder.tooltip=Selección de IP de origen. Cambie esto si necesita escanear otra IP.
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternativo)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_hu.properties b/resources/messages_hu.properties
index 52c5bac7..9e5868df 100644
--- a/resources/messages_hu.properties
+++ b/resources/messages_hu.properties
@@ -155,10 +155,6 @@ button.insert=&Beszúrás
 button.add=&Hozzáadás
 button.check=Vizsgál...
 combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternatív)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_it.properties b/resources/messages_it.properties
index 9f0ad2f0..7f9da076 100644
--- a/resources/messages_it.properties
+++ b/resources/messages_it.properties
@@ -156,10 +156,6 @@ button.insert=&Inserisci
 button.add=&Aggiungi
 button.check=C&ontrolla...
 combobox.feeder.tooltip=Selezione sorgente IP. Modificare questo se avete bisogno di un'altra fonte di indirizzi IP da scansionare
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternativo)
 pinger.windows=ICMP.DLL di Windows
diff --git a/resources/messages_ku.properties b/resources/messages_ku.properties
index af2174a9..719b2306 100644
--- a/resources/messages_ku.properties
+++ b/resources/messages_ku.properties
@@ -144,10 +144,6 @@ button.insert=&خستنه‌ ناو
 button.add=&زیاد کردن
 button.check=پشکنین...
 combobox.feeder.tooltip=ئای پی دۆزه‌ره‌وه‌ .ئه‌مه‌ بگۆره‌ ئه‌گه‌ر سه‌رچاوه‌ی تری ئای پی ده‌زانی
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_lt.properties b/resources/messages_lt.properties
index 6b61f3cb..859db8ff 100644
--- a/resources/messages_lt.properties
+++ b/resources/messages_lt.properties
@@ -146,10 +146,6 @@ button.insert= &Įterpti
 button.add= &Papildyti
 button.check=Chec&k...
 combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_tr.properties b/resources/messages_tr.properties
index 9a0d1106..22e23bfb 100644
--- a/resources/messages_tr.properties
+++ b/resources/messages_tr.properties
@@ -148,10 +148,6 @@ button.insert=&ekle
 button.add=&ekle
 button.check=kontrol
 combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/src/net/azib/ipscan/gui/MainWindow.java b/src/net/azib/ipscan/gui/MainWindow.java
index ac970b0a..0138f906 100644
--- a/src/net/azib/ipscan/gui/MainWindow.java
+++ b/src/net/azib/ipscan/gui/MainWindow.java
@@ -28,8 +28,8 @@ 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;
+import static net.azib.ipscan.gui.util.LayoutHelper.icon;
 
 /**
  * Main window of Angry IP Scanner.
@@ -169,13 +169,13 @@ public class MainWindow {
 
 		prefsButton = createToolbarButton(controlsArea);
 		ToolItem item = new ToolItem(prefsButton, SWT.PUSH);
-		item.setImage(buttonImage("prefs"));
+		item.setImage(icon("buttons/prefs"));
 		item.setToolTipText(Labels.getLabel("title.preferences"));
 		item.addListener(SWT.Selection, preferencesListener);
 
 		fetchersButton = createToolbarButton(controlsArea);
 		item = new ToolItem(fetchersButton, SWT.PUSH);
-		item.setImage(buttonImage("fetchers"));
+		item.setImage(icon("buttons/fetchers"));
 		item.setToolTipText(Labels.getLabel("title.fetchers.select"));
 		item.addListener(SWT.Selection, chooseFetchersListsner);
 
diff --git a/src/net/azib/ipscan/gui/ResultTable.java b/src/net/azib/ipscan/gui/ResultTable.java
index 2dbdca6b..3bf357aa 100644
--- a/src/net/azib/ipscan/gui/ResultTable.java
+++ b/src/net/azib/ipscan/gui/ResultTable.java
@@ -6,7 +6,6 @@
 package net.azib.ipscan.gui;
 
 import net.azib.ipscan.config.GUIConfig;
-import net.azib.ipscan.config.Labels;
 import net.azib.ipscan.core.ScanningResult;
 import net.azib.ipscan.core.ScanningResult.ResultType;
 import net.azib.ipscan.core.ScanningResultList;
@@ -28,6 +27,9 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.util.List;
 
+import static net.azib.ipscan.core.ScanningResult.ResultType.*;
+import static net.azib.ipscan.gui.util.LayoutHelper.icon;
+
 /**
  * Table of scanning results.
  * 
@@ -62,10 +64,10 @@ public class ResultTable extends Table implements FetcherRegistryUpdateListener,
 		handleUpdateOfSelectedFetchers(fetcherRegistry);
 		
 		// load button images
-		listImages[ResultType.UNKNOWN.ordinal()] = new Image(null, Labels.getInstance().getImageAsStream("list.unknown.img"));
-		listImages[ResultType.DEAD.ordinal()] = new Image(null, Labels.getInstance().getImageAsStream("list.dead.img"));
-		listImages[ResultType.ALIVE.ordinal()] = new Image(null, Labels.getInstance().getImageAsStream("list.alive.img"));
-		listImages[ResultType.WITH_PORTS.ordinal()] = new Image(null, Labels.getInstance().getImageAsStream("list.addinfo.img"));
+		listImages[UNKNOWN.ordinal()] = icon("list/unknown");
+		listImages[DEAD.ordinal()] = icon("list/dead");
+		listImages[ALIVE.ordinal()] = icon("list/alive");
+		listImages[WITH_PORTS.ordinal()] = icon("list/ports");
 		
 		addListener(SWT.KeyDown, new CommandsMenuActions.Delete(this, stateMachine));
 		addListener(SWT.KeyDown, new CommandsMenuActions.CopyIP(this));
diff --git a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
index d57ae87b..50d1695f 100644
--- a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
+++ b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
@@ -31,7 +31,8 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 import java.net.InetAddress;
 
-import static net.azib.ipscan.gui.util.LayoutHelper.buttonImage;
+import static net.azib.ipscan.core.state.ScanningState.*;
+import static net.azib.ipscan.gui.util.LayoutHelper.icon;
 
 /**
  * Start/Stop button action class.
@@ -66,20 +67,20 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 		this.display = display;
 		
 		// preload button images
-		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()] = buttonImage("kill");
-		buttonImages[ScanningState.KILLING.ordinal()] = buttonImages[ScanningState.STOPPING.ordinal()];
+		buttonImages[IDLE.ordinal()] = icon("buttons/start");
+		buttonImages[SCANNING.ordinal()] = icon("buttons/stop");
+		buttonImages[STARTING.ordinal()] = buttonImages[SCANNING.ordinal()];
+		buttonImages[RESTARTING.ordinal()] = buttonImages[SCANNING.ordinal()];
+		buttonImages[STOPPING.ordinal()] = icon("buttons/kill");
+		buttonImages[KILLING.ordinal()] = buttonImages[STOPPING.ordinal()];
 		
 		// preload button texts
-		buttonTexts[ScanningState.IDLE.ordinal()] = Labels.getLabel("button.start");
-		buttonTexts[ScanningState.SCANNING.ordinal()] = Labels.getLabel("button.stop");
-		buttonTexts[ScanningState.STARTING.ordinal()] = buttonTexts[ScanningState.SCANNING.ordinal()]; 
-		buttonTexts[ScanningState.RESTARTING.ordinal()] = buttonTexts[ScanningState.SCANNING.ordinal()];
-		buttonTexts[ScanningState.STOPPING.ordinal()] = Labels.getLabel("button.kill");
-		buttonTexts[ScanningState.KILLING.ordinal()] = Labels.getLabel("button.kill");
+		buttonTexts[IDLE.ordinal()] = Labels.getLabel("button.start");
+		buttonTexts[SCANNING.ordinal()] = Labels.getLabel("button.stop");
+		buttonTexts[STARTING.ordinal()] = buttonTexts[SCANNING.ordinal()];
+		buttonTexts[RESTARTING.ordinal()] = buttonTexts[SCANNING.ordinal()];
+		buttonTexts[STOPPING.ordinal()] = Labels.getLabel("button.kill");
+		buttonTexts[KILLING.ordinal()] = Labels.getLabel("button.kill");
 	}
 
 	@Inject
@@ -100,7 +101,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 		// add listeners to all state changes
 		stateMachine.addTransitionListener(this);
 		
-		// set the default buttonImage
+		// set the default image
 		ScanningState state = stateMachine.getState();
 		button.setImage(buttonImages[state.ordinal()]);
 		button.setText(buttonTexts[state.ordinal()]);
@@ -118,7 +119,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 	 */
 	public void widgetSelected(SelectionEvent event) {
 		// ask for confirmation before erasing scanning results
-		if (stateMachine.inState(ScanningState.IDLE)) {
+		if (stateMachine.inState(IDLE)) {
 			if (!preScanChecks())
 				return;
 		}
@@ -193,7 +194,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 				statusBar.setStatusText(Labels.getLabel("state.killingThreads"));
 				break;
 		}
-		// change button buttonImage
+		// change button image
 		button.setImage(buttonImages[state.ordinal()]);
 		button.setText(buttonTexts[state.ordinal()]);
 	}
@@ -203,7 +204,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 	 */
 	private ScanningResultCallback createResultsCallback(ScanningState state) {
 		// rescanning must follow the same strategy of displaying all hosts (even the dead ones), because the results are already in the list
-		if (guiConfig.displayMethod == DisplayMethod.ALL || state == ScanningState.RESTARTING) {
+		if (guiConfig.displayMethod == DisplayMethod.ALL || state == RESTARTING) {
 			return new ScanningResultCallback() {
 				public void prepareForResults(ScanningResult result) {
 					resultTable.addOrUpdateResultRow(result);
@@ -252,12 +253,12 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 				statusBar.setProgress(percentageComplete);
 				
 				// show percentage in main window title
-				if (!stateMachine.inState(ScanningState.IDLE)) 
+				if (!stateMachine.inState(IDLE))
 					statusBar.getShell().setText(percentageComplete + "% - " + mainWindowTitle);
 				else
 					statusBar.getShell().setText(mainWindowTitle);
 
-				// change button buttonImage according to the current state
+				// change button image 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 f482cb03..37ef92c3 100644
--- a/src/net/azib/ipscan/gui/util/LayoutHelper.java
+++ b/src/net/azib/ipscan/gui/util/LayoutHelper.java
@@ -49,12 +49,12 @@ public class LayoutHelper {
 		return new Font(shell.getDisplay(), fontData);
 	}
 
-	public static Image buttonImage(final String baseName) {
+	public static Image icon(final String baseName) {
 		final Display display = Display.getCurrent();
 		return new Image(display, new ImageDataProvider() {
 			@Override public ImageData getImageData(int zoom) {
 				String suffix = zoom == 200 ? "@2x.png" : ".png";
-				ImageData imageData = new ImageData(getClass().getResourceAsStream("/images/buttons/" + baseName + suffix));
+				ImageData imageData = new ImageData(getClass().getResourceAsStream("/images/" + baseName + suffix));
 				if (zoom != 100 & zoom != 200)
 					imageData = DPIUtil.autoScaleUp(display, imageData);
 				return imageData;
diff --git a/test/net/azib/ipscan/config/LabelsTest.java b/test/net/azib/ipscan/config/LabelsTest.java
index aba1ec56..2c36c69a 100644
--- a/test/net/azib/ipscan/config/LabelsTest.java
+++ b/test/net/azib/ipscan/config/LabelsTest.java
@@ -55,7 +55,7 @@ public class LabelsTest {
 	@Test
 	public void testImageAsStream() throws IOException {
 		InputStream stream = Labels.getInstance().getImageAsStream("button.start.img");
-		// Now check the first bytes of GIF buttonImage header
+		// Now check the first bytes of PNG image header
 		stream.read();
 		assertEquals((int)'P', stream.read());
 		assertEquals((int)'N', stream.read());