From 212ef42af276df8c62515b61e9b96347aa3201c3 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Mon, 25 Oct 2010 16:31:59 +0200 Subject: [PATCH] Revert "Sort itemView of the marketbrowser by meta level, highest meta level on top, ticket 90" This reverts commit f5e83f04155f76f255f7ec520de496b40b194c8e. --- gui/marketBrowser.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 68bcb8915..02f55970c 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -23,10 +23,8 @@ import wx.lib.newevent import service import bitmapLoader import gui.mainFrame -import eos.db from gui.cachingImageList import CachingImageList from gui.contextMenu import ContextMenu -from eos.saveddata import module ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent() @@ -335,15 +333,11 @@ class MarketBrowser(wx.Panel): self.toggleButtons(usedMetas) def sort(id1, id2): - item1 = eos.db.getItem(id1) - item2 = eos.db.getItem(id2) - - if item1.getAttribute("metaLevel") > item2.getAttribute("metaLevel"): - return -1 - elif item1.getAttribute("metaLevel") == item2.getAttribute("metaLevel"): - return 0 - else: - return 1 + 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)