Pass item which is considered to be clicked item to context menus

gui/builtinAdditionPanes/boosterView.py

@@ -191,5 +191,5 @@ def spawnMenu(self, event):
                 return None
             srcContext = "boosterItem"
             itemContext = "Booster"
-            menu = ContextMenu.getMenu((booster,), (srcContext, itemContext))
+            menu = ContextMenu.getMenu(booster, (booster,), (srcContext, itemContext))
             self.PopupMenu(menu)

gui/builtinAdditionPanes/cargoView.py

@@ -187,5 +187,5 @@ def spawnMenu(self, event):
             sourceContext = "cargoItem"
             itemContext = sMkt.getCategoryByItem(cargo.item).name
 
-            menu = ContextMenu.getMenu((cargo,), (sourceContext, itemContext))
+            menu = ContextMenu.getMenu(cargo, (cargo,), (sourceContext, itemContext))
             self.PopupMenu(menu)

gui/builtinAdditionPanes/commandView.py

@@ -202,7 +202,7 @@ def spawnMenu(self, event):
             context = ((fitSrcContext, fitItemContext),)
 
         context += (("commandView",),)
-        menu = ContextMenu.getMenu((item,) if item is not None else [], *context)
+        menu = ContextMenu.getMenu(item, (item,) if item is not None else [], *context)
         if menu is not None:
             self.PopupMenu(menu)
 

gui/builtinAdditionPanes/droneView.py

@@ -289,5 +289,5 @@ def spawnMenu(self, event):
             sMkt = Market.getInstance()
             sourceContext = "droneItem"
             itemContext = sMkt.getCategoryByItem(drone.item).name
-            menu = ContextMenu.getMenu((drone,), (sourceContext, itemContext))
+            menu = ContextMenu.getMenu(drone, (drone,), (sourceContext, itemContext))
             self.PopupMenu(menu)

gui/builtinAdditionPanes/fighterView.py

@@ -316,5 +316,5 @@ def spawnMenu(self, event):
             sMkt = Market.getInstance()
             sourceContext = "fighterItem"
             itemContext = sMkt.getCategoryByItem(fighter.item).name
-            menu = ContextMenu.getMenu((fighter,), (sourceContext, itemContext))
+            menu = ContextMenu.getMenu(fighter, (fighter,), (sourceContext, itemContext))
             self.PopupMenu(menu)

gui/builtinAdditionPanes/implantView.py

@@ -262,12 +262,12 @@ def spawnMenu(self, event):
             sourceContext = "implantItem" if fit.implantSource == ImplantLocation.FIT else "implantItemChar"
             itemContext = sMkt.getCategoryByItem(implant.item).name
             fullContext = ((sourceContext, itemContext), ("implantView", itemContext))
-            menu = ContextMenu.getMenu((implant,), *fullContext)
+            menu = ContextMenu.getMenu(implant, (implant,), *fullContext)
         elif sel == -1 and fit.implantSource == ImplantLocation.FIT:
             fitID = self.mainFrame.getActiveFit()
             if fitID is None:
                 return
             context = ("implantView",)
-            menu = ContextMenu.getMenu([], context)
+            menu = ContextMenu.getMenu(None, [], context)
         if menu is not None:
             self.PopupMenu(menu)

gui/builtinAdditionPanes/projectedView.py

@@ -323,7 +323,7 @@ def spawnMenu(self, event):
                 context = ((fitSrcContext, fitItemContext),)
 
         context += (("projected",),)
-        menu = ContextMenu.getMenu((item,) if item is not None else [], *context)
+        menu = ContextMenu.getMenu(item, (item,) if item is not None else [], *context)
 
         if menu is not None:
             self.PopupMenu(menu)

gui/builtinItemStatsViews/itemAffectedBy.py

@@ -82,7 +82,8 @@ def spawnMenu(self, event):
         # instead, we send the item.
         type_ = stuff.__class__.__name__
         contexts.append(("itemStats", type_))
-        menu = ContextMenu.getMenu(stuff if type_ != "Skill" else stuff.item, *contexts)
+        stuff = stuff if type_ != "Skill" else stuff.item
+        menu = ContextMenu.getMenu(stuff, (stuff,), *contexts)
         self.PopupMenu(menu)
 
     def ExpandCollapseTree(self):

gui/builtinMarketBrowser/itemView.py

@@ -247,7 +247,7 @@ def contextMenu(self, event):
         sourceContext = "marketItemMisc" if self.marketBrowser.mode in ("search", "recent") else "marketItemGroup"
         itemContext = sMkt.getCategoryByItem(item).name
 
-        menu = ContextMenu.getMenu((item,), (sourceContext, itemContext))
+        menu = ContextMenu.getMenu(item, (item,), (sourceContext, itemContext))
         self.PopupMenu(menu)
 
     def populate(self, items):

gui/builtinShipBrowser/shipItem.py

@@ -108,7 +108,7 @@ def OnShowPopup(self, event):
         pos = event.GetPosition()
         pos = self.ScreenToClient(pos)
         contexts = [("baseShip", "Ship Basic")]
-        menu = ContextMenu.getMenu(self.baseItem, *contexts)
+        menu = ContextMenu.getMenu(self.baseItem, (self.baseItem,), *contexts)
         self.PopupMenu(menu, pos)
 
     def OnTimer(self, event):

gui/builtinViews/fittingView.py

@@ -602,7 +602,6 @@ def slotsChanged(self):
         self.populate(self.mods)
 
     def fitChanged(self, event):
-        # print('====== Fit Changed: {} {} activeFitID: {}, eventFitID: {}'.format(repr(self), str(bool(self)), self.activeFitID, event.fitID))
         if not self:
             event.Skip()
             return
@@ -626,7 +625,6 @@ def spawnMenu(self, event):
             return
         sMkt = Market.getInstance()
         selection = []
-        sel = self.GetFirstSelected()
         contexts = []
 
         for mod in self.getSelectedMods():
@@ -658,7 +656,7 @@ def spawnMenu(self, event):
 
         contexts.append(("fittingShip", "Ship" if not fit.isStructure else "Citadel"))
 
-        menu = ContextMenu.getMenu(selection, *contexts)
+        menu = ContextMenu.getMenu(selection[0], selection, *contexts)
         self.PopupMenu(menu)
 
     def click(self, event):

gui/characterEditor.py

@@ -417,8 +417,8 @@ def __init__(self, parent):
         srcContext = "skillItem"
         itemContext = "Skill"
         context = (srcContext, itemContext)
-        self.statsMenu = ContextMenu.getMenu(None, context)
-        self.levelChangeMenu = ContextMenu.getMenu(None, context) or wx.Menu()
+        self.statsMenu = ContextMenu.getMenu(None, None, context)
+        self.levelChangeMenu = ContextMenu.getMenu(None, None, context) or wx.Menu()
         self.levelChangeMenu.AppendSeparator()
         self.levelIds = {}
 
@@ -715,7 +715,8 @@ def spawnMenu(self, event):
         context = (("implantEditor",),)
         # fuck good coding practices, passing a pointer to the character editor here for [reasons] =D
         # (see implantSets context class for info)
-        menu = ContextMenu.getMenu((self.Parent.Parent,), *context)
+        item = self.Parent.Parent
+        menu = ContextMenu.getMenu(item, (item,), *context)
 
         if menu:
             self.PopupMenu(menu)

gui/contextMenu.py

@@ -44,7 +44,7 @@ def hasMenu(cls, selection, *fullContexts):
             return False
 
     @classmethod
-    def getMenu(cls, selection, *fullContexts):
+    def getMenu(cls, main, selection, *fullContexts):
         """
         getMenu returns a menu that is used with wx.PopupMenu.
 

gui/statsPane.py

@@ -134,7 +134,7 @@ def contextHandler(contentPanel, tp):
         viewName = contentPanel.viewName
 
         def handler(event):
-            menu = ContextMenu.getMenu(None, (viewName,))
+            menu = ContextMenu.getMenu(None, None, (viewName,))
 
             if menu is not None:
                 contentPanel.PopupMenu(menu)