From 3d578614818848746f4d662528e985e52b451abb Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 6 Jul 2019 02:42:11 +0300 Subject: [PATCH] Add ignore target resists menu --- gui/builtinContextMenus/__init__.py | 2 ++ gui/builtinContextMenus/boosterSideEffects.py | 2 -- gui/builtinContextMenus/cargoAdd.py | 2 -- gui/builtinContextMenus/cargoAddAmmo.py | 2 -- gui/builtinContextMenus/commandFitAdd.py | 2 -- .../damagePatternChange.py | 2 -- gui/builtinContextMenus/droneAddStack.py | 2 -- gui/builtinContextMenus/droneSplitStack.py | 2 -- gui/builtinContextMenus/envEffectAdd.py | 2 -- gui/builtinContextMenus/factorReload.py | 2 -- gui/builtinContextMenus/fighterAbilities.py | 2 -- gui/builtinContextMenus/fitOpenNewTab.py | 2 -- .../graphDmgIgnoreResists.py | 26 +++++++++++++++++++ gui/builtinContextMenus/implantSetAdd.py | 2 -- gui/builtinContextMenus/itemAmountChange.py | 2 -- gui/builtinContextMenus/itemMarketJump.py | 2 -- gui/builtinContextMenus/itemRemove.py | 2 -- gui/builtinContextMenus/itemStats.py | 3 --- gui/builtinContextMenus/moduleAmmoChange.py | 2 -- gui/builtinContextMenus/moduleMutations.py | 2 -- gui/builtinContextMenus/shipJump.py | 2 -- gui/builtinContextMenus/shipModeChange.py | 2 -- gui/builtinContextMenus/targetResists.py | 2 -- 23 files changed, 28 insertions(+), 43 deletions(-) create mode 100644 gui/builtinContextMenus/graphDmgIgnoreResists.py diff --git a/gui/builtinContextMenus/__init__.py b/gui/builtinContextMenus/__init__.py index cf743e714..9cf6ed183 100644 --- a/gui/builtinContextMenus/__init__.py +++ b/gui/builtinContextMenus/__init__.py @@ -40,4 +40,6 @@ from gui.builtinContextMenus import ( # noqa: E402,F401 # Firepower panel factorReload, targetResists, + # Graph extra options + graphDmgIgnoreResists ) diff --git a/gui/builtinContextMenus/boosterSideEffects.py b/gui/builtinContextMenus/boosterSideEffects.py index fb88cd05a..a392c3ff0 100644 --- a/gui/builtinContextMenus/boosterSideEffects.py +++ b/gui/builtinContextMenus/boosterSideEffects.py @@ -5,14 +5,12 @@ import gui.mainFrame from gui import fitCommands as cmd from gui.contextMenu import ContextMenuSingle from service.fit import Fit -from service.settings import ContextMenuSettings class BoosterSideEffects(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): if self.mainFrame.getActiveFit() is None or srcContext not in "boosterItem": diff --git a/gui/builtinContextMenus/cargoAdd.py b/gui/builtinContextMenus/cargoAdd.py index ec0e54a8c..833d2ab56 100644 --- a/gui/builtinContextMenus/cargoAdd.py +++ b/gui/builtinContextMenus/cargoAdd.py @@ -2,14 +2,12 @@ import gui.fitCommands as cmd import gui.mainFrame from gui.contextMenu import ContextMenuSingle from service.fit import Fit -from service.settings import ContextMenuSettings class AddToCargo(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): if srcContext not in ("marketItemGroup", "marketItemMisc"): diff --git a/gui/builtinContextMenus/cargoAddAmmo.py b/gui/builtinContextMenus/cargoAddAmmo.py index 309d80b16..792562311 100644 --- a/gui/builtinContextMenus/cargoAddAmmo.py +++ b/gui/builtinContextMenus/cargoAddAmmo.py @@ -1,14 +1,12 @@ import gui.fitCommands as cmd import gui.mainFrame from gui.contextMenu import ContextMenuSingle -from service.settings import ContextMenuSettings class AddToCargoAmmo(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None: diff --git a/gui/builtinContextMenus/commandFitAdd.py b/gui/builtinContextMenus/commandFitAdd.py index d1e4e98c8..2ed52ee6f 100644 --- a/gui/builtinContextMenus/commandFitAdd.py +++ b/gui/builtinContextMenus/commandFitAdd.py @@ -6,7 +6,6 @@ import gui.mainFrame from gui.contextMenu import ContextMenuUnconditional from service.fit import Fit from service.market import Market -from service.settings import ContextMenuSettings class AddCommandFit(ContextMenuUnconditional): @@ -40,7 +39,6 @@ class AddCommandFit(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext): if self.mainFrame.getActiveFit() is None or len(self.__class__.commandFits) == 0 or srcContext != "commandView": diff --git a/gui/builtinContextMenus/damagePatternChange.py b/gui/builtinContextMenus/damagePatternChange.py index 57b1346fe..291451c42 100644 --- a/gui/builtinContextMenus/damagePatternChange.py +++ b/gui/builtinContextMenus/damagePatternChange.py @@ -9,14 +9,12 @@ from gui.bitmap_loader import BitmapLoader from gui.contextMenu import ContextMenuUnconditional from service.damagePattern import DamagePattern as import_DamagePattern from service.fit import Fit -from service.settings import ContextMenuSettings class ChangeDamagePattern(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext): return srcContext == "resistancesViewFull" diff --git a/gui/builtinContextMenus/droneAddStack.py b/gui/builtinContextMenus/droneAddStack.py index 4a9b066c7..5f97be520 100644 --- a/gui/builtinContextMenus/droneAddStack.py +++ b/gui/builtinContextMenus/droneAddStack.py @@ -3,14 +3,12 @@ import gui.mainFrame from gui.contextMenu import ContextMenuSingle from gui.fitCommands.helpers import droneStackLimit from service.fit import Fit -from service.settings import ContextMenuSettings class DroneAddStack(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): if srcContext not in ('marketItemGroup', 'marketItemMisc'): diff --git a/gui/builtinContextMenus/droneSplitStack.py b/gui/builtinContextMenus/droneSplitStack.py index 69db4fd20..66850656a 100644 --- a/gui/builtinContextMenus/droneSplitStack.py +++ b/gui/builtinContextMenus/droneSplitStack.py @@ -7,14 +7,12 @@ import gui.fitCommands as cmd import gui.mainFrame from gui.contextMenu import ContextMenuSingle from service.fit import Fit -from service.settings import ContextMenuSettings class DroneSplitStack(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): if srcContext != "droneItem": diff --git a/gui/builtinContextMenus/envEffectAdd.py b/gui/builtinContextMenus/envEffectAdd.py index 4bfdad9b3..ce832c6fa 100644 --- a/gui/builtinContextMenus/envEffectAdd.py +++ b/gui/builtinContextMenus/envEffectAdd.py @@ -8,7 +8,6 @@ import gui.fitCommands as cmd import gui.mainFrame from gui.contextMenu import ContextMenuUnconditional from service.market import Market -from service.settings import ContextMenuSettings class AddEnvironmentEffect(ContextMenuUnconditional): @@ -26,7 +25,6 @@ class AddEnvironmentEffect(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext): return srcContext == "projected" diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py index 2296f57e7..10cf68fa3 100644 --- a/gui/builtinContextMenus/factorReload.py +++ b/gui/builtinContextMenus/factorReload.py @@ -5,14 +5,12 @@ import gui.globalEvents as GE import gui.mainFrame from gui.contextMenu import ContextMenuUnconditional from service.fit import Fit -from service.settings import ContextMenuSettings class FactorReload(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext): return srcContext == "firepowerViewFull" diff --git a/gui/builtinContextMenus/fighterAbilities.py b/gui/builtinContextMenus/fighterAbilities.py index 80425ecde..2cc9967c7 100644 --- a/gui/builtinContextMenus/fighterAbilities.py +++ b/gui/builtinContextMenus/fighterAbilities.py @@ -6,14 +6,12 @@ from gui import fitCommands as cmd from gui.fitCommands.helpers import getSimilarFighters from gui.contextMenu import ContextMenuCombined from service.fit import Fit -from service.settings import ContextMenuSettings class FighterAbilities(ContextMenuCombined): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() self.isProjected = None def display(self, srcContext, mainItem, selection): diff --git a/gui/builtinContextMenus/fitOpenNewTab.py b/gui/builtinContextMenus/fitOpenNewTab.py index 1ef7f3373..f05bbed89 100644 --- a/gui/builtinContextMenus/fitOpenNewTab.py +++ b/gui/builtinContextMenus/fitOpenNewTab.py @@ -4,14 +4,12 @@ import wx import gui.mainFrame from gui.builtinShipBrowser.events import FitSelected from gui.contextMenu import ContextMenuSingle -from service.settings import ContextMenuSettings class OpenFitInNewTab(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): if srcContext not in ("projectedFit", "commandFit"): diff --git a/gui/builtinContextMenus/graphDmgIgnoreResists.py b/gui/builtinContextMenus/graphDmgIgnoreResists.py new file mode 100644 index 000000000..0799e4273 --- /dev/null +++ b/gui/builtinContextMenus/graphDmgIgnoreResists.py @@ -0,0 +1,26 @@ +import gui.mainFrame +from gui.contextMenu import ContextMenuUnconditional +from service.settings import GraphSettings + + +class GraphDmgIgnoreResists(ContextMenuUnconditional): + + def __init__(self): + self.mainFrame = gui.mainFrame.MainFrame.getInstance() + self.settings = GraphSettings.getInstance() + + def display(self, srcContext): + return srcContext == 'dmgStatsGraph' + + def getText(self, itmContext): + return "Ignore Target Resists" + + def activate(self, fullContext, i): + self.settings.set('ignoreResists', not self.settings.get('ignoreResists')) + + @property + def checked(self): + return self.settings.get('ignoreResists') + + +GraphDmgIgnoreResists.register() diff --git a/gui/builtinContextMenus/implantSetAdd.py b/gui/builtinContextMenus/implantSetAdd.py index eba1dcf4e..92e5e1b24 100644 --- a/gui/builtinContextMenus/implantSetAdd.py +++ b/gui/builtinContextMenus/implantSetAdd.py @@ -7,14 +7,12 @@ import gui.mainFrame from gui.contextMenu import ContextMenuSingle from service.character import Character from service.implantSet import ImplantSets as s_ImplantSets -from service.settings import ContextMenuSettings class AddImplantSet(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): diff --git a/gui/builtinContextMenus/itemAmountChange.py b/gui/builtinContextMenus/itemAmountChange.py index 2eeb2fabc..8b487735f 100644 --- a/gui/builtinContextMenus/itemAmountChange.py +++ b/gui/builtinContextMenus/itemAmountChange.py @@ -11,14 +11,12 @@ from eos.saveddata.fighter import Fighter as es_Fighter from eos.saveddata.fit import Fit as es_Fit from gui.contextMenu import ContextMenuSingle from service.fit import Fit -from service.settings import ContextMenuSettings class ChangeItemAmount(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): if srcContext not in ("droneItem", "projectedDrone", "cargoItem", "projectedFit", "fighterItem", "projectedFighter"): diff --git a/gui/builtinContextMenus/itemMarketJump.py b/gui/builtinContextMenus/itemMarketJump.py index ce7e28566..68b51024d 100644 --- a/gui/builtinContextMenus/itemMarketJump.py +++ b/gui/builtinContextMenus/itemMarketJump.py @@ -1,13 +1,11 @@ import gui.mainFrame from gui.contextMenu import ContextMenuSingle from service.market import Market -from service.settings import ContextMenuSettings class JumpToMarketItem(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): validContexts = ("marketItemMisc", "fittingModule", diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py index f76a844d3..0b8fd6909 100644 --- a/gui/builtinContextMenus/itemRemove.py +++ b/gui/builtinContextMenus/itemRemove.py @@ -11,14 +11,12 @@ from eos.saveddata.module import Module as EosModule from gui.contextMenu import ContextMenuCombined from gui.fitCommands.helpers import getSimilarFighters, getSimilarModPositions from service.fit import Fit -from service.settings import ContextMenuSettings class RemoveItem(ContextMenuCombined): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem, selection): if srcContext not in ( diff --git a/gui/builtinContextMenus/itemStats.py b/gui/builtinContextMenus/itemStats.py index b093475cf..414b22eeb 100644 --- a/gui/builtinContextMenus/itemStats.py +++ b/gui/builtinContextMenus/itemStats.py @@ -5,14 +5,11 @@ import gui.mainFrame from gui.contextMenu import ContextMenuSingle from gui.itemStats import ItemStatsDialog from service.fit import Fit -from eos.saveddata.mode import Mode -from service.settings import ContextMenuSettings class ItemStats(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, mainItem): if srcContext not in ( diff --git a/gui/builtinContextMenus/moduleAmmoChange.py b/gui/builtinContextMenus/moduleAmmoChange.py index f3cbe2608..9c557fc47 100644 --- a/gui/builtinContextMenus/moduleAmmoChange.py +++ b/gui/builtinContextMenus/moduleAmmoChange.py @@ -10,7 +10,6 @@ from gui.contextMenu import ContextMenuCombined from gui.fitCommands.helpers import getSimilarModPositions from service.fit import Fit from service.market import Market -from service.settings import ContextMenuSettings class ChangeModuleAmmo(ContextMenuCombined): @@ -20,7 +19,6 @@ class ChangeModuleAmmo(ContextMenuCombined): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() # Format: {type ID: set(loadable, charges)} self.loadableCharges = {} diff --git a/gui/builtinContextMenus/moduleMutations.py b/gui/builtinContextMenus/moduleMutations.py index 36a49eea4..ee4b36d4c 100644 --- a/gui/builtinContextMenus/moduleMutations.py +++ b/gui/builtinContextMenus/moduleMutations.py @@ -5,14 +5,12 @@ import gui.mainFrame from gui.contextMenu import ContextMenuSingle from gui.fitCommands import GuiConvertMutatedLocalModuleCommand, GuiRevertMutatedLocalModuleCommand from service.fit import Fit -from service.settings import ContextMenuSettings class ChangeModuleMutation(ContextMenuSingle): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() self.eventIDs = {} def display(self, srcContext, mainItem): diff --git a/gui/builtinContextMenus/shipJump.py b/gui/builtinContextMenus/shipJump.py index f5c22926c..f4c1ca038 100644 --- a/gui/builtinContextMenus/shipJump.py +++ b/gui/builtinContextMenus/shipJump.py @@ -5,14 +5,12 @@ import gui.mainFrame from gui.builtinShipBrowser.events import Stage3Selected from gui.contextMenu import ContextMenuUnconditional from service.fit import Fit -from service.settings import ContextMenuSettings class JumpToShip(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext): if srcContext != "fittingShip": diff --git a/gui/builtinContextMenus/shipModeChange.py b/gui/builtinContextMenus/shipModeChange.py index 119f16083..4e7390531 100644 --- a/gui/builtinContextMenus/shipModeChange.py +++ b/gui/builtinContextMenus/shipModeChange.py @@ -5,14 +5,12 @@ import gui.fitCommands as cmd import gui.mainFrame from gui.contextMenu import ContextMenuUnconditional from service.fit import Fit -from service.settings import ContextMenuSettings class ChangeShipTacticalMode(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext): if self.mainFrame.getActiveFit() is None or srcContext != "fittingShip": diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py index ff890b55e..f2447d97e 100644 --- a/gui/builtinContextMenus/targetResists.py +++ b/gui/builtinContextMenus/targetResists.py @@ -8,7 +8,6 @@ import gui.mainFrame from gui.bitmap_loader import BitmapLoader from gui.contextMenu import ContextMenuUnconditional from service.fit import Fit -from service.settings import ContextMenuSettings from service.targetResists import TargetResists as svc_TargetResists @@ -16,7 +15,6 @@ class TargetResists(ContextMenuUnconditional): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() def display(self, srcContext): if self.mainFrame.getActiveFit() is None or srcContext != "firepowerViewFull":