From 3727d19311c1fefa537a4a89085e44855b0dd3a9 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Fri, 31 Jan 2020 10:32:18 +0300 Subject: [PATCH] In attribute editor what is you see is what you get now --- gui/propertyEditor.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/gui/propertyEditor.py b/gui/propertyEditor.py index d3a159fb8..36fa294fb 100644 --- a/gui/propertyEditor.py +++ b/gui/propertyEditor.py @@ -168,10 +168,7 @@ class ItemView(d.Display): def __init__(self, parent): d.Display.__init__(self, parent) - sMkt = Market.getInstance() - - self.things = sMkt.getItemsWithOverrides() - self.items = self.things + self.activeItems = [] self.searchBox = parent.Parent.Parent.searchBox # Bind search actions @@ -180,20 +177,16 @@ class ItemView(d.Display): self.searchBox.Bind(SBox.EVT_CANCEL_BTN, self.clearSearch) self.searchBox.Bind(SBox.EVT_TEXT, self.scheduleSearch) - self.update(self.items) + self.update(Market.getInstance().getItemsWithOverrides()) def clearSearch(self, event=None): if event: self.searchBox.Clear() - self.items = self.things - self.update(self.items) + self.update(Market.getInstance().getItemsWithOverrides()) def updateItems(self, updateDisplay=False): - sMkt = Market.getInstance() - self.things = sMkt.getItemsWithOverrides() - self.items = self.things if updateDisplay: - self.update(self.things) + self.update(Market.getInstance().getItemsWithOverrides()) def scheduleSearch(self, event=None): sMkt = Market.getInstance() @@ -226,13 +219,13 @@ class ItemView(d.Display): return not isFittable, catname, mktgrpid, parentname, metatab, metalvl, item.name def populateSearch(self, items): - self.items = list(items) self.update(items) def populate(self, items): if len(items) > 0: self.unselectAll() items.sort(key=self.itemSort) + self.activeItems = items d.Display.populate(self, items) def refresh(self, items): @@ -264,7 +257,7 @@ class AttributeGrid(wxpg.PropertyGrid): self.Clear() self.btn.Enable(True) sel = event.EventObject.GetFirstSelected() - self.item = item = self.itemView.items[sel] + self.item = item = self.itemView.activeItems[sel] for key in sorted(item.attributes.keys()): override = item.overrides.get(key, None)