diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py index 844d43f3c..bc6f1648b 100644 --- a/gui/builtinMarketBrowser/itemView.py +++ b/gui/builtinMarketBrowser/itemView.py @@ -23,6 +23,7 @@ class ItemView(Display): DEFAULT_COLS = ["Base Icon", "Base Name", + "Price", "attr:power,,,True", "attr:cpu,,,True"] diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py index 6a79f0bd4..42ef36db2 100644 --- a/gui/builtinViewColumns/price.py +++ b/gui/builtinViewColumns/price.py @@ -20,6 +20,7 @@ # noinspection PyPackageRequirements import wx +from eos.gamedata import Item from eos.saveddata.cargo import Cargo from eos.saveddata.drone import Drone from eos.saveddata.fighter import Fighter @@ -53,7 +54,14 @@ class Price(ViewColumn): 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 isinstance(stuff, Item): + item = stuff + else: + if not hasattr(stuff, "item") or stuff.item is None: + return "" + item = stuff.item + + if item.group.name == "Ship Modifiers": return "" if hasattr(stuff, "isEmpty"): @@ -63,7 +71,7 @@ class Price(ViewColumn): if isinstance(stuff, Module) and stuff.isMutated: return "" - priceObj = stuff.item.price + priceObj = item.price if not priceObj.isValid(): return False @@ -79,7 +87,11 @@ class Price(ViewColumn): display.SetItem(colItem) - sPrice.getPrices([mod.item], callback, waitforthread=True) + if isinstance(mod, Item): + item = mod + else: + item = mod.item + sPrice.getPrices([item], callback, waitforthread=True) def getImageId(self, mod): return -1