Change some context menus to use unconditional class

gui/builtinContextMenus/factorReload.py

@@ -3,27 +3,28 @@ import wx
 
 import gui.globalEvents as GE
 import gui.mainFrame
-from gui.contextMenu import ContextMenuCombined
+from gui.contextMenu import ContextMenuUnconditional
 from service.fit import Fit
 from service.settings import ContextMenuSettings
 
 
-class FactorReload(ContextMenuCombined):
+class FactorReload(ContextMenuUnconditional):
+
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.settings = ContextMenuSettings.getInstance()
 
-    def display(self, srcContext, mainItem, selection):
+    def display(self, srcContext):
         return srcContext == "firepowerViewFull"
 
     @property
     def enabled(self):
         return self.mainFrame.getActiveFit() is not None
 
-    def getText(self, itmContext, mainItem, selection):
+    def getText(self, itmContext):
         return "Factor in Reload Time"
 
-    def activate(self, fullContext, mainItem, selection, i):
+    def activate(self, fullContext, i):
         sFit = Fit.getInstance()
         sFit.serviceFittingOptions["useGlobalForceReload"] = not sFit.serviceFittingOptions["useGlobalForceReload"]
         fitID = self.mainFrame.getActiveFit()