Rename calc command package, as we're going to put gui commands into packages too

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):

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):

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):

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):

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):

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):

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):

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__)

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__)

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__)
 

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

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__)

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__)

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):

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__)

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__)

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__)

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__)

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

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__)

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):

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__)
 

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):

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):

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
 
 

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):

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):

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):

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):

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):

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):

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):

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

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):

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):

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__)
 

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):

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):

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):

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):

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):

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):

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):

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):