diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py index ae20cdfce2..c1db950b4f 100644 --- a/gui/builtinMarketBrowser/itemView.py +++ b/gui/builtinMarketBrowser/itemView.py @@ -20,7 +20,8 @@ class ItemView(Display): DEFAULT_COLS = ["Base Icon", "Base Name", "attr:power,,,True", - "attr:cpu,,,True"] + "attr:cpu,,,True", + "Price"] def __init__(self, parent, marketBrowser): Display.__init__(self, parent, style=wx.LC_SINGLE_SEL) diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py index 6a79f0bd4a..00a01400d8 100644 --- a/gui/builtinViewColumns/price.py +++ b/gui/builtinViewColumns/price.py @@ -24,6 +24,7 @@ from eos.saveddata.drone import Drone from eos.saveddata.fighter import Fighter from eos.saveddata.module import Module +from eos.gamedata import Item from eos.saveddata.price import PriceStatus from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount @@ -53,7 +54,7 @@ def __init__(self, fittingView, params): self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "gui") def getText(self, stuff): - if stuff.item is None or stuff.item.group.name == "Ship Modifiers": + if not isinstance(stuff, Item) and (stuff.item is None or stuff.item.group.name == "Ship Modifiers"): return "" if hasattr(stuff, "isEmpty"): @@ -63,7 +64,7 @@ def getText(self, stuff): if isinstance(stuff, Module) and stuff.isMutated: return "" - priceObj = stuff.item.price + priceObj = stuff.price if isinstance(stuff, Item) else stuff.item.price if not priceObj.isValid(): return False @@ -79,7 +80,9 @@ def callback(item): display.SetItem(colItem) - sPrice.getPrices([mod.item], callback, waitforthread=True) + item = mod if isinstance(mod, Item) else mod.item + wait = not isinstance(mod, Item) + sPrice.getPrices([item], callback, waitforthread=wait) def getImageId(self, mod): return -1