From 6615bed1cd9a5f119c26031a95dd4fe85ed7c0c9 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 23 Apr 2019 13:47:47 +0300 Subject: [PATCH] Fix context menu which is used to fill from market --- gui/builtinContextMenus/ammoToDmgPattern.py | 6 ++++-- gui/builtinContextMenus/boosterSideEffects.py | 4 ++-- gui/builtinContextMenus/commandFitAdd.py | 1 + gui/builtinContextMenus/damagePatternChange.py | 1 + gui/builtinContextMenus/fighterAbilities.py | 1 + gui/builtinContextMenus/fitAddCurrentlyOpen.py | 1 + gui/builtinContextMenus/fitOpenNewTab.py | 1 + gui/builtinContextMenus/implantSetAdd.py | 5 +++-- gui/builtinContextMenus/itemAmountChange.py | 1 + gui/builtinContextMenus/itemProject.py | 1 + gui/builtinContextMenus/itemRemove.py | 1 + gui/builtinContextMenus/moduleAmmoChange.py | 1 + gui/builtinContextMenus/moduleFill.py | 4 +++- gui/builtinContextMenus/moduleMutations.py | 1 + gui/builtinContextMenus/moduleSpool.py | 1 + gui/builtinContextMenus/shipJump.py | 1 + gui/builtinContextMenus/shipModeChange.py | 1 + gui/builtinContextMenus/targetResists.py | 1 + 18 files changed, 26 insertions(+), 7 deletions(-) diff --git a/gui/builtinContextMenus/ammoToDmgPattern.py b/gui/builtinContextMenus/ammoToDmgPattern.py index 8f5ece07b..cfffaf11e 100644 --- a/gui/builtinContextMenus/ammoToDmgPattern.py +++ b/gui/builtinContextMenus/ammoToDmgPattern.py @@ -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() diff --git a/gui/builtinContextMenus/boosterSideEffects.py b/gui/builtinContextMenus/boosterSideEffects.py index d50eef78e..93c5038c2 100644 --- a/gui/builtinContextMenus/boosterSideEffects.py +++ b/gui/builtinContextMenus/boosterSideEffects.py @@ -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() diff --git a/gui/builtinContextMenus/commandFitAdd.py b/gui/builtinContextMenus/commandFitAdd.py index 0be7479c3..a6954ef99 100644 --- a/gui/builtinContextMenus/commandFitAdd.py +++ b/gui/builtinContextMenus/commandFitAdd.py @@ -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 diff --git a/gui/builtinContextMenus/damagePatternChange.py b/gui/builtinContextMenus/damagePatternChange.py index 6321acbce..e532d2f7d 100644 --- a/gui/builtinContextMenus/damagePatternChange.py +++ b/gui/builtinContextMenus/damagePatternChange.py @@ -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() diff --git a/gui/builtinContextMenus/fighterAbilities.py b/gui/builtinContextMenus/fighterAbilities.py index 4950f84b8..fb0cc5a88 100644 --- a/gui/builtinContextMenus/fighterAbilities.py +++ b/gui/builtinContextMenus/fighterAbilities.py @@ -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() diff --git a/gui/builtinContextMenus/fitAddCurrentlyOpen.py b/gui/builtinContextMenus/fitAddCurrentlyOpen.py index 5acf41af9..a40c54c20 100644 --- a/gui/builtinContextMenus/fitAddCurrentlyOpen.py +++ b/gui/builtinContextMenus/fitAddCurrentlyOpen.py @@ -9,6 +9,7 @@ from service.fit import Fit class AddCurrentlyOpenFit(ContextMenu): + def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() diff --git a/gui/builtinContextMenus/fitOpenNewTab.py b/gui/builtinContextMenus/fitOpenNewTab.py index 118dc8ba7..8da2088f9 100644 --- a/gui/builtinContextMenus/fitOpenNewTab.py +++ b/gui/builtinContextMenus/fitOpenNewTab.py @@ -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() diff --git a/gui/builtinContextMenus/implantSetAdd.py b/gui/builtinContextMenus/implantSetAdd.py index ef9525430..3488b13d7 100644 --- a/gui/builtinContextMenus/implantSetAdd.py +++ b/gui/builtinContextMenus/implantSetAdd.py @@ -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() diff --git a/gui/builtinContextMenus/itemAmountChange.py b/gui/builtinContextMenus/itemAmountChange.py index 84bc35c31..d1c97b9c2 100644 --- a/gui/builtinContextMenus/itemAmountChange.py +++ b/gui/builtinContextMenus/itemAmountChange.py @@ -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() diff --git a/gui/builtinContextMenus/itemProject.py b/gui/builtinContextMenus/itemProject.py index 08dac1ecd..2d4d35b45 100644 --- a/gui/builtinContextMenus/itemProject.py +++ b/gui/builtinContextMenus/itemProject.py @@ -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() diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py index 5d85c7659..e63b448dd 100644 --- a/gui/builtinContextMenus/itemRemove.py +++ b/gui/builtinContextMenus/itemRemove.py @@ -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() diff --git a/gui/builtinContextMenus/moduleAmmoChange.py b/gui/builtinContextMenus/moduleAmmoChange.py index 8883c708b..259f8e2a8 100644 --- a/gui/builtinContextMenus/moduleAmmoChange.py +++ b/gui/builtinContextMenus/moduleAmmoChange.py @@ -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") diff --git a/gui/builtinContextMenus/moduleFill.py b/gui/builtinContextMenus/moduleFill.py index a6d0503e4..ff8af1f91 100644 --- a/gui/builtinContextMenus/moduleFill.py +++ b/gui/builtinContextMenus/moduleFill.py @@ -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" diff --git a/gui/builtinContextMenus/moduleMutations.py b/gui/builtinContextMenus/moduleMutations.py index 1199ee6f5..31bc14f32 100644 --- a/gui/builtinContextMenus/moduleMutations.py +++ b/gui/builtinContextMenus/moduleMutations.py @@ -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() diff --git a/gui/builtinContextMenus/moduleSpool.py b/gui/builtinContextMenus/moduleSpool.py index 4d2ec9a49..e1614b339 100644 --- a/gui/builtinContextMenus/moduleSpool.py +++ b/gui/builtinContextMenus/moduleSpool.py @@ -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() diff --git a/gui/builtinContextMenus/shipJump.py b/gui/builtinContextMenus/shipJump.py index cd4e9ad5d..a58a65856 100644 --- a/gui/builtinContextMenus/shipJump.py +++ b/gui/builtinContextMenus/shipJump.py @@ -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() diff --git a/gui/builtinContextMenus/shipModeChange.py b/gui/builtinContextMenus/shipModeChange.py index a42362ff1..435cc815f 100644 --- a/gui/builtinContextMenus/shipModeChange.py +++ b/gui/builtinContextMenus/shipModeChange.py @@ -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() diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py index f8a03568d..1c07d9b08 100644 --- a/gui/builtinContextMenus/targetResists.py +++ b/gui/builtinContextMenus/targetResists.py @@ -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()