From 608878f3f0dfdb01d5904d1c0ac5c3e0255b085d Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sun, 22 Aug 2010 23:21:06 +0400 Subject: [PATCH] Change icon and add appropriate sorting --- controller/market.py | 2 +- gui/shipBrowser.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/controller/market.py b/controller/market.py index a0b650e49..923d7f359 100644 --- a/controller/market.py +++ b/controller/market.py @@ -91,7 +91,7 @@ class Market(): results = eos.db.searchFits(name) fits = [] for fit in results: - fits.append((fit.ID, fit.name, fit.ship.item.race, fit.ship.item.name)) + fits.append((fit.ID, fit.name, fit.ship.item.name)) return fits diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 1a33e400c..737bafc35 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -237,10 +237,14 @@ class ShipBrowser(wx.Panel): for fitID, fitName in cFit.getFitsWithShip(id): self.searchView.AppendItem(childId, fitName, -1, data=wx.TreeItemData(("fit", fitID))) - for id, name, shipRace, shipName in cMarket.searchFits(search): - iconId = self.raceImageIds[shipRace] if shipRace in self.raceImageIds else -1 - self.idRaceMap[id] = shipRace - self.searchView.AppendItem(self.searchRoot, name, iconId, data=wx.TreeItemData(("fit", id))) + # Sort fits by fit name, then ship name + foundFits = cMarket.searchFits(search) + foundFits = sorted(foundFits, key=lambda tuple: tuple[2]) + foundFits = sorted(foundFits, key=lambda tuple: tuple[1]) + for id, name, shipName in foundFits: + iconId = self.shipImageList.Add(bitmapLoader.getBitmap("ship_small", "icons")) + rowText = name + " (" + shipName + ")" + self.searchView.AppendItem(self.searchRoot, rowText, iconId, data=wx.TreeItemData(("fit", id))) #To make sure that the shipView stays in sync, we'll clear its fits data root = self.shipRoot