From 42706f35c65b87485b205def7f2ed52a8509935c Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 25 Jun 2020 20:32:49 -0400 Subject: [PATCH] Update various instances where Category name wasn't displaying the translated version (in context menus) --- eos/gamedata.py | 4 ++-- gui/builtinAdditionPanes/cargoView.py | 2 +- gui/builtinAdditionPanes/droneView.py | 2 +- gui/builtinAdditionPanes/fighterView.py | 2 +- gui/builtinAdditionPanes/implantView.py | 2 +- gui/builtinAdditionPanes/projectedView.py | 2 +- gui/builtinMarketBrowser/itemView.py | 2 +- gui/builtinViews/fittingView.py | 4 ++-- service/market.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eos/gamedata.py b/eos/gamedata.py index d29b45873..e3ec0d48a 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -506,8 +506,8 @@ class Item(EqBase): return False def __repr__(self): - return "Item(ID={}, name={}) at {}".format( - self.ID, self.name, hex(id(self)) + return "Item(ID={}, name={}, display={}) at {}".format( + self.ID, self.typeName, self.name, hex(id(self)) ) diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py index 235f4abb0..9fa39afac 100644 --- a/gui/builtinAdditionPanes/cargoView.py +++ b/gui/builtinAdditionPanes/cargoView.py @@ -227,7 +227,7 @@ class CargoView(d.Display): else: if cargo in self.original: mainCargo = cargo - itemContext = None if mainCargo is None else Market.getInstance().getCategoryByItem(mainCargo.item).name + itemContext = None if mainCargo is None else Market.getInstance().getCategoryByItem(mainCargo.item).displayName menu = ContextMenu.getMenu(self, mainCargo, selection, ("cargoItem", itemContext), ("cargoItemMisc", itemContext)) if menu: self.PopupMenu(menu) diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py index ad10cbfc0..d104bb7a4 100644 --- a/gui/builtinAdditionPanes/droneView.py +++ b/gui/builtinAdditionPanes/droneView.py @@ -324,7 +324,7 @@ class DroneView(Display): if drone in self.original: mainDrone = drone selection = self.getSelectedDrones() - itemContext = None if mainDrone is None else Market.getInstance().getCategoryByItem(mainDrone.item).name + itemContext = None if mainDrone is None else Market.getInstance().getCategoryByItem(mainDrone.item).displayName menu = ContextMenu.getMenu(self, mainDrone, selection, ("droneItem", itemContext), ("droneItemMisc", itemContext)) if menu: self.PopupMenu(menu) diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py index 588dbda6f..dd1da2503 100644 --- a/gui/builtinAdditionPanes/fighterView.py +++ b/gui/builtinAdditionPanes/fighterView.py @@ -382,7 +382,7 @@ class FighterDisplay(d.Display): else: if fighter in self.original: mainFighter = fighter - itemContext = None if mainFighter is None else Market.getInstance().getCategoryByItem(mainFighter.item).name + itemContext = None if mainFighter is None else Market.getInstance().getCategoryByItem(mainFighter.item).displayName menu = ContextMenu.getMenu(self, mainFighter, selection, ("fighterItem", itemContext), ("fighterItemMisc", itemContext)) if menu: self.PopupMenu(menu) diff --git a/gui/builtinAdditionPanes/implantView.py b/gui/builtinAdditionPanes/implantView.py index 967d1aaef..5a28aed94 100644 --- a/gui/builtinAdditionPanes/implantView.py +++ b/gui/builtinAdditionPanes/implantView.py @@ -298,7 +298,7 @@ class ImplantDisplay(d.Display): fit = Fit.getInstance().getFit(fitID) sourceContext1 = "implantItem" if fit.implantSource == ImplantLocation.FIT else "implantItemChar" sourceContext2 = "implantItemMisc" if fit.implantSource == ImplantLocation.FIT else "implantItemMiscChar" - itemContext = None if mainImplant is None else Market.getInstance().getCategoryByItem(mainImplant.item).name + itemContext = None if mainImplant is None else Market.getInstance().getCategoryByItem(mainImplant.item).displayName menu = ContextMenu.getMenu(self, mainImplant, selection, (sourceContext1, itemContext), (sourceContext2, itemContext) diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py index fcbd4937a..87dceaa50 100644 --- a/gui/builtinAdditionPanes/projectedView.py +++ b/gui/builtinAdditionPanes/projectedView.py @@ -308,7 +308,7 @@ class ProjectedView(d.Display): contexts.append(modFullContext) if mainItem.charge is not None: chargeSrcContext = 'projectedCharge' - chargeItemContext = sMkt.getCategoryByItem(mainItem.charge).name + chargeItemContext = sMkt.getCategoryByItem(mainItem.charge).displayName chargeFullContext = (chargeSrcContext, chargeItemContext) contexts.append(chargeFullContext) elif isinstance(mainItem, EosDrone): diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py index ae20cdfce..75aea3236 100644 --- a/gui/builtinMarketBrowser/itemView.py +++ b/gui/builtinMarketBrowser/itemView.py @@ -214,7 +214,7 @@ class ItemView(Display): item = self.active[clickedPos] sMkt = self.sMkt sourceContext = "marketItemMisc" if self.marketBrowser.mode in ("search", "recent") else "marketItemGroup" - itemContext = sMkt.getCategoryByItem(item).name + itemContext = sMkt.getCategoryByItem(item).displayName menu = ContextMenu.getMenu(self, item, (item,), (sourceContext, itemContext)) self.PopupMenu(menu) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index a33a57730..8b55e849f 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -642,13 +642,13 @@ class FittingView(d.Display): contexts = [] if isinstance(mainMod, Module) and not mainMod.isEmpty: srcContext = "fittingModule" - itemContext = sMkt.getCategoryByItem(mainMod.item).name + itemContext = sMkt.getCategoryByItem(mainMod.item).displayName fullContext = (srcContext, itemContext) if srcContext not in tuple(fCtx[0] for fCtx in contexts): contexts.append(fullContext) if mainMod.charge is not None: srcContext = "fittingCharge" - itemContext = sMkt.getCategoryByItem(mainMod.charge).name + itemContext = sMkt.getCategoryByItem(mainMod.charge).displayName fullContext = (srcContext, itemContext) if srcContext not in tuple(fCtxt[0] for fCtxt in contexts): contexts.append(fullContext) diff --git a/service/market.py b/service/market.py index 791a10faf..59ebaf5c5 100644 --- a/service/market.py +++ b/service/market.py @@ -952,7 +952,7 @@ class Market: mktgrpid = self.getMarketGroupByItem(item).ID except AttributeError: mktgrpid = -1 - pyfalog.warning("unable to find market group for {}".format(item.name)) + pyfalog.warning("unable to find market group for {}".format(item.typeName)) if reverseMktGrp: mktgrpid = -mktgrpid parentname = self.getParentItemByItem(item).name