diff --git a/gui/builtinContextMenus/priceOptions.py b/gui/builtinContextMenus/priceOptions.py index df7a397f7..905ca9d4b 100644 --- a/gui/builtinContextMenus/priceOptions.py +++ b/gui/builtinContextMenus/priceOptions.py @@ -1,10 +1,9 @@ -from gui.contextMenu import ContextMenu -import gui.mainFrame -# noinspection PyPackageRequirements import wx + import gui.globalEvents as GE -from service.price import Price -from service.settings import ContextMenuSettings, PriceMenuSettings +import gui.mainFrame +from gui.contextMenu import ContextMenu +from service.settings import PriceMenuSettings class PriceOptions(ContextMenu): @@ -47,4 +46,5 @@ class PriceOptions(ContextMenu): wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit())) + PriceOptions.register() diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py index 9a4a20473..b315c6161 100644 --- a/gui/builtinStatsViews/priceViewFull.py +++ b/gui/builtinStatsViews/priceViewFull.py @@ -19,8 +19,9 @@ # noinspection PyPackageRequirements import wx -from gui.statsView import StatsView + from gui.bitmapLoader import BitmapLoader +from gui.statsView import StatsView from gui.utils.numberFormatter import formatAmount from service.price import Price from service.settings import PriceMenuSettings @@ -131,13 +132,13 @@ class PriceViewFull(StatsView): if (self.settings.get("ship")): total_price += ship_price - if(self.settings.get("modules")): + if (self.settings.get("modules")): total_price += module_price - if(self.settings.get("drones")): + if (self.settings.get("drones")): total_price += drone_price + fighter_price - if(self.settings.get("cargo")): + if (self.settings.get("cargo")): total_price += cargo_price - if(self.settings.get("character")): + if (self.settings.get("character")): total_price += booster_price + implant_price self.labelPriceShip.SetLabel("%s ISK" % formatAmount(ship_price, 3, 3, 9, currency=True)) @@ -155,11 +156,10 @@ class PriceViewFull(StatsView): self.labelPriceCargobay.SetLabel("%s ISK" % formatAmount(cargo_price, 3, 3, 9, currency=True)) self.labelPriceCargobay.SetToolTip(wx.ToolTip('{:,.2f}'.format(cargo_price))) - self.labelPriceCharacter.SetLabel("%s ISK" % formatAmount(booster_price + implant_price, 3, 3, 9, currency=True)) + self.labelPriceCharacter.SetLabel( + "%s ISK" % formatAmount(booster_price + implant_price, 3, 3, 9, currency=True)) self.labelPriceCharacter.SetToolTip(wx.ToolTip('{:,.2f}'.format(booster_price + implant_price))) - - def processPrices(self, prices): self.refreshPanelPrices(self.fit)