diff --git a/gui/builtinAdditionPanes/boosterView.py b/gui/builtinAdditionPanes/boosterView.py index 8fde281bd..0a3fea2ec 100644 --- a/gui/builtinAdditionPanes/boosterView.py +++ b/gui/builtinAdditionPanes/boosterView.py @@ -210,9 +210,8 @@ class BoosterView(d.Display): else: if booster in self.original: mainBooster = booster - sourceContext = "boosterItem" itemContext = None if mainBooster is None else "Booster" - menu = ContextMenu.getMenu(self, mainBooster, selection, (sourceContext, itemContext)) + menu = ContextMenu.getMenu(self, mainBooster, selection, ("boosterItem", itemContext), ("boosterItemMisc", itemContext)) if menu: self.PopupMenu(menu) diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py index b6d672f3b..a416d865a 100644 --- a/gui/builtinAdditionPanes/cargoView.py +++ b/gui/builtinAdditionPanes/cargoView.py @@ -198,9 +198,8 @@ class CargoView(d.Display): else: if cargo in self.original: mainCargo = cargo - sourceContext = "cargoItem" itemContext = None if mainCargo is None else Market.getInstance().getCategoryByItem(mainCargo.item).name - menu = ContextMenu.getMenu(self, mainCargo, selection, (sourceContext, itemContext)) + 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 e4a435cb5..64ec15557 100644 --- a/gui/builtinAdditionPanes/droneView.py +++ b/gui/builtinAdditionPanes/droneView.py @@ -321,9 +321,8 @@ class DroneView(Display): if drone in self.original: mainDrone = drone selection = self.getSelectedDrones() - sourceContext = "droneItem" itemContext = None if mainDrone is None else Market.getInstance().getCategoryByItem(mainDrone.item).name - menu = ContextMenu.getMenu(self, mainDrone, selection, (sourceContext, itemContext)) + 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 bbc2ed189..7347e6616 100644 --- a/gui/builtinAdditionPanes/fighterView.py +++ b/gui/builtinAdditionPanes/fighterView.py @@ -359,9 +359,8 @@ class FighterDisplay(d.Display): else: if fighter in self.original: mainFighter = fighter - sourceContext = "fighterItem" itemContext = None if mainFighter is None else Market.getInstance().getCategoryByItem(mainFighter.item).name - menu = ContextMenu.getMenu(self, mainFighter, selection, (sourceContext, itemContext)) + 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 136664401..4583faa8c 100644 --- a/gui/builtinAdditionPanes/implantView.py +++ b/gui/builtinAdditionPanes/implantView.py @@ -276,7 +276,7 @@ class ImplantDisplay(d.Display): fitID = self.mainFrame.getActiveFit() fit = Fit.getInstance().getFit(fitID) sourceContext1 = "implantItem" if fit.implantSource == ImplantLocation.FIT else "implantItemChar" - sourceContext2 = "implantView" if fit.implantSource == ImplantLocation.FIT else "implantViewChar" + sourceContext2 = "implantItemMisc" if fit.implantSource == ImplantLocation.FIT else "implantItemMiscChar" itemContext = None if mainImplant is None else Market.getInstance().getCategoryByItem(mainImplant.item).name menu = ContextMenu.getMenu(self, mainImplant, selection, (sourceContext1, itemContext), (sourceContext2, itemContext)) if menu: diff --git a/gui/builtinContextMenus/implantSetAdd.py b/gui/builtinContextMenus/implantSetAdd.py index f44ebc2c1..db669ea6b 100644 --- a/gui/builtinContextMenus/implantSetAdd.py +++ b/gui/builtinContextMenus/implantSetAdd.py @@ -18,7 +18,7 @@ class AddImplantSet(ContextMenuUnconditional): if len(implantSets) == 0: return False - return srcContext in ("implantView", "implantEditor") + return srcContext in ("implantItemMisc", "implantEditor") def getText(self, callingWindow, itmContext): return "Add Implant Set"