Fix context menu which is used to fill from market

This commit is contained in:
DarkPhoenix
2019-04-23 13:47:47 +03:00
parent ad0c7a7a9d
commit 6615bed1cd
18 changed files with 26 additions and 7 deletions

View File

@@ -1,13 +1,15 @@
from gui.contextMenu import ContextMenu
import gui.mainFrame
# noinspection PyPackageRequirements
import wx
import gui.globalEvents as GE
import gui.mainFrame
from gui.contextMenu import ContextMenu
from service.fit import Fit
from service.settings import ContextMenuSettings
class AmmoToDmgPattern(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -8,7 +8,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class BoosterSideEffect(ContextMenu):
class BoosterSideEffects(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -72,4 +72,4 @@ class BoosterSideEffect(ContextMenu):
fitID=fitID, position=index, effectID=effect.effectID))
BoosterSideEffect.register()
BoosterSideEffects.register()

View File

@@ -10,6 +10,7 @@ from service.settings import ContextMenuSettings
class AddCommandFit(ContextMenu):
# Get list of items that define a command fit
sMkt = Market.getInstance()
grp = sMkt.getGroup(1770) # Command burst group

View File

@@ -13,6 +13,7 @@ from service.settings import ContextMenuSettings
class ChangeDamagePattern(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -9,6 +9,7 @@ from service.settings import ContextMenuSettings
class FighterAbilities(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -9,6 +9,7 @@ from service.fit import Fit
class AddCurrentlyOpenFit(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()

View File

@@ -8,6 +8,7 @@ from service.settings import ContextMenuSettings
class OpenFitInNewTab(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -10,7 +10,8 @@ from service.implantSet import ImplantSets as s_ImplantSets
from service.settings import ContextMenuSettings
class addImplantSet(ContextMenu):
class AddImplantSet(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -85,4 +86,4 @@ class addImplantSet(ContextMenu):
itemIDs=[i.itemID for i in set.implants]))
addImplantSet.register()
AddImplantSet.register()

View File

@@ -15,6 +15,7 @@ from service.settings import ContextMenuSettings
class ChangeItemAmount(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -6,6 +6,7 @@ from service.settings import ContextMenuSettings
class ProjectItem(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -8,6 +8,7 @@ from service.settings import ContextMenuSettings
class RemoveItem(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -14,6 +14,7 @@ from service.settings import ContextMenuSettings
class ChangeModuleAmmo(ContextMenu):
DAMAGE_TYPES = ("em", "explosive", "kinetic", "thermal")
MISSILE_ORDER = ("em", "thermal", "kinetic", "explosive", "mixed")

View File

@@ -6,15 +6,17 @@ from service.settings import ContextMenuSettings
class FillWithModule(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
def display(self, srcContext, mainItem, selection):
if not self.settings.get('moduleFill'):
return False
if mainItem is None or mainItem.isEmpty:
if mainItem is None or getattr(mainItem, 'isEmpty', False):
return False
return srcContext == "fittingModule"

View File

@@ -9,6 +9,7 @@ from service.fit import Fit
class ChangeModuleMutation(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -11,6 +11,7 @@ from service.fit import Fit
class ChangeModuleSpool(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -9,6 +9,7 @@ from service.settings import ContextMenuSettings
class JumpToShip(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -9,6 +9,7 @@ from service.settings import ContextMenuSettings
class ChangeShipTacticalMode(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()

View File

@@ -13,6 +13,7 @@ from service.targetResists import TargetResists as svc_TargetResists
class TargetResists(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()