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

Sort by groups first, then name

Browse Source
This commit is contained in:
cncfanatics
2010-08-23 23:26:28 +02:00
parent 22cc5dc243
commit b9857157b4
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controller/market.py
View File

@@ -92,7 +92,7 @@ class Market():
items = []
for item in results:
if item.category.name in self.SEARCH_CATEGORIES:
items.append((item.ID, item.name, item.metaGroup.ID if item.metaGroup else 1, item.icon.iconFile if item.icon else ""))
items.append((item.ID, item.name, item.group.name, item.metaGroup.ID if item.metaGroup else 1, item.icon.iconFile if item.icon else ""))
return items

12
gui/marketBrowser.py
View File

@@ -238,15 +238,23 @@ class MarketBrowser(wx.Panel):
self.itemImageList.RemoveAll()
idNameMap = {}
idGroupMap = {}
cMarket = controller.Market.getInstance()
for id, name, metaGroupID, iconFile in self.searchResults:
for id, name, group, metaGroupID, iconFile in self.searchResults:
if cMarket.isMetaIdActive(metaGroupID):
iconId = self.addItemViewImage(iconFile)
index = self.itemView.InsertImageStringItem(sys.maxint, name, iconId)
idNameMap[id] = name
idGroupMap[id] = group
self.itemView.SetItemData(index, id)
self.itemView.SortItems(lambda id1, id2: cmp(idNameMap[id1], idNameMap[id2]))
def sort(id1, id2):
grp = cmp(idGroupMap[id1], idGroupMap[id2])
if grp != 0:
return grp
return cmp(idNameMap[id1], idNameMap[id2])
self.itemView.SortItems(sort)
self.itemView.SetColumnWidth(0, wx.LIST_AUTOSIZE)
class MarketTree(wx.TreeCtrl):