From b1bcd96c576ab4d2638d6613e39d06bd2589e8f8 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Thu, 21 Oct 2010 12:22:44 +0200 Subject: [PATCH] Automagicly jump to the relevant metagroup too when jumping to items --- eos | 2 +- gui/marketBrowser.py | 10 ++++++++++ service/market.py | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/eos b/eos index bb51319d8..176b0b9df 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit bb51319d8694a9a9e434a687267560ab9d45508a +Subproject commit 176b0b9df93e8f2f79183fae44608ca20609941a diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 0d6250f8f..8f297e0b9 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -133,6 +133,15 @@ class MarketBrowser(wx.Panel): mg = item.marketGroup if mg is None and item.metaGroup is not None: mg = item.metaGroup.parent.marketGroup + cMarket = service.Market.getInstance() + for btn in ("normal", "faction", "complex", "officer"): + getattr(self, btn).SetValue(False) + cMarket.disableMetaGroup(btn) + + metaGroup = item.metaGroup.name.lower() + getattr(self, metaGroup).SetValue(True) + cMarket.activateMetaGroup(metaGroup) + self.searching = False if mg is None: return @@ -153,6 +162,7 @@ class MarketBrowser(wx.Panel): self.marketView.Expand(item) self.marketView.SelectItem(item) + self.searching = True def addMarketViewImage(self, iconFile): if iconFile is None: diff --git a/service/market.py b/service/market.py index 9f6fad638..f8c7fac44 100644 --- a/service/market.py +++ b/service/market.py @@ -23,6 +23,7 @@ import wx import threading from sqlalchemy.orm.exc import NoResultFound import Queue +import traceback class PriceWorkerThread(threading.Thread): def run(self):