From 1b1f45b3d2e87b67f0b72f5133ea14eeda807c4d Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 26 Oct 2010 17:16:14 +0300 Subject: [PATCH] Pure Awesomeness/2 --- gui/bitmapLoader.py | 12 +++++++++--- gui/shipBrowser.py | 17 ++++++++++++++--- icons/fshipbk_big.png | Bin 0 -> 3198 bytes 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 icons/fshipbk_big.png diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py index 0a0d6f9f8..acfd35811 100644 --- a/gui/bitmapLoader.py +++ b/gui/bitmapLoader.py @@ -26,7 +26,8 @@ def getStaticBitmap(name, parent, location): static.SetBitmap(getBitmap(name,location)) return static -locationMap = {"pack": os.path.join(config.staticPath, "icons")} +locationMap = {"pack": os.path.join(config.staticPath, "icons"), + "ships": os.path.join(config.staticPath, "ships")} def getBitmap(name,location): icon = getImage(name, location) @@ -35,8 +36,13 @@ def getBitmap(name,location): def getImage(name, location): if location in locationMap: - location = locationMap[location] - path = os.path.join(location, "icon%s.png" % name) + if location == "pack": + location = locationMap[location] + path = os.path.join(location, "icon%s.png" % name) + else: + location = locationMap[location] + path = os.path.join(location, "%s.png" % name) + else: location = os.path.join(config.path, location) path = os.path.join(location, name + ".png") diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 4bd3ceaaa..f459cc427 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -359,10 +359,14 @@ class ShipItem(wx.Window): self._itemData = itemData self.shipID = shipID - self.shipBmp = wx.EmptyBitmap(32, 32) + if shipID: + self.shipBmp = bitmapLoader.getBitmap(str(shipID),"ships") + else: + self.shipBmp = wx.EmptyBitmap(32, 32) self.shipFittingInfo = shipFittingInfo self.shipName, dummy = shipFittingInfo self.newBmp = bitmapLoader.getBitmap("fit_add_small", "icons") + self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","icons") self.shipBrowser = self.Parent.Parent @@ -498,7 +502,7 @@ class ShipItem(wx.Window): mdc.Clear() mdc.SetFont(wx.Font(9, wx.SWISS, wx.NORMAL, wx.BOLD, False)) -# mdc.DrawBitmap(self.effBmp,5+(rect.height-40)/2,(rect.height-40)/2,0) + mdc.DrawBitmap(self.shipEffBk,5+(rect.height - self.shipEffBk.GetWidth())/2,(rect.height - self.shipEffBk.GetHeight())/2,0) mdc.DrawBitmap(self.shipBmp, 5 + (rect.height - 32) / 2, (rect.height - 32) / 2, 0) @@ -535,12 +539,18 @@ class FitItem(wx.Window): self.fitID = fitID self.shipID = shipID self.shipBrowser = self.Parent.Parent - self.shipBmp = wx.EmptyBitmap(32, 32) + + if shipID: + self.shipBmp = bitmapLoader.getBitmap(str(shipID),"ships") + else: + self.shipBmp = wx.EmptyBitmap(32, 32) + self.shipFittingInfo = shipFittingInfo self.shipName, self.fitName= shipFittingInfo self.copyBmp = bitmapLoader.getBitmap("fit_add_small", "icons") self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "icons") self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","icons") + self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","icons") self.Bind(wx.EVT_PAINT, self.OnPaint) self.renamePosX = 0 @@ -726,6 +736,7 @@ class FitItem(wx.Window): mdc.Clear() mdc.SetFont(wx.Font(9, wx.SWISS, wx.NORMAL, wx.BOLD, False)) # mdc.DrawBitmap(self.effBmp,5+(rect.height-40)/2,(rect.height-40)/2,0) + mdc.DrawBitmap(self.shipEffBk,5+(rect.height - self.shipEffBk.GetWidth())/2,(rect.height - self.shipEffBk.GetHeight())/2,0) mdc.DrawBitmap(self.shipBmp, 5 + (rect.height - 32) / 2, (rect.height - 32) / 2, 0) diff --git a/icons/fshipbk_big.png b/icons/fshipbk_big.png new file mode 100644 index 0000000000000000000000000000000000000000..81f10490380c9ace144ae8ebd5be83f98427c3a0 GIT binary patch literal 3198 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 literal 0 HcmV?d00001