dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Update various instances where Category name wasn't displaying the translated version (in context menus)

Browse Source
This commit is contained in:
blitzmann
2020-06-25 20:32:49 -04:00
parent c7ec87b979
commit 42706f35c6
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eos/gamedata.py
View File

@@ -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))
)

2
gui/builtinAdditionPanes/cargoView.py
View File

@@ -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)

2
gui/builtinAdditionPanes/droneView.py
View File

@@ -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)

2
gui/builtinAdditionPanes/fighterView.py
View File

@@ -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)

2
gui/builtinAdditionPanes/implantView.py
View File

@@ -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)

2
gui/builtinAdditionPanes/projectedView.py
View File

@@ -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):

2
gui/builtinMarketBrowser/itemView.py
View File

@@ -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)

4
gui/builtinViews/fittingView.py
View File

@@ -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)

2
service/market.py
View File

@@ -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