From eff8eaca3c2c800bad9f9de9e1502fdd3ff3e2ed Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 26 Oct 2010 13:21:26 +0300 Subject: [PATCH] Added new icons for add/delete/rename --- eos | 2 +- gui/shipBrowser.py | 12 +++++++----- icons/fadd.png | Bin 0 -> 733 bytes icons/fdelete.png | Bin 0 -> 715 bytes icons/frename.png | Bin 0 -> 512 bytes 5 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 icons/fadd.png create mode 100644 icons/fdelete.png create mode 100644 icons/frename.png diff --git a/eos b/eos index dd3cadec0..3e68fce62 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit dd3cadec0f0320c22bce42867f18b4a98c931f89 +Subproject commit 3e68fce6254a7f1e807e407de79add20b6c2b349 diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index f902cece5..ca4aded01 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -299,7 +299,7 @@ class ShipItem(wx.Window): self.shipBmp = wx.EmptyBitmap(32, 32) self.shipFittingInfo = shipFittingInfo self.shipName, dummy = shipFittingInfo - self.newBmp = bitmapLoader.getBitmap("add_small", "icons") + self.newBmp = bitmapLoader.getBitmap("fadd", "icons") self.shipBrowser = self.Parent.Parent @@ -473,8 +473,9 @@ class FitItem(wx.Window): self.shipBmp = wx.EmptyBitmap(32, 32) self.shipFittingInfo = shipFittingInfo self.shipName, self.fitName= shipFittingInfo - self.renameBmp = bitmapLoader.getBitmap("rename", "icons") - self.deleteBmp = bitmapLoader.getBitmap("state_offline_small","icons") + self.copyBmp = bitmapLoader.getBitmap("fadd", "icons") + self.renameBmp = bitmapLoader.getBitmap("frename", "icons") + self.deleteBmp = bitmapLoader.getBitmap("fdelete","icons") self.Bind(wx.EVT_PAINT, self.OnPaint) self.renamePosX = 0 @@ -628,9 +629,10 @@ class FitItem(wx.Window): self.deletePosX = rect.width - self.deleteBmp.GetWidth() - 5 self.renamePosX = self.deletePosX - self.renameBmp.GetWidth() - 5 - self.renamePosY = self.deletePosY = (rect.height - 16) / 2 - + self.copyPosX = self.renamePosX - self.copyBmp.GetWidth() -5 + self.renamePosY = self.deletePosY = self.copyPosY = (rect.height - 16) / 2 + mdc.DrawBitmap(self.copyBmp, self.copyPosX, self.copyPosY, 0) mdc.DrawBitmap(self.renameBmp, self.renamePosX, self.renamePosY, 0) mdc.DrawBitmap(self.deleteBmp, self.deletePosX, self.deletePosY, 0) event.Skip() diff --git a/icons/fadd.png b/icons/fadd.png new file mode 100644 index 0000000000000000000000000000000000000000..6332fefea4be19eeadf211b0b202b272e8564898 GIT binary patch literal 733 zcmV<30wVp1P)9VHk(~TedF+gQSL8D5xnVSSWAVY>J9b+m>@{iq7_KE}go~11+5s4;8hc+i0Xa zI1j@EX5!S+Me6HNqKzU5YQwL;-W5$p%ZMKMeR<%zp69-~?<4?8|C8S?bklXr4v&Ov zb&06v2|-x?qB`90yn>Qi%Sh2^G4n)$ZdyvTPf9}1)_buUT7>`e2G&2VU@~Bb(o+Mz zi4)>IxlSY${Dj4k={-9RzU^W5g9|2V5RZ2ZulL9s2xQbZ@r6eP9Ra5u(s|C0Nj#&4>wTSkb?%#=9?@ z^oxDy-O@tyN{L@by(WWvQ3%CyEu8x{+#Jb4-h&K9Owi)2pgg+heWDyked|3R$$kL@A z#sp1v-r+=G4B8D6DqsDH0@7OztA7aT9qc1Py{()w`m``?Y0&gi2=ROcc-9+nU^I6< zT=e_Y=vSnG@?3Ue{BW5ONFttcE!R-R_W4O01|0-|K-YNXLo2`4Qv z`r1LxR6#yf3FB%T95gJnaKKivA~Z}S9A(ZxEDK}O3T04USJ P00000NkvXXu0mjf^IS-S literal 0 HcmV?d00001 diff --git a/icons/fdelete.png b/icons/fdelete.png new file mode 100644 index 0000000000000000000000000000000000000000..08f249365afd29594b51210c6e21ba253897505d GIT binary patch literal 715 zcmV;+0yO=JP)C4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;yxzh{5!Htr?51 zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7 zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l z!7?%Uwib*ROP67Hw`ika)gX-(8Ia`-u_IEhxG7U<13kSsMW+$lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc literal 0 HcmV?d00001 diff --git a/icons/frename.png b/icons/frename.png new file mode 100644 index 0000000000000000000000000000000000000000..67de2c6ccbeac17742f56cf7391e72b2bf5033ba GIT binary patch literal 512 zcmV+b0{{JqP)CQDsH?WF>AIFt zQuJ}i;w2$ZUU#3SZ6RY0Gw;kZ&ol1~2ky^QZ(fom$=jNJZt!z7w_pH~wdQ;R)Gh%BbQFCx+Nm!4SuS-vkr`vhhrX zM*>w%e+v~?m@q~ImPAgtLkR_3U<2F8LP3W5=LJ*ZN|S5p#sf4YFr$p~Q~Z*0Ngxf2 zjk#J#<7EAlhzlrV53~GF&pIzcCN_lz9@05UeoUXiK%N z#x+4o*i_c|6_Uu1+&TIho?3@y4k-#b8Y_o94zW*B3a1ne2-Y5s0uke$$|@=}OP-i= zNYZQA=>PrZu0MfSL=b8UhD_={W4IY1{b{)U)*gc45xtL%IYLY&hF;d`@GzI&7H&D# zh;z_BX$#hqh@q?AY3sJTod2%*Yd)_>YM0#q&ixGuh+PQsneK)F0000