Make togglebuttons work with search too. And activate em all by default when a search starts
This commit is contained in:
@@ -157,6 +157,13 @@ class MarketBrowser(wx.Panel):
|
|||||||
self.itemView.DeleteAllItems()
|
self.itemView.DeleteAllItems()
|
||||||
self.itemImageList.RemoveAll()
|
self.itemImageList.RemoveAll()
|
||||||
|
|
||||||
|
if self.searching:
|
||||||
|
self.searching = False
|
||||||
|
for name in ("faction", "complex", "officer"):
|
||||||
|
getattr(self, name).SetValue(False)
|
||||||
|
|
||||||
|
self.normal.SetValue(True)
|
||||||
|
|
||||||
root = self.marketView.GetSelection()
|
root = self.marketView.GetSelection()
|
||||||
if self.marketView.GetChildrenCount(root) != 0:
|
if self.marketView.GetChildrenCount(root) != 0:
|
||||||
return
|
return
|
||||||
@@ -194,7 +201,10 @@ class MarketBrowser(wx.Panel):
|
|||||||
else:
|
else:
|
||||||
cMarket.disableMetaGroup(btn.metaName)
|
cMarket.disableMetaGroup(btn.metaName)
|
||||||
|
|
||||||
self.selectionMade(event)
|
if self.searching:
|
||||||
|
self.filteredSearchAdd()
|
||||||
|
else:
|
||||||
|
self.selectionMade(event)
|
||||||
|
|
||||||
def scheduleSearch(self, event):
|
def scheduleSearch(self, event):
|
||||||
self.searchTimer.Stop()
|
self.searchTimer.Stop()
|
||||||
@@ -206,6 +216,10 @@ class MarketBrowser(wx.Panel):
|
|||||||
self.clearSearch(event, False)
|
self.clearSearch(event, False)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if not self.searching:
|
||||||
|
for name in ("normal", "faction", "complex", "officer"):
|
||||||
|
getattr(self, name).SetValue(True)
|
||||||
|
|
||||||
self.searching = True
|
self.searching = True
|
||||||
cMarket = controller.Market.getInstance()
|
cMarket = controller.Market.getInstance()
|
||||||
self.searchResults = cMarket.searchItems(search)
|
self.searchResults = cMarket.searchItems(search)
|
||||||
|
|||||||
Reference in New Issue
Block a user