dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Change icon and add appropriate sorting

Browse Source
This commit is contained in:
DarkPhoenix
2010-08-22 23:21:06 +04:00
parent b8c42319e8
commit 608878f3f0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controller/market.py
View File

@@ -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

12
gui/shipBrowser.py
View File

@@ -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