Start reworking context menus into several special classes to improve…

… menu handling consistency

gui/builtinContextMenus/ammoToDmgPattern.py

@@ -3,12 +3,12 @@
 
 import gui.globalEvents as GE
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class AmmoToDmgPattern(ContextMenu):
+class AmmoToDmgPattern(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()

gui/builtinContextMenus/boosterSideEffects.py

@@ -3,12 +3,12 @@
 
 import gui.mainFrame
 from gui import fitCommands as cmd
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class BoosterSideEffects(ContextMenu):
+class BoosterSideEffects(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -34,7 +34,7 @@ def getText(self, itmContext, mainItem, selection):
 
     def addEffect(self, menu, ability):
         label = ability.name
-        id = ContextMenu.nextID()
+        id = ContextMenuCombined.nextID()
         self.effectIds[id] = ability
 
         menuItem = wx.MenuItem(menu, id, label, kind=wx.ITEM_CHECK)

gui/builtinContextMenus/cargoAdd.py

@@ -1,11 +1,11 @@
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class AddToCargo(ContextMenu):
+class AddToCargo(ContextMenuCombined):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.settings = ContextMenuSettings.getInstance()

gui/builtinContextMenus/cargoAddAmmo.py

@@ -1,10 +1,10 @@
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.settings import ContextMenuSettings
 
 
-class AddToCargoAmmo(ContextMenu):
+class AddToCargoAmmo(ContextMenuCombined):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.settings = ContextMenuSettings.getInstance()

gui/builtinContextMenus/commandFitAdd.py

@@ -3,13 +3,13 @@
 
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.market import Market
 from service.settings import ContextMenuSettings
 
 
-class AddCommandFit(ContextMenu):
+class AddCommandFit(ContextMenuCombined):
 
     # Get list of items that define a command fit
     sMkt = Market.getInstance()
@@ -53,7 +53,7 @@ def getText(self, itmContext, mainItem, selection):
 
     def addFit(self, menu, fit, includeShip=False):
         label = fit.name if not includeShip else "({}) {}".format(fit.ship.item.name, fit.name)
-        id = ContextMenu.nextID()
+        id = ContextMenuCombined.nextID()
         self.fitMenuItemIds[id] = fit
         menuItem = wx.MenuItem(menu, id, label)
         menu.Bind(wx.EVT_MENU, self.handleSelection, menuItem)
@@ -80,7 +80,7 @@ def getSubMenu(self, context, mainItem, selection, rootMenu, i, pitem):
                 typeDict[shipName].append(fit)
 
             for ship in sorted(typeDict.keys()):
-                shipItem = wx.MenuItem(sub, ContextMenu.nextID(), ship)
+                shipItem = wx.MenuItem(sub, ContextMenuCombined.nextID(), ship)
                 grandSub = wx.Menu()
                 shipItem.SetSubMenu(grandSub)
 

gui/builtinContextMenus/damagePatternChange.py

@@ -6,13 +6,13 @@
 import gui.globalEvents as GE
 import gui.mainFrame
 from gui.bitmap_loader import BitmapLoader
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.damagePattern import DamagePattern as import_DamagePattern
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class ChangeDamagePattern(ContextMenu):
+class ChangeDamagePattern(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -56,7 +56,7 @@ def getText(self, itmContext, mainItem, selection):
         return self.m
 
     def addPattern(self, rootMenu, pattern):
-        id = ContextMenu.nextID()
+        id = ContextMenuCombined.nextID()
         name = getattr(pattern, "_name", pattern.name) if pattern is not None else "No Profile"
 
         self.patternIds[id] = pattern

gui/builtinContextMenus/droneAddStack.py

@@ -1,12 +1,12 @@
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from gui.fitCommands.helpers import droneStackLimit
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class DroneAddStack(ContextMenu):
+class DroneAddStack(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()

gui/builtinContextMenus/droneSplitStack.py

@@ -5,12 +5,12 @@
 
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class DroneSplitStack(ContextMenu):
+class DroneSplitStack(ContextMenuCombined):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.settings = ContextMenuSettings.getInstance()

gui/builtinContextMenus/envEffectAdd.py

@@ -6,12 +6,12 @@
 
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.market import Market
 from service.settings import ContextMenuSettings
 
 
-class AddEnvironmentEffect(ContextMenu):
+class AddEnvironmentEffect(ContextMenuCombined):
 
     # CCP doesn't currently provide a mapping between the general Environment, and the specific environment effect
     # (which can be random when going into Abyssal space). This is how we currently define it:
@@ -92,7 +92,7 @@ def buildMenu(self, grouped_data, flat_data, local_menu, rootMenu, msw):
 
         def processFlat(data, root, sub):
             for swData in sorted(data, key=lambda tpl: tpl[2]):
-                wxid = ContextMenu.nextID()
+                wxid = ContextMenuCombined.nextID()
                 swObj, swName, swClass = swData
                 self.idmap[wxid] = (swObj, swName)
                 subItem = wx.MenuItem(sub, wxid, swClass)

gui/builtinContextMenus/factorReload.py

@@ -3,12 +3,12 @@
 
 import gui.globalEvents as GE
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class FactorReload(ContextMenu):
+class FactorReload(ContextMenuCombined):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.settings = ContextMenuSettings.getInstance()

gui/builtinContextMenus/fighterAbilities.py

@@ -3,12 +3,12 @@
 
 import gui.mainFrame
 from gui import fitCommands as cmd
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class FighterAbilities(ContextMenu):
+class FighterAbilities(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -31,7 +31,7 @@ def getText(self, itmContext, mainItem, selection):
 
     def addAbility(self, menu, ability):
         label = ability.name
-        id = ContextMenu.nextID()
+        id = ContextMenuCombined.nextID()
         self.abilityIds[id] = ability
         menuItem = wx.MenuItem(menu, id, label, kind=wx.ITEM_CHECK)
         menu.Bind(wx.EVT_MENU, self.handleMode, menuItem)

gui/builtinContextMenus/fitAddCurrentlyOpen.py

@@ -4,11 +4,11 @@
 import gui.fitCommands as cmd
 import gui.mainFrame
 from gui.builtinViews.emptyView import BlankPage
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 
 
-class AddCurrentlyOpenFit(ContextMenu):
+class AddCurrentlyOpenFit(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -41,7 +41,7 @@ def getSubMenu(self, context, mainItem, selection, rootMenu, i, pitem):
             if isinstance(page, BlankPage):
                 continue
             fit = sFit.getFit(page.activeFitID, basic=True)
-            id = ContextMenu.nextID()
+            id = ContextMenuCombined.nextID()
             mitem = wx.MenuItem(rootMenu, id, "{}: {}".format(fit.ship.item.name, fit.name))
             bindmenu.Bind(wx.EVT_MENU, self.handleSelection, mitem)
             self.fitLookup[id] = fit

gui/builtinContextMenus/fitOpenNewTab.py

@@ -3,11 +3,11 @@
 
 import gui.mainFrame
 from gui.builtinShipBrowser.events import FitSelected
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.settings import ContextMenuSettings
 
 
-class OpenFitInNewTab(ContextMenu):
+class OpenFitInNewTab(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()

gui/builtinContextMenus/implantSetAdd.py

@@ -4,13 +4,13 @@
 import gui.fitCommands as cmd
 import gui.globalEvents as GE
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.character import Character
 from service.implantSet import ImplantSets as s_ImplantSets
 from service.settings import ContextMenuSettings
 
 
-class AddImplantSet(ContextMenu):
+class AddImplantSet(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -56,7 +56,7 @@ def getSubMenu(self, context, mainItem, selection, rootMenu, i, pitem):
         self.idmap = {}
 
         for set in implantSets:
-            id = ContextMenu.nextID()
+            id = ContextMenuCombined.nextID()
             mitem = wx.MenuItem(rootMenu, id, set.name)
             bindmenu.Bind(wx.EVT_MENU, self.handleSelection, mitem)
             self.idmap[id] = set

gui/builtinContextMenus/itemAmountChange.py

@@ -9,12 +9,12 @@
 from eos.saveddata.drone import Drone
 from eos.saveddata.fighter import Fighter as es_Fighter
 from eos.saveddata.fit import Fit as es_Fit
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class ChangeItemAmount(ContextMenu):
+class ChangeItemAmount(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()

gui/builtinContextMenus/itemFill.py

@@ -1,10 +1,10 @@
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.settings import ContextMenuSettings
 
 
-class FillWithItem(ContextMenu):
+class FillWithItem(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()

gui/builtinContextMenus/itemMarketJump.py

@@ -1,10 +1,10 @@
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.market import Market
 from service.settings import ContextMenuSettings
 
 
-class JumpToMarketItem(ContextMenu):
+class JumpToMarketItem(ContextMenuCombined):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.settings = ContextMenuSettings.getInstance()

gui/builtinContextMenus/itemProject.py

@@ -1,11 +1,11 @@
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class ProjectItem(ContextMenu):
+class ProjectItem(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()

gui/builtinContextMenus/itemRemove.py

@@ -2,12 +2,12 @@
 
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class RemoveItem(ContextMenu):
+class RemoveItem(ContextMenuCombined):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()

gui/builtinContextMenus/itemStats.py

@@ -2,13 +2,13 @@
 import wx
 
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from gui.itemStats import ItemStatsDialog
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class ItemStats(ContextMenu):
+class ItemStats(ContextMenuCombined):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.settings = ContextMenuSettings.getInstance()

gui/builtinContextMenus/itemVariationChange.py

@@ -3,13 +3,13 @@
 
 import gui.fitCommands as cmd
 import gui.mainFrame
-from gui.contextMenu import ContextMenu
+from gui.contextMenu import ContextMenuCombined
 from service.fit import Fit
 from service.market import Market
 from service.settings import ContextMenuSettings
 
 
-class ChangeItemToVariation(ContextMenu):
+class ChangeItemToVariation(ContextMenuCombined):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.settings = ContextMenuSettings.getInstance()
@@ -119,11 +119,11 @@ def get_boosterrank(x):
 
             if thisgroup != group and context not in ('implantItem', 'boosterItem'):
                 group = thisgroup
-                id = ContextMenu.nextID()
+                id = ContextMenuCombined.nextID()
                 m.Append(id, '─ %s ─' % group)
                 m.Enable(id, False)
 
-            id = ContextMenu.nextID()
+            id = ContextMenuCombined.nextID()
             mitem = wx.MenuItem(rootMenu, id, item.name)
             bindmenu.Bind(wx.EVT_MENU, self.handleModule, mitem)