diff --git a/gui/fitCommands/calc/__init__.py b/gui/fitCommands/calcCommands/__init__.py similarity index 100% rename from gui/fitCommands/calc/__init__.py rename to gui/fitCommands/calcCommands/__init__.py diff --git a/gui/fitCommands/calc/booster/__init__.py b/gui/fitCommands/calcCommands/booster/__init__.py similarity index 100% rename from gui/fitCommands/calc/booster/__init__.py rename to gui/fitCommands/calcCommands/booster/__init__.py diff --git a/gui/fitCommands/calc/booster/add.py b/gui/fitCommands/calcCommands/booster/add.py similarity index 100% rename from gui/fitCommands/calc/booster/add.py rename to gui/fitCommands/calcCommands/booster/add.py diff --git a/gui/fitCommands/calc/booster/remove.py b/gui/fitCommands/calcCommands/booster/remove.py similarity index 100% rename from gui/fitCommands/calc/booster/remove.py rename to gui/fitCommands/calcCommands/booster/remove.py diff --git a/gui/fitCommands/calc/booster/sideEffectToggleState.py b/gui/fitCommands/calcCommands/booster/sideEffectToggleState.py similarity index 100% rename from gui/fitCommands/calc/booster/sideEffectToggleState.py rename to gui/fitCommands/calcCommands/booster/sideEffectToggleState.py diff --git a/gui/fitCommands/calc/booster/toggleState.py b/gui/fitCommands/calcCommands/booster/toggleState.py similarity index 100% rename from gui/fitCommands/calc/booster/toggleState.py rename to gui/fitCommands/calcCommands/booster/toggleState.py diff --git a/gui/fitCommands/calc/cargo/__init__.py b/gui/fitCommands/calcCommands/cargo/__init__.py similarity index 100% rename from gui/fitCommands/calc/cargo/__init__.py rename to gui/fitCommands/calcCommands/cargo/__init__.py diff --git a/gui/fitCommands/calc/cargo/add.py b/gui/fitCommands/calcCommands/cargo/add.py similarity index 100% rename from gui/fitCommands/calc/cargo/add.py rename to gui/fitCommands/calcCommands/cargo/add.py diff --git a/gui/fitCommands/calc/cargo/changeAmount.py b/gui/fitCommands/calcCommands/cargo/changeAmount.py similarity index 100% rename from gui/fitCommands/calc/cargo/changeAmount.py rename to gui/fitCommands/calcCommands/cargo/changeAmount.py diff --git a/gui/fitCommands/calc/cargo/remove.py b/gui/fitCommands/calcCommands/cargo/remove.py similarity index 100% rename from gui/fitCommands/calc/cargo/remove.py rename to gui/fitCommands/calcCommands/cargo/remove.py diff --git a/gui/fitCommands/calc/commandFit/__init__.py b/gui/fitCommands/calcCommands/commandFit/__init__.py similarity index 100% rename from gui/fitCommands/calc/commandFit/__init__.py rename to gui/fitCommands/calcCommands/commandFit/__init__.py diff --git a/gui/fitCommands/calc/commandFit/add.py b/gui/fitCommands/calcCommands/commandFit/add.py similarity index 100% rename from gui/fitCommands/calc/commandFit/add.py rename to gui/fitCommands/calcCommands/commandFit/add.py diff --git a/gui/fitCommands/calc/commandFit/remove.py b/gui/fitCommands/calcCommands/commandFit/remove.py similarity index 100% rename from gui/fitCommands/calc/commandFit/remove.py rename to gui/fitCommands/calcCommands/commandFit/remove.py diff --git a/gui/fitCommands/calc/commandFit/toggleState.py b/gui/fitCommands/calcCommands/commandFit/toggleState.py similarity index 100% rename from gui/fitCommands/calc/commandFit/toggleState.py rename to gui/fitCommands/calcCommands/commandFit/toggleState.py diff --git a/gui/fitCommands/calc/drone/__init__.py b/gui/fitCommands/calcCommands/drone/__init__.py similarity index 100% rename from gui/fitCommands/calc/drone/__init__.py rename to gui/fitCommands/calcCommands/drone/__init__.py diff --git a/gui/fitCommands/calc/drone/localAdd.py b/gui/fitCommands/calcCommands/drone/localAdd.py similarity index 100% rename from gui/fitCommands/calc/drone/localAdd.py rename to gui/fitCommands/calcCommands/drone/localAdd.py diff --git a/gui/fitCommands/calc/drone/localChangeAmount.py b/gui/fitCommands/calcCommands/drone/localChangeAmount.py similarity index 100% rename from gui/fitCommands/calc/drone/localChangeAmount.py rename to gui/fitCommands/calcCommands/drone/localChangeAmount.py diff --git a/gui/fitCommands/calc/drone/localRemove.py b/gui/fitCommands/calcCommands/drone/localRemove.py similarity index 100% rename from gui/fitCommands/calc/drone/localRemove.py rename to gui/fitCommands/calcCommands/drone/localRemove.py diff --git a/gui/fitCommands/calc/drone/localToggleState.py b/gui/fitCommands/calcCommands/drone/localToggleState.py similarity index 100% rename from gui/fitCommands/calc/drone/localToggleState.py rename to gui/fitCommands/calcCommands/drone/localToggleState.py diff --git a/gui/fitCommands/calc/drone/projectedAdd.py b/gui/fitCommands/calcCommands/drone/projectedAdd.py similarity index 100% rename from gui/fitCommands/calc/drone/projectedAdd.py rename to gui/fitCommands/calcCommands/drone/projectedAdd.py diff --git a/gui/fitCommands/calc/drone/projectedChangeAmount.py b/gui/fitCommands/calcCommands/drone/projectedChangeAmount.py similarity index 100% rename from gui/fitCommands/calc/drone/projectedChangeAmount.py rename to gui/fitCommands/calcCommands/drone/projectedChangeAmount.py diff --git a/gui/fitCommands/calc/drone/projectedRemove.py b/gui/fitCommands/calcCommands/drone/projectedRemove.py similarity index 100% rename from gui/fitCommands/calc/drone/projectedRemove.py rename to gui/fitCommands/calcCommands/drone/projectedRemove.py diff --git a/gui/fitCommands/calc/drone/projectedToggleState.py b/gui/fitCommands/calcCommands/drone/projectedToggleState.py similarity index 100% rename from gui/fitCommands/calc/drone/projectedToggleState.py rename to gui/fitCommands/calcCommands/drone/projectedToggleState.py diff --git a/gui/fitCommands/calc/fighter/__init__.py b/gui/fitCommands/calcCommands/fighter/__init__.py similarity index 100% rename from gui/fitCommands/calc/fighter/__init__.py rename to gui/fitCommands/calcCommands/fighter/__init__.py diff --git a/gui/fitCommands/calc/fighter/abilityToggleState.py b/gui/fitCommands/calcCommands/fighter/abilityToggleState.py similarity index 100% rename from gui/fitCommands/calc/fighter/abilityToggleState.py rename to gui/fitCommands/calcCommands/fighter/abilityToggleState.py diff --git a/gui/fitCommands/calc/fighter/changeAmount.py b/gui/fitCommands/calcCommands/fighter/changeAmount.py similarity index 100% rename from gui/fitCommands/calc/fighter/changeAmount.py rename to gui/fitCommands/calcCommands/fighter/changeAmount.py diff --git a/gui/fitCommands/calc/fighter/localAdd.py b/gui/fitCommands/calcCommands/fighter/localAdd.py similarity index 100% rename from gui/fitCommands/calc/fighter/localAdd.py rename to gui/fitCommands/calcCommands/fighter/localAdd.py diff --git a/gui/fitCommands/calc/fighter/localRemove.py b/gui/fitCommands/calcCommands/fighter/localRemove.py similarity index 100% rename from gui/fitCommands/calc/fighter/localRemove.py rename to gui/fitCommands/calcCommands/fighter/localRemove.py diff --git a/gui/fitCommands/calc/fighter/projectedAdd.py b/gui/fitCommands/calcCommands/fighter/projectedAdd.py similarity index 100% rename from gui/fitCommands/calc/fighter/projectedAdd.py rename to gui/fitCommands/calcCommands/fighter/projectedAdd.py diff --git a/gui/fitCommands/calc/fighter/projectedRemove.py b/gui/fitCommands/calcCommands/fighter/projectedRemove.py similarity index 100% rename from gui/fitCommands/calc/fighter/projectedRemove.py rename to gui/fitCommands/calcCommands/fighter/projectedRemove.py diff --git a/gui/fitCommands/calc/fighter/toggleState.py b/gui/fitCommands/calcCommands/fighter/toggleState.py similarity index 100% rename from gui/fitCommands/calc/fighter/toggleState.py rename to gui/fitCommands/calcCommands/fighter/toggleState.py diff --git a/gui/fitCommands/calc/fitRename.py b/gui/fitCommands/calcCommands/fitRename.py similarity index 100% rename from gui/fitCommands/calc/fitRename.py rename to gui/fitCommands/calcCommands/fitRename.py diff --git a/gui/fitCommands/calc/implant/__init__.py b/gui/fitCommands/calcCommands/implant/__init__.py similarity index 100% rename from gui/fitCommands/calc/implant/__init__.py rename to gui/fitCommands/calcCommands/implant/__init__.py diff --git a/gui/fitCommands/calc/implant/add.py b/gui/fitCommands/calcCommands/implant/add.py similarity index 100% rename from gui/fitCommands/calc/implant/add.py rename to gui/fitCommands/calcCommands/implant/add.py diff --git a/gui/fitCommands/calc/implant/changeLocation.py b/gui/fitCommands/calcCommands/implant/changeLocation.py similarity index 100% rename from gui/fitCommands/calc/implant/changeLocation.py rename to gui/fitCommands/calcCommands/implant/changeLocation.py diff --git a/gui/fitCommands/calc/implant/remove.py b/gui/fitCommands/calcCommands/implant/remove.py similarity index 100% rename from gui/fitCommands/calc/implant/remove.py rename to gui/fitCommands/calcCommands/implant/remove.py diff --git a/gui/fitCommands/calc/implant/toggleState.py b/gui/fitCommands/calcCommands/implant/toggleState.py similarity index 100% rename from gui/fitCommands/calc/implant/toggleState.py rename to gui/fitCommands/calcCommands/implant/toggleState.py diff --git a/gui/fitCommands/calc/itemRebase.py b/gui/fitCommands/calcCommands/itemRebase.py similarity index 100% rename from gui/fitCommands/calc/itemRebase.py rename to gui/fitCommands/calcCommands/itemRebase.py diff --git a/gui/fitCommands/calc/module/__init__.py b/gui/fitCommands/calcCommands/module/__init__.py similarity index 100% rename from gui/fitCommands/calc/module/__init__.py rename to gui/fitCommands/calcCommands/module/__init__.py diff --git a/gui/fitCommands/calc/module/changeCharges.py b/gui/fitCommands/calcCommands/module/changeCharges.py similarity index 100% rename from gui/fitCommands/calc/module/changeCharges.py rename to gui/fitCommands/calcCommands/module/changeCharges.py diff --git a/gui/fitCommands/calc/module/changeSpool.py b/gui/fitCommands/calcCommands/module/changeSpool.py similarity index 100% rename from gui/fitCommands/calc/module/changeSpool.py rename to gui/fitCommands/calcCommands/module/changeSpool.py diff --git a/gui/fitCommands/calc/module/localAdd.py b/gui/fitCommands/calcCommands/module/localAdd.py similarity index 100% rename from gui/fitCommands/calc/module/localAdd.py rename to gui/fitCommands/calcCommands/module/localAdd.py diff --git a/gui/fitCommands/calc/module/localChangeStates.py b/gui/fitCommands/calcCommands/module/localChangeStates.py similarity index 100% rename from gui/fitCommands/calc/module/localChangeStates.py rename to gui/fitCommands/calcCommands/module/localChangeStates.py diff --git a/gui/fitCommands/calc/module/localClone.py b/gui/fitCommands/calcCommands/module/localClone.py similarity index 100% rename from gui/fitCommands/calc/module/localClone.py rename to gui/fitCommands/calcCommands/module/localClone.py diff --git a/gui/fitCommands/calc/module/localRemove.py b/gui/fitCommands/calcCommands/module/localRemove.py similarity index 100% rename from gui/fitCommands/calc/module/localRemove.py rename to gui/fitCommands/calcCommands/module/localRemove.py diff --git a/gui/fitCommands/calc/module/localReplace.py b/gui/fitCommands/calcCommands/module/localReplace.py similarity index 100% rename from gui/fitCommands/calc/module/localReplace.py rename to gui/fitCommands/calcCommands/module/localReplace.py diff --git a/gui/fitCommands/calc/module/localSwap.py b/gui/fitCommands/calcCommands/module/localSwap.py similarity index 100% rename from gui/fitCommands/calc/module/localSwap.py rename to gui/fitCommands/calcCommands/module/localSwap.py diff --git a/gui/fitCommands/calc/module/projectedAdd.py b/gui/fitCommands/calcCommands/module/projectedAdd.py similarity index 100% rename from gui/fitCommands/calc/module/projectedAdd.py rename to gui/fitCommands/calcCommands/module/projectedAdd.py diff --git a/gui/fitCommands/calc/module/projectedChangeState.py b/gui/fitCommands/calcCommands/module/projectedChangeState.py similarity index 100% rename from gui/fitCommands/calc/module/projectedChangeState.py rename to gui/fitCommands/calcCommands/module/projectedChangeState.py diff --git a/gui/fitCommands/calc/module/projectedRemove.py b/gui/fitCommands/calcCommands/module/projectedRemove.py similarity index 100% rename from gui/fitCommands/calc/module/projectedRemove.py rename to gui/fitCommands/calcCommands/module/projectedRemove.py diff --git a/gui/fitCommands/calc/projectedFit/__init__.py b/gui/fitCommands/calcCommands/projectedFit/__init__.py similarity index 100% rename from gui/fitCommands/calc/projectedFit/__init__.py rename to gui/fitCommands/calcCommands/projectedFit/__init__.py diff --git a/gui/fitCommands/calc/projectedFit/add.py b/gui/fitCommands/calcCommands/projectedFit/add.py similarity index 100% rename from gui/fitCommands/calc/projectedFit/add.py rename to gui/fitCommands/calcCommands/projectedFit/add.py diff --git a/gui/fitCommands/calc/projectedFit/changeAmount.py b/gui/fitCommands/calcCommands/projectedFit/changeAmount.py similarity index 100% rename from gui/fitCommands/calc/projectedFit/changeAmount.py rename to gui/fitCommands/calcCommands/projectedFit/changeAmount.py diff --git a/gui/fitCommands/calc/projectedFit/remove.py b/gui/fitCommands/calcCommands/projectedFit/remove.py similarity index 100% rename from gui/fitCommands/calc/projectedFit/remove.py rename to gui/fitCommands/calcCommands/projectedFit/remove.py diff --git a/gui/fitCommands/calc/projectedFit/toggleState.py b/gui/fitCommands/calcCommands/projectedFit/toggleState.py similarity index 100% rename from gui/fitCommands/calc/projectedFit/toggleState.py rename to gui/fitCommands/calcCommands/projectedFit/toggleState.py diff --git a/gui/fitCommands/calc/shipModeChange.py b/gui/fitCommands/calcCommands/shipModeChange.py similarity index 100% rename from gui/fitCommands/calc/shipModeChange.py rename to gui/fitCommands/calcCommands/shipModeChange.py diff --git a/gui/fitCommands/guiAddBooster.py b/gui/fitCommands/guiAddBooster.py index 4710f8430..579b1b521 100644 --- a/gui/fitCommands/guiAddBooster.py +++ b/gui/fitCommands/guiAddBooster.py @@ -4,7 +4,7 @@ import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import InternalCommandHistory, BoosterInfo from service.fit import Fit -from .calc.booster.add import CalcAddBoosterCommand +from .calcCommands.booster.add import CalcAddBoosterCommand class GuiAddBoosterCommand(wx.Command): diff --git a/gui/fitCommands/guiAddCargo.py b/gui/fitCommands/guiAddCargo.py index 70df1bd46..40acf14b6 100644 --- a/gui/fitCommands/guiAddCargo.py +++ b/gui/fitCommands/guiAddCargo.py @@ -4,7 +4,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import CargoInfo -from .calc.cargo.add import CalcAddCargoCommand +from .calcCommands.cargo.add import CalcAddCargoCommand class GuiAddCargoCommand(wx.Command): diff --git a/gui/fitCommands/guiAddCharge.py b/gui/fitCommands/guiAddCharge.py index 3cf529ec0..701e46a25 100644 --- a/gui/fitCommands/guiAddCharge.py +++ b/gui/fitCommands/guiAddCharge.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.module.changeCharges import CalcChangeModuleChargesCommand +from .calcCommands.module.changeCharges import CalcChangeModuleChargesCommand class GuiModuleAddChargeCommand(wx.Command): diff --git a/gui/fitCommands/guiAddCommand.py b/gui/fitCommands/guiAddCommand.py index 906821e59..c1a0513a0 100644 --- a/gui/fitCommands/guiAddCommand.py +++ b/gui/fitCommands/guiAddCommand.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.commandFit.add import CalcAddCommandCommand +from .calcCommands.commandFit.add import CalcAddCommandCommand class GuiAddCommandCommand(wx.Command): diff --git a/gui/fitCommands/guiAddDrone.py b/gui/fitCommands/guiAddDrone.py index 663472e24..4a4be5c5c 100644 --- a/gui/fitCommands/guiAddDrone.py +++ b/gui/fitCommands/guiAddDrone.py @@ -4,7 +4,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import DroneInfo -from .calc.drone.localAdd import CalcAddLocalDroneCommand +from .calcCommands.drone.localAdd import CalcAddLocalDroneCommand class GuiAddDroneCommand(wx.Command): diff --git a/gui/fitCommands/guiAddFighter.py b/gui/fitCommands/guiAddFighter.py index 0317930fd..d66df4aa1 100644 --- a/gui/fitCommands/guiAddFighter.py +++ b/gui/fitCommands/guiAddFighter.py @@ -4,7 +4,7 @@ import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import FighterInfo from service.fit import Fit -from .calc.fighter.localAdd import CalcAddLocalFighterCommand +from .calcCommands.fighter.localAdd import CalcAddLocalFighterCommand class GuiAddFighterCommand(wx.Command): diff --git a/gui/fitCommands/guiAddImplant.py b/gui/fitCommands/guiAddImplant.py index b452e46e4..24e6e4078 100644 --- a/gui/fitCommands/guiAddImplant.py +++ b/gui/fitCommands/guiAddImplant.py @@ -5,8 +5,8 @@ import gui.mainFrame from eos.const import ImplantLocation from gui import globalEvents as GE from gui.fitCommands.helpers import ImplantInfo -from .calc.implant.add import CalcAddImplantCommand -from .calc.implant.changeLocation import CalcChangeImplantLocationCommand +from .calcCommands.implant.add import CalcAddImplantCommand +from .calcCommands.implant.changeLocation import CalcChangeImplantLocationCommand class GuiAddImplantCommand(wx.Command): diff --git a/gui/fitCommands/guiAddModule.py b/gui/fitCommands/guiAddModule.py index 47a42a2a9..f12abbbf4 100644 --- a/gui/fitCommands/guiAddModule.py +++ b/gui/fitCommands/guiAddModule.py @@ -6,9 +6,9 @@ from service.market import Market from service.fit import Fit from gui import globalEvents as GE from gui.fitCommands.helpers import ModuleInfo -from .calc.module.localAdd import CalcAddLocalModuleCommand -from .calc.module.localReplace import CalcReplaceLocalModuleCommand -from .calc.module.changeCharges import CalcChangeModuleChargesCommand +from .calcCommands.module.localAdd import CalcAddLocalModuleCommand +from .calcCommands.module.localReplace import CalcReplaceLocalModuleCommand +from .calcCommands.module.changeCharges import CalcChangeModuleChargesCommand pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiAddProjected.py b/gui/fitCommands/guiAddProjected.py index cf6151e22..5da233395 100644 --- a/gui/fitCommands/guiAddProjected.py +++ b/gui/fitCommands/guiAddProjected.py @@ -4,10 +4,10 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import ModuleInfo, DroneInfo, FighterInfo -from .calc.module.projectedAdd import CalcAddProjectedModuleCommand -from .calc.projectedFit.add import CalcAddProjectedFitCommand -from .calc.fighter.projectedAdd import CalcAddProjectedFighterCommand -from .calc.drone.projectedAdd import CalcAddProjectedDroneCommand +from .calcCommands.module.projectedAdd import CalcAddProjectedModuleCommand +from .calcCommands.projectedFit.add import CalcAddProjectedFitCommand +from .calcCommands.fighter.projectedAdd import CalcAddProjectedFighterCommand +from .calcCommands.drone.projectedAdd import CalcAddProjectedDroneCommand from logbook import Logger import eos.db pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiCargoToModule.py b/gui/fitCommands/guiCargoToModule.py index 5ce7fac94..14d18b0d2 100644 --- a/gui/fitCommands/guiCargoToModule.py +++ b/gui/fitCommands/guiCargoToModule.py @@ -3,11 +3,11 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand -from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand -from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand +from gui.fitCommands.calcCommands.module.changeCharges import CalcChangeModuleChargesCommand +from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand +from gui.fitCommands.calcCommands.cargo.remove import CalcRemoveCargoCommand from gui.fitCommands.helpers import ModuleInfo -from .calc.cargo.add import CalcAddCargoCommand +from .calcCommands.cargo.add import CalcAddCargoCommand from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiChangeCargoQty.py b/gui/fitCommands/guiChangeCargoQty.py index e48f99602..13c5b5ced 100644 --- a/gui/fitCommands/guiChangeCargoQty.py +++ b/gui/fitCommands/guiChangeCargoQty.py @@ -1,7 +1,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from .calc.cargo.changeAmount import CalcChangeCargoAmountCommand +from .calcCommands.cargo.changeAmount import CalcChangeCargoAmountCommand from service.fit import Fit from gui.fitCommands.helpers import CargoInfo from logbook import Logger diff --git a/gui/fitCommands/guiChangeDroneQty.py b/gui/fitCommands/guiChangeDroneQty.py index eec919171..f8c929b1a 100644 --- a/gui/fitCommands/guiChangeDroneQty.py +++ b/gui/fitCommands/guiChangeDroneQty.py @@ -1,7 +1,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from .calc.drone.localChangeAmount import CalcChangeLocalDroneAmountCommand +from .calcCommands.drone.localChangeAmount import CalcChangeLocalDroneAmountCommand from service.fit import Fit from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiChangeFighterQty.py b/gui/fitCommands/guiChangeFighterQty.py index d11ac7a13..a6186ae3e 100644 --- a/gui/fitCommands/guiChangeFighterQty.py +++ b/gui/fitCommands/guiChangeFighterQty.py @@ -1,7 +1,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from .calc.fighter.changeAmount import CalcChangeFighterAmountCommand +from .calcCommands.fighter.changeAmount import CalcChangeFighterAmountCommand from service.fit import Fit from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiChangeImplantLocation.py b/gui/fitCommands/guiChangeImplantLocation.py index 3083f9701..1a5e35d7e 100644 --- a/gui/fitCommands/guiChangeImplantLocation.py +++ b/gui/fitCommands/guiChangeImplantLocation.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.implant.changeLocation import CalcChangeImplantLocationCommand +from .calcCommands.implant.changeLocation import CalcChangeImplantLocationCommand class GuiChangeImplantLocation(wx.Command): diff --git a/gui/fitCommands/guiChangeProjectedDroneQty.py b/gui/fitCommands/guiChangeProjectedDroneQty.py index 6ea0a49dc..422b9a98e 100644 --- a/gui/fitCommands/guiChangeProjectedDroneQty.py +++ b/gui/fitCommands/guiChangeProjectedDroneQty.py @@ -1,7 +1,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from .calc.drone.projectedChangeAmount import CalcChangeProjectedDroneAmountCommand +from .calcCommands.drone.projectedChangeAmount import CalcChangeProjectedDroneAmountCommand from service.fit import Fit from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiChangeProjectedFighterAmount.py b/gui/fitCommands/guiChangeProjectedFighterAmount.py index bd48d3780..74071ebb0 100644 --- a/gui/fitCommands/guiChangeProjectedFighterAmount.py +++ b/gui/fitCommands/guiChangeProjectedFighterAmount.py @@ -1,7 +1,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from .calc.fighter.changeAmount import CalcChangeFighterAmountCommand +from .calcCommands.fighter.changeAmount import CalcChangeFighterAmountCommand from service.fit import Fit from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiChangeProjectedFitQty.py b/gui/fitCommands/guiChangeProjectedFitQty.py index 02efd4cc8..77b6760ac 100644 --- a/gui/fitCommands/guiChangeProjectedFitQty.py +++ b/gui/fitCommands/guiChangeProjectedFitQty.py @@ -1,7 +1,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from .calc.projectedFit.changeAmount import CalcChangeProjectedFitAmountCommand +from .calcCommands.projectedFit.changeAmount import CalcChangeProjectedFitAmountCommand from service.fit import Fit from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiFillWithModule.py b/gui/fitCommands/guiFillWithModule.py index 300eb3e39..0b714b20c 100644 --- a/gui/fitCommands/guiFillWithModule.py +++ b/gui/fitCommands/guiFillWithModule.py @@ -5,7 +5,7 @@ import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import ModuleInfo from service.fit import Fit -from .calc.module.localAdd import CalcAddLocalModuleCommand +from .calcCommands.module.localAdd import CalcAddLocalModuleCommand pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiFitRename.py b/gui/fitCommands/guiFitRename.py index b5a750c69..99c6cc772 100644 --- a/gui/fitCommands/guiFitRename.py +++ b/gui/fitCommands/guiFitRename.py @@ -1,6 +1,6 @@ import wx import gui.mainFrame -from .calc.fitRename import CalcFitRenameCommand +from .calcCommands.fitRename import CalcFitRenameCommand from service.fit import Fit from logbook import Logger from gui.builtinShipBrowser.events import FitRenamed diff --git a/gui/fitCommands/guiImportMutatedModule.py b/gui/fitCommands/guiImportMutatedModule.py index b789f4d22..9ffe3ef3e 100644 --- a/gui/fitCommands/guiImportMutatedModule.py +++ b/gui/fitCommands/guiImportMutatedModule.py @@ -5,7 +5,7 @@ import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import ModuleInfo from service.fit import Fit -from .calc.module.localAdd import CalcAddLocalModuleCommand +from .calcCommands.module.localAdd import CalcAddLocalModuleCommand pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiMetaSwap.py b/gui/fitCommands/guiMetaSwap.py index f9c9d1293..73a8864ef 100644 --- a/gui/fitCommands/guiMetaSwap.py +++ b/gui/fitCommands/guiMetaSwap.py @@ -4,15 +4,15 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import ModuleInfo, FighterInfo, BoosterInfo -from .calc.implant.remove import CalcRemoveImplantCommand -from .calc.implant.add import CalcAddImplantCommand -from .calc.booster.add import CalcAddBoosterCommand -from .calc.cargo.remove import CalcRemoveCargoCommand -from .calc.cargo.add import CalcAddCargoCommand -from .calc.module.localReplace import CalcReplaceLocalModuleCommand -from .calc.fighter.localAdd import CalcAddLocalFighterCommand -from .calc.fighter.localRemove import CalcRemoveLocalFighterCommand -from .calc.itemRebase import CalcRebaseItemCommand +from .calcCommands.implant.remove import CalcRemoveImplantCommand +from .calcCommands.implant.add import CalcAddImplantCommand +from .calcCommands.booster.add import CalcAddBoosterCommand +from .calcCommands.cargo.remove import CalcRemoveCargoCommand +from .calcCommands.cargo.add import CalcAddCargoCommand +from .calcCommands.module.localReplace import CalcReplaceLocalModuleCommand +from .calcCommands.fighter.localAdd import CalcAddLocalFighterCommand +from .calcCommands.fighter.localRemove import CalcRemoveLocalFighterCommand +from .calcCommands.itemRebase import CalcRebaseItemCommand class GuiMetaSwapCommand(wx.Command): diff --git a/gui/fitCommands/guiModuleToCargo.py b/gui/fitCommands/guiModuleToCargo.py index 484ef782a..d53fea0ca 100644 --- a/gui/fitCommands/guiModuleToCargo.py +++ b/gui/fitCommands/guiModuleToCargo.py @@ -3,12 +3,12 @@ from logbook import Logger import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand -from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModuleCommand -from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand +from gui.fitCommands.calcCommands.cargo.remove import CalcRemoveCargoCommand +from gui.fitCommands.calcCommands.module.localRemove import CalcRemoveLocalModuleCommand +from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand from gui.fitCommands.helpers import ModuleInfo from service.fit import Fit -from .calc.cargo.add import CalcAddCargoCommand +from .calcCommands.cargo.add import CalcAddCargoCommand pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiMutaConvert.py b/gui/fitCommands/guiMutaConvert.py index 33b141975..f9419a9ba 100644 --- a/gui/fitCommands/guiMutaConvert.py +++ b/gui/fitCommands/guiMutaConvert.py @@ -4,7 +4,7 @@ import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import ModuleInfo from service.fit import Fit -from .calc.module.localReplace import CalcReplaceLocalModuleCommand +from .calcCommands.module.localReplace import CalcReplaceLocalModuleCommand class GuiMutaConvertCommand(wx.Command): diff --git a/gui/fitCommands/guiMutaRevert.py b/gui/fitCommands/guiMutaRevert.py index e38f5af45..c0a88680c 100644 --- a/gui/fitCommands/guiMutaRevert.py +++ b/gui/fitCommands/guiMutaRevert.py @@ -4,7 +4,7 @@ import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import ModuleInfo from service.fit import Fit -from .calc.module.localReplace import CalcReplaceLocalModuleCommand +from .calcCommands.module.localReplace import CalcReplaceLocalModuleCommand class GuiMutaRevertCommand(wx.Command): diff --git a/gui/fitCommands/guiRebaseItems.py b/gui/fitCommands/guiRebaseItems.py index 5baa44059..a5130b825 100644 --- a/gui/fitCommands/guiRebaseItems.py +++ b/gui/fitCommands/guiRebaseItems.py @@ -5,10 +5,10 @@ import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import CargoInfo from service.fit import Fit -from .calc.itemRebase import CalcRebaseItemCommand -from .calc.module.changeCharges import CalcChangeModuleChargesCommand -from .calc.cargo.add import CalcAddCargoCommand -from .calc.cargo.remove import CalcRemoveCargoCommand +from .calcCommands.itemRebase import CalcRebaseItemCommand +from .calcCommands.module.changeCharges import CalcChangeModuleChargesCommand +from .calcCommands.cargo.add import CalcAddCargoCommand +from .calcCommands.cargo.remove import CalcRemoveCargoCommand from gui.fitCommands.helpers import InternalCommandHistory diff --git a/gui/fitCommands/guiRemoveBooster.py b/gui/fitCommands/guiRemoveBooster.py index abd47890c..ed763a5f2 100644 --- a/gui/fitCommands/guiRemoveBooster.py +++ b/gui/fitCommands/guiRemoveBooster.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.booster.remove import CalcRemoveBoosterCommand +from .calcCommands.booster.remove import CalcRemoveBoosterCommand class GuiRemoveBoosterCommand(wx.Command): diff --git a/gui/fitCommands/guiRemoveCargo.py b/gui/fitCommands/guiRemoveCargo.py index e1d3e0149..ad0a60f16 100644 --- a/gui/fitCommands/guiRemoveCargo.py +++ b/gui/fitCommands/guiRemoveCargo.py @@ -6,7 +6,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import CargoInfo -from .calc.cargo.remove import CalcRemoveCargoCommand +from .calcCommands.cargo.remove import CalcRemoveCargoCommand class GuiRemoveCargoCommand(wx.Command): diff --git a/gui/fitCommands/guiRemoveCommand.py b/gui/fitCommands/guiRemoveCommand.py index a4002408e..65a5b1584 100644 --- a/gui/fitCommands/guiRemoveCommand.py +++ b/gui/fitCommands/guiRemoveCommand.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.commandFit.remove import CalcRemoveCommandCommand +from .calcCommands.commandFit.remove import CalcRemoveCommandCommand class GuiRemoveCommandCommand(wx.Command): diff --git a/gui/fitCommands/guiRemoveDrone.py b/gui/fitCommands/guiRemoveDrone.py index 42dcac5cd..fcbd53a7c 100644 --- a/gui/fitCommands/guiRemoveDrone.py +++ b/gui/fitCommands/guiRemoveDrone.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.drone.localRemove import CalcRemoveLocalDroneCommand +from .calcCommands.drone.localRemove import CalcRemoveLocalDroneCommand class GuiRemoveDroneCommand(wx.Command): diff --git a/gui/fitCommands/guiRemoveFighter.py b/gui/fitCommands/guiRemoveFighter.py index eeea0a87d..3b57af0fe 100644 --- a/gui/fitCommands/guiRemoveFighter.py +++ b/gui/fitCommands/guiRemoveFighter.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.fighter.localRemove import CalcRemoveLocalFighterCommand +from .calcCommands.fighter.localRemove import CalcRemoveLocalFighterCommand class GuiRemoveFighterCommand(wx.Command): diff --git a/gui/fitCommands/guiRemoveImplant.py b/gui/fitCommands/guiRemoveImplant.py index 0677b998f..f6d90bb7a 100644 --- a/gui/fitCommands/guiRemoveImplant.py +++ b/gui/fitCommands/guiRemoveImplant.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.implant.remove import CalcRemoveImplantCommand +from .calcCommands.implant.remove import CalcRemoveImplantCommand class GuiRemoveImplantCommand(wx.Command): diff --git a/gui/fitCommands/guiRemoveModule.py b/gui/fitCommands/guiRemoveModule.py index de0d29906..2223300a3 100644 --- a/gui/fitCommands/guiRemoveModule.py +++ b/gui/fitCommands/guiRemoveModule.py @@ -4,7 +4,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE from .helpers import ModuleInfo -from .calc.module.localRemove import CalcRemoveLocalModuleCommand +from .calcCommands.module.localRemove import CalcRemoveLocalModuleCommand class GuiModuleRemoveCommand(wx.Command): diff --git a/gui/fitCommands/guiRemoveProjected.py b/gui/fitCommands/guiRemoveProjected.py index 873da7fbe..7b6f9c54c 100644 --- a/gui/fitCommands/guiRemoveProjected.py +++ b/gui/fitCommands/guiRemoveProjected.py @@ -3,11 +3,11 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.module.projectedRemove import CalcRemoveProjectedModuleCommand -from .calc.projectedFit.remove import CalcRemoveProjectedFitCommand -from .calc.fighter.projectedRemove import CalcRemoveProjectedFighterCommand +from .calcCommands.module.projectedRemove import CalcRemoveProjectedModuleCommand +from .calcCommands.projectedFit.remove import CalcRemoveProjectedFitCommand +from .calcCommands.fighter.projectedRemove import CalcRemoveProjectedFighterCommand from logbook import Logger -from .calc.drone.projectedRemove import CalcRemoveProjectedDroneCommand +from .calcCommands.drone.projectedRemove import CalcRemoveProjectedDroneCommand from gui.fitCommands.helpers import DroneInfo from eos.saveddata.drone import Drone diff --git a/gui/fitCommands/guiSetMode.py b/gui/fitCommands/guiSetMode.py index 2c572c714..3be21d626 100644 --- a/gui/fitCommands/guiSetMode.py +++ b/gui/fitCommands/guiSetMode.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.shipModeChange import CalcChangeShipModeCommand +from .calcCommands.shipModeChange import CalcChangeShipModeCommand class GuiSetModeCommand(wx.Command): diff --git a/gui/fitCommands/guiSetSpoolup.py b/gui/fitCommands/guiSetSpoolup.py index 588af0a86..843b846a3 100644 --- a/gui/fitCommands/guiSetSpoolup.py +++ b/gui/fitCommands/guiSetSpoolup.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.module.changeSpool import CalcChangeModuleSpoolCommand +from .calcCommands.module.changeSpool import CalcChangeModuleSpoolCommand class GuiSetSpoolup(wx.Command): diff --git a/gui/fitCommands/guiSwapCloneModule.py b/gui/fitCommands/guiSwapCloneModule.py index 4251094f1..185e585dc 100644 --- a/gui/fitCommands/guiSwapCloneModule.py +++ b/gui/fitCommands/guiSwapCloneModule.py @@ -3,8 +3,8 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calc.module.localSwap import CalcSwapLocalModuleCommand -from .calc.module.localClone import CalcCloneLocalModuleCommand +from gui.fitCommands.calcCommands.module.localSwap import CalcSwapLocalModuleCommand +from .calcCommands.module.localClone import CalcCloneLocalModuleCommand from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiToggleBooster.py b/gui/fitCommands/guiToggleBooster.py index 644a0d1a7..688a9c85b 100644 --- a/gui/fitCommands/guiToggleBooster.py +++ b/gui/fitCommands/guiToggleBooster.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.booster.toggleState import CalcToggleBoosterStateCommand +from .calcCommands.booster.toggleState import CalcToggleBoosterStateCommand class GuiToggleBoosterCommand(wx.Command): diff --git a/gui/fitCommands/guiToggleBoosterSideEffect.py b/gui/fitCommands/guiToggleBoosterSideEffect.py index eb91dc184..862b56a01 100644 --- a/gui/fitCommands/guiToggleBoosterSideEffect.py +++ b/gui/fitCommands/guiToggleBoosterSideEffect.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.booster.sideEffectToggleState import CalcToggleBoosterSideEffectStateCommand +from .calcCommands.booster.sideEffectToggleState import CalcToggleBoosterSideEffectStateCommand class GuiToggleBoosterSideEffectCommand(wx.Command): diff --git a/gui/fitCommands/guiToggleCommand.py b/gui/fitCommands/guiToggleCommand.py index 7066200d3..964b3ddda 100644 --- a/gui/fitCommands/guiToggleCommand.py +++ b/gui/fitCommands/guiToggleCommand.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.commandFit.toggleState import CalcToggleCommandFitStateCommand +from .calcCommands.commandFit.toggleState import CalcToggleCommandFitStateCommand class GuiToggleCommandCommand(wx.Command): diff --git a/gui/fitCommands/guiToggleDrone.py b/gui/fitCommands/guiToggleDrone.py index a016a497c..f055a12e2 100644 --- a/gui/fitCommands/guiToggleDrone.py +++ b/gui/fitCommands/guiToggleDrone.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.drone.localToggleState import CalcToggleLocalDroneStateCommand +from .calcCommands.drone.localToggleState import CalcToggleLocalDroneStateCommand class GuiToggleDroneCommand(wx.Command): diff --git a/gui/fitCommands/guiToggleFighter.py b/gui/fitCommands/guiToggleFighter.py index e0f86f450..0aa32d83b 100644 --- a/gui/fitCommands/guiToggleFighter.py +++ b/gui/fitCommands/guiToggleFighter.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.fighter.toggleState import CalcToggleFighterStateCommand +from .calcCommands.fighter.toggleState import CalcToggleFighterStateCommand class GuiToggleFighterCommand(wx.Command): diff --git a/gui/fitCommands/guiToggleFighterAbility.py b/gui/fitCommands/guiToggleFighterAbility.py index 31796b9a0..f9419d755 100644 --- a/gui/fitCommands/guiToggleFighterAbility.py +++ b/gui/fitCommands/guiToggleFighterAbility.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.fighter.abilityToggleState import CalcToggleFighterAbilityStateCommand +from .calcCommands.fighter.abilityToggleState import CalcToggleFighterAbilityStateCommand class GuiToggleFighterAbilityCommand(wx.Command): diff --git a/gui/fitCommands/guiToggleImplant.py b/gui/fitCommands/guiToggleImplant.py index 89e0c5cb0..80b8053c9 100644 --- a/gui/fitCommands/guiToggleImplant.py +++ b/gui/fitCommands/guiToggleImplant.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.implant.toggleState import CalcToggleImplantStateCommand +from .calcCommands.implant.toggleState import CalcToggleImplantStateCommand class GuiToggleImplantCommand(wx.Command): diff --git a/gui/fitCommands/guiToggleModuleState.py b/gui/fitCommands/guiToggleModuleState.py index 11c5d6ef7..c4524205a 100644 --- a/gui/fitCommands/guiToggleModuleState.py +++ b/gui/fitCommands/guiToggleModuleState.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from .calc.module.localChangeStates import CalcChangeLocalModuleStatesCommand +from .calcCommands.module.localChangeStates import CalcChangeLocalModuleStatesCommand class GuiModuleStateChangeCommand(wx.Command): diff --git a/gui/fitCommands/guiToggleProjected.py b/gui/fitCommands/guiToggleProjected.py index 9e42b487b..013d78ae8 100644 --- a/gui/fitCommands/guiToggleProjected.py +++ b/gui/fitCommands/guiToggleProjected.py @@ -7,10 +7,10 @@ from eos.saveddata.fit import Fit as FitType from eos.saveddata.module import Module as ModuleType from gui import globalEvents as GE from service.fit import Fit -from .calc.drone.projectedToggleState import CalcToggleProjectedDroneStateCommand -from .calc.fighter.toggleState import CalcToggleFighterStateCommand -from .calc.projectedFit.toggleState import CalcToggleProjectedFitCommand -from .calc.module.projectedChangeState import CalcChangeProjectedModuleStateCommand +from .calcCommands.drone.projectedToggleState import CalcToggleProjectedDroneStateCommand +from .calcCommands.fighter.toggleState import CalcToggleFighterStateCommand +from .calcCommands.projectedFit.toggleState import CalcToggleProjectedFitCommand +from .calcCommands.module.projectedChangeState import CalcChangeProjectedModuleStateCommand class GuiToggleProjectedCommand(wx.Command): diff --git a/service/port/efs.py b/service/port/efs.py index 3aa22d35b..9243251d7 100755 --- a/service/port/efs.py +++ b/service/port/efs.py @@ -16,8 +16,8 @@ from eos.effectHandlerHelpers import HandledList from eos.db import gamedata_session, getCategory, getAttributeInfo, getGroup from eos.gamedata import Attribute, Effect, Group, Item, ItemEffect from eos.utils.spoolSupport import SpoolType, SpoolOptions -from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand -from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModuleCommand +from gui.fitCommands.calcCommands.module.localAdd import CalcAddLocalModuleCommand +from gui.fitCommands.calcCommands.module.localRemove import CalcRemoveLocalModuleCommand from gui.fitCommands.helpers import ModuleInfo