From efc6abbdce469eef8ee49999b3b0650c86a18bd9 Mon Sep 17 00:00:00 2001 From: angryziber Date: Wed, 3 Jan 2007 23:03:15 +0000 Subject: [PATCH] New hicolor icons created in svg and png format (instead of gif). Text on icons is now real text, conforming to system font. git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk/ipscan@107 375186e5-ef17-0410-b0b6-91563547dcda --- resources/Labels.txt | 22 +- resources/images/buttons/ipup.gif | Bin 128 -> 0 bytes resources/images/buttons/ipup.png | Bin 0 -> 573 bytes resources/images/buttons/ipup.svg | 217 +++++++++++ resources/images/buttons/kill.gif | Bin 160 -> 0 bytes resources/images/buttons/kill.png | Bin 0 -> 802 bytes resources/images/buttons/kill.svg | 243 ++++++++++++ resources/images/buttons/start.gif | Bin 154 -> 0 bytes resources/images/buttons/start.png | Bin 0 -> 622 bytes resources/images/buttons/start.svg | 217 +++++++++++ resources/images/buttons/stop.gif | Bin 157 -> 0 bytes resources/images/buttons/stop.png | Bin 0 -> 339 bytes resources/images/buttons/stop.svg | 224 +++++++++++ resources/images/icon.gif | Bin 257 -> 0 bytes resources/images/icon.png | Bin 0 -> 4557 bytes resources/images/icon.svg | 258 ++++++++++++ resources/images/icon2.svg | 366 ++++++++++++++++++ resources/images/list/addinfo.gif | Bin 99 -> 0 bytes resources/images/list/addinfo.png | Bin 0 -> 871 bytes resources/images/list/addinfo.svg | 195 ++++++++++ resources/images/list/alive.gif | Bin 113 -> 0 bytes resources/images/list/alive.png | Bin 0 -> 875 bytes resources/images/list/alive.svg | 195 ++++++++++ resources/images/list/dead.gif | Bin 99 -> 0 bytes resources/images/list/dead.png | Bin 0 -> 864 bytes resources/images/list/dead.svg | 192 +++++++++ resources/images/list/unknown.gif | Bin 94 -> 0 bytes resources/images/list/unknown.png | Bin 0 -> 741 bytes resources/images/list/unknown.svg | 271 +++++++++++++ src/net/azib/ipscan/gui/AboutDialog.java | 19 +- src/net/azib/ipscan/gui/MainWindow.java | 4 +- .../gui/actions/StartStopScanningAction.java | 25 +- .../ipscan/gui/feeders/RangeFeederGUI.java | 1 + 33 files changed, 2425 insertions(+), 24 deletions(-) delete mode 100755 resources/images/buttons/ipup.gif create mode 100755 resources/images/buttons/ipup.png create mode 100755 resources/images/buttons/ipup.svg delete mode 100755 resources/images/buttons/kill.gif create mode 100755 resources/images/buttons/kill.png create mode 100755 resources/images/buttons/kill.svg delete mode 100755 resources/images/buttons/start.gif create mode 100755 resources/images/buttons/start.png create mode 100755 resources/images/buttons/start.svg delete mode 100755 resources/images/buttons/stop.gif create mode 100755 resources/images/buttons/stop.png create mode 100755 resources/images/buttons/stop.svg delete mode 100755 resources/images/icon.gif create mode 100755 resources/images/icon.png create mode 100755 resources/images/icon.svg create mode 100755 resources/images/icon2.svg delete mode 100755 resources/images/list/addinfo.gif create mode 100755 resources/images/list/addinfo.png create mode 100755 resources/images/list/addinfo.svg delete mode 100755 resources/images/list/alive.gif create mode 100755 resources/images/list/alive.png create mode 100755 resources/images/list/alive.svg delete mode 100755 resources/images/list/dead.gif create mode 100755 resources/images/list/dead.png create mode 100755 resources/images/list/dead.svg delete mode 100755 resources/images/list/unknown.gif create mode 100755 resources/images/list/unknown.png create mode 100755 resources/images/list/unknown.svg diff --git a/resources/Labels.txt b/resources/Labels.txt index 1d554a36..3ba19eb1 100755 --- a/resources/Labels.txt +++ b/resources/Labels.txt @@ -1,4 +1,4 @@ -icon=images/icon.gif +icon=images/icon.png encoding=ISO-8859-1 menu.file=&File menu.file.saveAll=&Save... @@ -91,10 +91,14 @@ button.OK=OK button.cancel=Cancel button.close=Close button.next=Next -> -button.start.img=images/buttons/start.gif -button.stop.img=images/buttons/stop.gif -button.kill.img=images/buttons/kill.gif -button.ipUp.img=images/buttons/ipup.gif +button.start=Start +button.start.img=images/buttons/start.png +button.stop=Stop +button.stop.img=images/buttons/stop.png +button.kill=Stop! +button.kill.img=images/buttons/kill.png +button.ipUp=IP +button.ipUp.img=images/buttons/ipup.png button.up=&Up button.down=&Down button.delete=De&lete @@ -104,10 +108,10 @@ button.add=&Add button.left=< button.right=> combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan -list.unknown.img=images/list/unknown.gif -list.dead.img=images/list/dead.gif -list.alive.img=images/list/alive.gif -list.addinfo.img=images/list/addinfo.gif +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.udp=UDP packet diff --git a/resources/images/buttons/ipup.gif b/resources/images/buttons/ipup.gif deleted file mode 100755 index f50fe3c92027fd68416db140d2bb65b0ee09c4b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmZ?wbhEHblw{y$_{7Qp0{?;Ne**(ULqo&=|NqaNIRg|^{K>+|z`(|!15yA|%fRfK zk-+m$$4rtjQ{}m;Vk%PTb;oK4g7Pbs+0bqiu*um%7@ge;Z- diff --git a/resources/images/buttons/ipup.png b/resources/images/buttons/ipup.png new file mode 100755 index 0000000000000000000000000000000000000000..a75d3f904bd0eb0e155b9897610cebac597d7db6 GIT binary patch literal 573 zcmV-D0>b@?P)JP00004b3#c}2nYxW zdZCDviz${* z#A*w=I0*$8LArG)xVY&eg5V+uog8#?2%-e4lL`(M6roU2P^@4Y+a%T8&#B?2))&rj zIOloKIUG3WkdDHMFqf~Dmh!dImF+d>90(}|aU`Me?84logTtYJvv4vzhi#%%GlRmT z>Dh~iKPM~HuC{Z+7Yo5yRM`=L#_fsAcA}l#;7i}%!ekZ18J-nBe-gye{sEwPs(kJE z+3HO3z=(SF?IpC4&_-ftM8i980^##U5JzPIpkghW9E}g%I6XD#b=*3PR?u4Z!;1{^ zQ+_Ch`HLWqa+#rh*?XSxc71&FULLJfX}R+O8BXAWgA0!C;vXch9hhUj(fSi#t$!J> z*XvjBKYcLY-RwkKOZ3p|pSJ$9i}~rfuVGMH0kE3@z*>8^@osT}5rfiVU?n1kwT;$8 zYi-3^d!27NF~%G*25lq~B>f2)8h8~_030I*ZPWlj{{@ISVg#)u5|#$o&VWnstMT}G zx7l1(&bfZWkL4!R5!w3(*j)R4YdkmB+OxNOC+(Oy#u501)>i%(whxX@vxs*#00000 LNkvXXu0mjfuL1yi literal 0 HcmV?d00001 diff --git a/resources/images/buttons/ipup.svg b/resources/images/buttons/ipup.svg new file mode 100755 index 00000000..fbbea51e --- /dev/null +++ b/resources/images/buttons/ipup.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/buttons/kill.gif b/resources/images/buttons/kill.gif deleted file mode 100755 index f015e1635fd247ad979b902495b849d0a5d64dbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmZ?wbhEHbRAu00_{7Qp0u2ld|AFW~i2nco%$YMlF~y%Oj0_BH3_3tI14u0cb85z_ z3mXhhY2Mzk_~Kb!30IAtLzn0BL|8Cn8qF%Vn;*cEZ#`@0or}zjdY7brCG1f-FI=Nr zvU6Vlu?bh_@FB$Du=Iy<@VS>s1WA9E`!GkULApCqUV(uX1pQAr^pUC}Ze={8i{EK%pCZq3cR<#xR^>3jU( zd-?qcQ50dNX~miB><`6tbsA$^TMNr^>-dM2rX>nde5+8YPHqej=K!#>92cQHqoWG7 zQu)=<-(Tx@I`g;p_j`|$$v2F_uy3VlX*Te_zrDSM-`Tmi76_czRaLdDFE78Q%xd-Q zgTX;lfyaXji3Hq!zbqJy_Us0O@BH)g<995U2HE;LC0kh`eul$1NG55mUT-8*>GZ^k z&nKj58YDrWD>oOS+pU}(8FAn3>}-&)tx<)@!RV~ES17+ULH&~+hL(zZ)Q2}2O)|g0H9B&8@$@s_@s$p zh2C}8K!~dI3ECzne~oRsizAr*KS&?1+ua-8XF{u{IW7= z8Rm8-It{HftQdF}nVqPx_c^;dgkYpgwYW&01cTV) zdAv*{pfDPv8$O?CY;KlDmzSZ5$Kel!B+-)-+mRqlkpx9KcOwy`rBZ~FNxX=~aH+3v zySlZt_M6w+J>hc2bsUFdl0-x<-mQYdLNm*8 zn*eZ&rY#jECC?AyafP9)i`0~segtss^bUu~^w4CrURM_tSy+zyh5xvz)i#%#&FcD& g4hw)Dmg5qC0i)d-BnM+R4FCWD07*qoM6N<$f&~C(%K!iX literal 0 HcmV?d00001 diff --git a/resources/images/buttons/kill.svg b/resources/images/buttons/kill.svg new file mode 100755 index 00000000..1ede1df7 --- /dev/null +++ b/resources/images/buttons/kill.svg @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/resources/images/buttons/start.gif b/resources/images/buttons/start.gif deleted file mode 100755 index 4c54242838eb4f0ba0ea2b2ce72fb904d65e333b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmZ?wbhEHbRAu00_{72h0u4aO@E?f&|37o)3|NRk@h1x-0|P6A4u}g<%fK8TvFgGG zgHxK)lG`tyf*}SpDVL%Pn^CSv?*gfQ_MTpFBUfY<6pC8ziMHK yH=M?4cQfB#cyG?hU=0BJtvY7_ diff --git a/resources/images/buttons/start.png b/resources/images/buttons/start.png new file mode 100755 index 0000000000000000000000000000000000000000..b8aab9bef74af4e6498b4b0aa2221d2a77efe23f GIT binary patch literal 622 zcmV-!0+IcRP)57m(xyd3&{k5k?#({v&c``#i2DZL-BlJf!@DcVydd3 zstQ%5p{fc>X;6~Ddl*O&_!EwSUB^(!ovr{VNGb0b;p*p+`0JKCL&9^x0EoKkb!+}M z65TDRJW`N*J>&<*z5~chDT_e;BNdCqApq@-#-6x7dDlu>X1;$sCJ*NV0HadMm%n`0 zY?-!a-KB}_sZYa4JR5+NQoh|3Of&huKkfT|S0nFl0sK$iPcNw#-Tikm6#xJL07*qo IM6N<$f?J;xsQ>@~ literal 0 HcmV?d00001 diff --git a/resources/images/buttons/start.svg b/resources/images/buttons/start.svg new file mode 100755 index 00000000..2c7a5522 --- /dev/null +++ b/resources/images/buttons/start.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/buttons/stop.gif b/resources/images/buttons/stop.gif deleted file mode 100755 index 0dd6a1f25d351c8388d789212933482eb2b645fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmZ?wbhEHbRAu00_{7Qp0u2ld|AFW~i2nco%$YMlF~y%Oj0_BH3_3tI14u0cb5h2t z3mXhhY2Mzk_~Kb!30IAtLzn0BM8rJFFq+j~)x2Tb+Mjm$-#Jb1Xe?;9NZ4@Ce@66? zlmNNIk||sr6O&42Z;JC4T_piC)=W`iMr^F|#-B<3J3R|k z=MOi=1`6yse!b0sgE4;Ek5!MHmuTKJxoda+Isg8h1=n9EZsG~<;yJ$h>Y;77_3igf dO_j*DWZYrbTAcsHtPtoo22WQ%mvv4FO#t( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/icon.gif b/resources/images/icon.gif deleted file mode 100755 index a2f0ab659e91d2e214804110db7e8252c2942bb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmZ?wbhEHbRA5kGIK;*P2LJyvFf=qYF#P|2;J|_ZV4(Pug^`Paok0hr0Hl_I`B=rS zJK_djFII7@yp~-Pf8$tfyMjjg&lxi{QygcR6;y?x~49S zv8A!Og;l7nzO#vW@|3B4=~Jh6mCq?CVVqkKGe1i-IdiE(v^+EWWbXCrxZ)VsZdqXK%u!o+Zr`+iJydJ9qi-KM;AaY$Ydy FH2`3;b2I<| diff --git a/resources/images/icon.png b/resources/images/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..3e0c47fc11c9994d06f7bcd3ae91f4fd85dab83d GIT binary patch literal 4557 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 r0%}%Lr0`TWV@_|WXT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/resources/images/icon2.svg b/resources/images/icon2.svg new file mode 100755 index 00000000..90a4747d --- /dev/null +++ b/resources/images/icon2.svg @@ -0,0 +1,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + ANGRY + + + diff --git a/resources/images/list/addinfo.gif b/resources/images/list/addinfo.gif deleted file mode 100755 index c4e77cc920044844439bdb1ad6d6d4ac7a847956..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmZ?wbhEHb6krfw_{abT{}~z@8qSlhDhXbcRSHDki8B<_7#=7&mb*SGKOtDYtBLqez3u~L+it0Hb}&lg)%R#~uHlZZg!*XL0lsD-t%H#{@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*BbucB0F>P$QdH>nV39JP^2eeKFEUAo=y_XS71IJX{jLOJA3mx-2w2q3pDyj0 xuGhcSS{Jp}gb>n82zi=P>iRdQPLD6I{U1MD6YuN9sC57U002ovPDHLkV1hUuhXVir literal 0 HcmV?d00001 diff --git a/resources/images/list/addinfo.svg b/resources/images/list/addinfo.svg new file mode 100755 index 00000000..81e1f2d8 --- /dev/null +++ b/resources/images/list/addinfo.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/resources/images/list/alive.gif b/resources/images/list/alive.gif deleted file mode 100755 index aa82c7c737eae22af0c56ca966f0d4e456890192..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 113 zcmZ?wbhEHb6krfw_{0DK{~H<_{{R1f=FAzW00V>KPZmZ71{MY#kO)XE1GAaOstbE3 zG&;QO-u#Lo;a=4725AKW`N-0hr#RPU9eeVoO}+Q|_uVhnUtWJzfJ4!s{iKAW)XWJi G4Auat*eAIF diff --git a/resources/images/list/alive.png b/resources/images/list/alive.png new file mode 100755 index 0000000000000000000000000000000000000000..b168860bb0cd29d21f7c3ec39ee6f892c0bc69d2 GIT binary patch literal 875 zcmV-x1C;!UP)IQ%@ZkG?eEj)8BBez6m`2BX%Cub|WVKt!)ltrWDU3az%4cp%f~)DVONDYjDFRHR z!&azznG17mq-D9+@q1Af3d1D@WYTdAe|?pY#fJKm>B-HL!xukP08FF9B$W3#4a=${ zO^em`B@(}B2w$Ul=sJfG975-aM*Gp#b<2&XCl_QtoqG!a3IGsQyBM6g(5Y=+q8>TW z2;vW8s2DC&Yik>}Y~4j8Ve3`r!BYYN6p!7xl6lNc^)1V_-Pj-$Y&2PM6AC2= zIaUb}44Ke0j?}~ygkX}>f}v!Qdnl|N{vF0C9LGY)u@I`B*7V!(GdQN}5}-$soZOi* zK1fZlQdrekMc8rvstD@pdn{Mj*$g41Tgi2w9$qtFee7=(6C;?2 z_2d=?lnGx|)wR+ouiAM$GxBqWYECo~-J_M377UsQgiQDY23`;K$%ilQ77onLCM=De z*njlcnNsg#?X~M}b`RaVGZ;7L1lovgdr8pNp&1h2(u4B)vnQCX{>U7jE7K}xk7m|J z&Q^RT0JwkUa`U^vkw+gBuK6ViHJVkK&2nzN;pUqylJ^NEMJYYm5UIJaVb5OqAD}ol z&Y#^FPb79oDHlm82_dA15YlUVy;rv%JoKa7`v-pU6bn$qp`ic(002ovPDHLkV1jg& BgW3Q9 literal 0 HcmV?d00001 diff --git a/resources/images/list/alive.svg b/resources/images/list/alive.svg new file mode 100755 index 00000000..c76660e1 --- /dev/null +++ b/resources/images/list/alive.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/resources/images/list/dead.gif b/resources/images/list/dead.gif deleted file mode 100755 index 10c774b369a9305b1cf28fabab08f8285e236a39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmZ?wbhEHb6krfw_{abP{}~t>8XC@=IivWKg^_`QnL!663X*4FGMU3W^Ee0N!z}$< y3=wAy?tR(JzS>}gIY}dE%?W>+8@IykU)#HW&*Tfzs25SIsK_Aor diff --git a/resources/images/list/dead.png b/resources/images/list/dead.png new file mode 100755 index 0000000000000000000000000000000000000000..16c40a2fb6ff13a56e23140372409ae6d81f7f0b GIT binary patch literal 864 zcmV-m1E2hfP)$r!o7S|ANsUDj5o=NWXf6sW zh^R*?qD8766w!Y`@Zd#Hg2fM1JXpO5A|j}W2gQRTqPBiisM;E}ZQ7MHy9{cYimATJFw3H0PU!2ZeA?(JzHZT5o|ev{L}kTsU$QmX5fkhOy^j= zq5-S>`e|Y;-3K7dnoa#^JW{nY77de9&u7pnZ?@zA@JtHA7^G>C&aQ4_jO$P6B1*O` zaRY?;J~Und%tkMH9W^!g`GXUDHf!@G|4@GUM}Rf=~)Wx)8R6a2yC* zf@wNRQy#d^6?EOAg{k7RNh0un5yl`K7ecx)qzl8D-K7h~O`tk7O@K~HfQN6=MMZUe z4yKwuCpKnHgmmW&U%u&7w6Vz}gnXbECX0Wpjq#U1s8j&JIA74Q^89CL6kl@1qOo$- zr0Y1h=SKPbrY0|%8RYA$O`;0{VLS8g&TR+XJ$>rYt9QQ9(wY&Lb@uq_GZ$$&_SzGt zwhwLCnthy@@PGM+@(dd^AmLFR-v>w4^*i^~<7Cz|4;~)pmi0UqjkM4EOaSoY*3A{Y zy?rmd#Lqyf|2HS8VNE%58sSJu)GsY*j?6K}&Mk{9xw7lf5w*aeTz4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/resources/images/list/unknown.gif b/resources/images/list/unknown.gif deleted file mode 100755 index e09f1c5f139e70b44562da226363b80a60fd175b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmZ?wbhEHb6krfw_{abP|Nk>IG&Gz!b4Kwe3nK#qGlLFD6eQ2Uq(7&BB{Ofg!wg0a tjh9=ru5XLIn3fWAY08zI6*=3xA~snt6J3r;S!2Cv=%mUwFpK;$NOs`+`FdHJ3JB&#rmaKz(PLSb($X}O&6Y?+H<+68^ZdnpV03J0ae2k47=0g}-vVeprS4Wu%Eucw%TluJ zNgGgIH}LzHS?~vW`TB?P#IrcR6wtEA$HO{+95q@j$`!}y9BVW@F!+;})-f(!o?!m_ zdh4=%Ns=wol2udHa6Ova0LZdbqpGs(^DPq$hUxB}q5NPAmgHjIyj|F6WZR{KB(;0o zoh1NDbfIZ_N1uD9Ho=@$8C(ga*|Uo=Fqr)^9J%G zci3!+`2EY=xjW0OH-)W>`G4C*N6u!iz(WHJJc&m7LSfz8J40K(-evaYw$a5fFC z0`7Q5Ii9%X71d+~9>?9q6%~29=}dpFB%7=eU6NB%Gq;Dw6Cd@h?g#L=JEwuX|F!!A XK``U7P4>7A00000NkvXXu0mjfxZ77H literal 0 HcmV?d00001 diff --git a/resources/images/list/unknown.svg b/resources/images/list/unknown.svg new file mode 100755 index 00000000..7e8e04f3 --- /dev/null +++ b/resources/images/list/unknown.svg @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + ? + ? + + diff --git a/src/net/azib/ipscan/gui/AboutDialog.java b/src/net/azib/ipscan/gui/AboutDialog.java index 5591a879..0417dec3 100755 --- a/src/net/azib/ipscan/gui/AboutDialog.java +++ b/src/net/azib/ipscan/gui/AboutDialog.java @@ -4,6 +4,7 @@ package net.azib.ipscan.gui; import net.azib.ipscan.config.Labels; +import net.azib.ipscan.config.Platform; import net.azib.ipscan.config.Version; import net.azib.ipscan.gui.actions.HelpActions; @@ -41,13 +42,13 @@ public class AboutDialog extends AbstractModalDialog { shell.setSize(new Point(400, 363)); Label iconLabel = new Label(shell, SWT.ICON); - iconLabel.setBounds(10, 10, 0, 0); - + iconLabel.setLocation(10, 10); if (parent != null) { iconLabel.setImage(parent.getImage()); shell.setImage(parent.getImage()); } iconLabel.pack(); + int leftBound = iconLabel.getBounds().width + 20; // TODO: make clicking on links work Link textLabel = new Link(shell, SWT.NONE); @@ -58,7 +59,7 @@ public class AboutDialog extends AbstractModalDialog { text = text.replaceAll("%WEBSITE", Version.WEBSITE); text = text.replaceAll("%MAILTO", Version.MAILTO); textLabel.setText(text); - textLabel.setBounds(60, 10, 0, 0); + textLabel.setLocation(leftBound, 10); textLabel.addListener(SWT.Selection, new HelpActions.Website()); textLabel.pack(); @@ -67,7 +68,7 @@ public class AboutDialog extends AbstractModalDialog { positionButtons(button, null); Text licenseText = new Text(shell, SWT.BORDER | SWT.MULTI | SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP); - licenseText.setBounds(60, 140, shell.getClientArea().width - 70, button.getLocation().y - 150); + licenseText.setBounds(leftBound, 140, shell.getClientArea().width - leftBound - 10, button.getLocation().y - 150); licenseText.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND)); licenseText.setText("Licensed under the GNU General Public License Version 2\n\n" + Version.NAME + " is free software; you can redistribute it and/or " + @@ -90,7 +91,15 @@ public class AboutDialog extends AbstractModalDialog { } }); - shell.setDefaultButton(button); + if (Platform.MAC_OS) { + // no button on Mac + Point size = shell.getSize(); + shell.setSize(size.x, size.y - button.getSize().y); + button.setVisible(false); + } + else { + button.setFocus(); + } } } diff --git a/src/net/azib/ipscan/gui/MainWindow.java b/src/net/azib/ipscan/gui/MainWindow.java index 42b23b9d..6254b6cc 100755 --- a/src/net/azib/ipscan/gui/MainWindow.java +++ b/src/net/azib/ipscan/gui/MainWindow.java @@ -144,12 +144,12 @@ public class MainWindow { // start/stop button shell.setDefaultButton(startStopButton); - startStopButton.setLayoutData(new RowData()); + startStopButton.setLayoutData(new RowData(SWT.DEFAULT, 23)); startStopButton.addSelectionListener(startStopScanningAction); // feeder selection combobox this.feederSelectionCombo = feederSelectionCombo; - feederSelectionCombo.setLayoutData(new RowData()); + feederSelectionCombo.setLayoutData(new RowData(SWT.DEFAULT, 23)); for (Iterator i = feederRegistry.iterator(); i.hasNext();) { AbstractFeederGUI feederGUI = (AbstractFeederGUI) i.next(); feederSelectionCombo.add(feederGUI.getFeederName()); diff --git a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java index 3a67edb6..96487a75 100755 --- a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java +++ b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java @@ -35,7 +35,8 @@ public class StartStopScanningAction implements SelectionListener, ScanningState private ResultTable resultTable; private FeederGUIRegistry feederRegistry; private Button button; - private Image[] images = new Image[4]; + private Image[] buttonImages = new Image[4]; + private String[] buttonTexts = new String[4]; private Display display; @@ -50,13 +51,20 @@ public class StartStopScanningAction implements SelectionListener, ScanningState this.display = button.getDisplay(); // pre-load button images - images[ScanningStateCallback.STATE_IDLE] = new Image(null, Labels.getInstance().getImageAsStream("button.start.img")); - images[ScanningStateCallback.STATE_SCANNING] = new Image(null, Labels.getInstance().getImageAsStream("button.stop.img")); - images[ScanningStateCallback.STATE_STOPPING] = new Image(null, Labels.getInstance().getImageAsStream("button.kill.img")); - images[ScanningStateCallback.STATE_KILLING] = images[ScanningStateCallback.STATE_STOPPING]; + buttonImages[ScanningStateCallback.STATE_IDLE] = new Image(null, Labels.getInstance().getImageAsStream("button.start.img")); + buttonImages[ScanningStateCallback.STATE_SCANNING] = new Image(null, Labels.getInstance().getImageAsStream("button.stop.img")); + buttonImages[ScanningStateCallback.STATE_STOPPING] = new Image(null, Labels.getInstance().getImageAsStream("button.kill.img")); + buttonImages[ScanningStateCallback.STATE_KILLING] = buttonImages[ScanningStateCallback.STATE_STOPPING]; + + // pre-load button texts + buttonTexts[ScanningStateCallback.STATE_IDLE] = Labels.getLabel("button.start"); + buttonTexts[ScanningStateCallback.STATE_SCANNING] = Labels.getLabel("button.stop"); + buttonTexts[ScanningStateCallback.STATE_STOPPING] = Labels.getLabel("button.kill"); + buttonTexts[ScanningStateCallback.STATE_KILLING] = Labels.getLabel("button.kill"); // set the defaultimage - button.setImage(images[state]); + button.setImage(buttonImages[state]); + button.setText(buttonTexts[state]); } public void widgetDefaultSelected(SelectionEvent e) { @@ -108,7 +116,8 @@ public class StartStopScanningAction implements SelectionListener, ScanningState break; } // change button image - button.setImage(images[StartStopScanningAction.this.state]); + button.setImage(buttonImages[StartStopScanningAction.this.state]); + button.setText(buttonTexts[StartStopScanningAction.this.state]); } }); } @@ -129,7 +138,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningState statusBar.setProgress(percentageComplete); // change button image - button.setImage(images[StartStopScanningAction.this.state]); + button.setImage(buttonImages[StartStopScanningAction.this.state]); } }); } diff --git a/src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java b/src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java index f25fc29d..299d7b3d 100755 --- a/src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java +++ b/src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java @@ -142,6 +142,7 @@ public class RangeFeederGUI extends AbstractFeederGUI { hostnameLabel.setLayoutData(formData); ipUpButton.setImage(new Image(getDisplay(), Labels.getInstance().getImageAsStream("button.ipUp.img"))); + ipUpButton.setText(Labels.getLabel("button.ipUp")); ipUpButton.addSelectionListener(hostnameListener); formData = new FormData(); formData.top = new FormAttachment(endIPText);