From 5bc15ddd44fac02328d7af582e9008c2fb7fc1ab Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 23 Nov 2010 19:21:04 +0200 Subject: [PATCH] Moar ICONZ --- gui/fleetBrowser.py | 8 +++++--- icons/fleet_item_big.png | Bin 0 -> 1813 bytes 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 icons/fleet_item_big.png diff --git a/gui/fleetBrowser.py b/gui/fleetBrowser.py index 5bb76706e..eb196c17d 100644 --- a/gui/fleetBrowser.py +++ b/gui/fleetBrowser.py @@ -257,6 +257,7 @@ class FleetItem(wx.Window): self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "icons") self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","icons") self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "icons") + self.fleetBmp = bitmapLoader.getBitmap("fleet_item_big", "icons") self.copyBmpGrey = self.GreyBitmap(self.copyBmp) self.renameBmpGrey = self.GreyBitmap(self.renameBmp) @@ -396,18 +397,20 @@ class FleetItem(wx.Window): bdc.SetTextForeground(wx.SystemSettings.GetColour( wx.SYS_COLOUR_WINDOWTEXT )) bdc.Clear() + bdc.DrawBitmap(self.fleetBmp, 0, (rect.height - self.fleetBmp.GetHeight())/2) + textStart = self.padding + self.fleetBmp.GetWidth() suffix = "%d ships" % self.fleetCount if self.fleetCount >1 else "%d ship" % self.fleetCount if self.fleetCount == 1 else "No ships" fleetCount = "Fleet size: %s" % suffix bdc.SetFont(self.fontBig) fnx,fny = bdc.GetTextExtent(self.fleetName) - bdc.DrawText(self.fleetName, self.padding, (rect.height/2 - fny)/2) + bdc.DrawText(self.fleetName, textStart, (rect.height/2 - fny)/2) bdc.SetFont(self.fontSmall) fcx,fcy = bdc.GetTextExtent(fleetCount) - bdc.DrawText(fleetCount, self.padding, rect.height/2 + (rect.height/2 -fcy) / 2 ) + bdc.DrawText(fleetCount, textStart, rect.height/2 + (rect.height/2 -fcy) / 2 ) btnWidth,btnHeight = self.btnSize self.deletePosX = rect.width - btnWidth - self.padding self.renamePosX = self.deletePosX - btnWidth @@ -447,7 +450,6 @@ class FleetItem(wx.Window): bdc.DrawBitmap(self.renameBmpGrey, self.renamePosX + 1, self.renamePosY + 1 ) bdc.DrawBitmap(self.deleteBmpGrey, self.deletePosX + 1, self.deletePosY + 1 ) - textStart = self.padding self.AdjustFleetNameEditSize(textStart, self.copyPosX - self.editWidth - self.padding) def AdjustFleetNameEditSize(self, start,end): diff --git a/icons/fleet_item_big.png b/icons/fleet_item_big.png new file mode 100644 index 0000000000000000000000000000000000000000..dd4817263b63398bb732b4c826452220391b795b GIT binary patch literal 1813 zcmV+w2kQ8VP)EbtL^EL$iBS_`D>YR_M?vJZi+~F(EV6gs_kR6j*GLl53Ngv_%-p#% zXU;jl^Z0$|yBGL>7n-8zZ{+_?oYjCjmyq1=ErC=ZEeeQ=1LD8)1QLKm4G;+cCcwl3 z?01#`%P?#Tkh0ifS@QJrTX!j0Ceo--B+n%lGZ!b5LXo;EJ9~BQyGQq38@iUx(NwPc zhV`>ijvo;kOD706)#n z{&{!DIlskhBwC=&L{mr7jXI%b<4Ur#yy${nAvb($;3au^>+XWJt2F{>iw2|-VBmoykPYOrfR5vN`VaMos@pqTO?&nobjJq76Ecb1a83#`Hza-G z3QLA-aI7=n^7N|#?-VfQ1zdAZ;798#wvBb$2Iq;QUM`d2rN92=*|x3=nS1sfbjSI{ z#^R+*6>EQ7QE;W@;wKKr9o`M1UtDT2V_@WxTk!Tq18O!Qjx{7FEwhg}Zq7CVW=GAM zroIpUd71^N!ct4kRfl!uE3dsB0xvG+Uuk%2ZJ+H*0>e-VgB`YJ$M_w2k9|x(><^}@ z1@C(-KtGXV+I(*4wrsB$P*T)x{(v5K%xh#VKOv~AeO>ftK&=DU7-+Sog zsx{>m?9Sb<2Yno4D0y^ArOXrfWU_zcyk^9CfB*~u=(1-vE>B;e&%xK+6<_E;swsJ4 z_4=wRieetxym`acy!3gQGBFry(9KtA;+0uJf52wW$ye+>^m5hu>MgA8y0twpU8VD9O&-5`XB zU#S`Z7pIMUanG+e1&3{yiNoGTc0E^3N*8AeMRM+~EtcFjy05nc?ry;};MFu>|MW%l zvx=gQQU$+zLrHG$hmEfjLMBM#;l1Q18_Gz$F7h;h%;}w<-T@kbTJZR6xB7=Y&e5J_ zzk1;%baq)G9~f!KOquVfedG7rHf?!^vt74d)&gfVJU^;cM|iv*-<0U`4&R!bN{!L$ z5_y)AT*$Q?x{`7d#!fd8W?lR z6*4GOlZv~BMs#bQc#5%Iw_er(XCi z+h>)JOdi$(XB5Ct1Ylj1Wm*Udkut!p0(v=7>esphhtqoh-fv62>@%uwu-QCPS{5o)+GVR01!O`_dZWR z77n5ckB15y%fo?`08A7`tvdSWeS;=rEQyYcAgh+=_*jO196$M+lM3k9$Xr zOp6`-l5S2S+rDkxd4{GM0n`GhRVw%cg%(p=xP#PxcmJZy$`}BpQp)p1QF_GV^$!4W zBUF`|V;Pw!Nf#uEbYT`1&NcxWKny~&rV#qz2m;U}G~-?XPE1=g|4U~3H$x#b!`lGv zAoQ_85bA^qA^yxd;B4)=@H>Eel~M>1nuK-tJ%axLc$Kr}E5cjv00000NkvXXu0mjf D;;~lN literal 0 HcmV?d00001