From 82777d0b022444ab745f1e42d4ca8a4cd7a6db39 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 15 Apr 2019 12:15:19 +0300 Subject: [PATCH] Move gui commands to their own package to avoid confusion in commands package --- gui/fitCommands/__init__.py | 114 +++++++++--------- gui/fitCommands/{booster => calc}/__init__.py | 0 .../booster}/__init__.py | 0 .../{calcCommands => calc}/booster/add.py | 0 .../{calcCommands => calc}/booster/remove.py | 0 .../booster/sideEffectToggleState.py | 0 .../booster/toggleState.py | 0 .../booster => calc/cargo}/__init__.py | 0 .../{calcCommands => calc}/cargo/add.py | 0 .../cargo/changeAmount.py | 0 .../{calcCommands => calc}/cargo/remove.py | 0 .../cargo => calc/commandFit}/__init__.py | 0 .../{calcCommands => calc}/commandFit/add.py | 0 .../commandFit/remove.py | 0 .../commandFit/toggleState.py | 0 .../commandFit => calc/drone}/__init__.py | 0 .../{calcCommands => calc}/drone/localAdd.py | 0 .../drone/localChangeAmount.py | 0 .../drone/localRemove.py | 0 .../drone/localToggleState.py | 0 .../drone/projectedAdd.py | 0 .../drone/projectedChangeAmount.py | 0 .../drone/projectedRemove.py | 0 .../drone/projectedToggleState.py | 0 .../drone => calc/fighter}/__init__.py | 0 .../fighter/abilityToggleState.py | 0 .../fighter/changeAmount.py | 0 .../fighter/localAdd.py | 0 .../fighter/localRemove.py | 0 .../fighter/projectedAdd.py | 0 .../fighter/projectedRemove.py | 0 .../fighter/toggleState.py | 0 .../{calcCommands => calc}/fitRename.py | 0 .../fighter => calc/implant}/__init__.py | 0 .../{calcCommands => calc}/implant/add.py | 0 .../implant/changeLocation.py | 0 .../{calcCommands => calc}/implant/remove.py | 0 .../implant/toggleState.py | 0 .../{calcCommands => calc}/itemRebase.py | 0 .../implant => calc/module}/__init__.py | 0 .../module/changeCharges.py | 0 .../module/changeSpool.py | 0 .../{calcCommands => calc}/module/localAdd.py | 0 .../module/localChangeStates.py | 0 .../module/localClone.py | 0 .../module/localRemove.py | 0 .../module/localReplace.py | 0 .../module/localSwap.py | 0 .../module/projectedAdd.py | 0 .../module/projectedChangeState.py | 0 .../module/projectedRemove.py | 0 .../module => calc/projectedFit}/__init__.py | 0 .../projectedFit/add.py | 0 .../projectedFit/changeAmount.py | 0 .../projectedFit/remove.py | 0 .../projectedFit/toggleState.py | 0 .../{calcCommands => calc}/shipModeChange.py | 0 .../projectedFit => gui}/__init__.py | 0 .../{cargo => gui/booster}/__init__.py | 0 gui/fitCommands/{ => gui}/booster/add.py | 2 +- gui/fitCommands/{ => gui}/booster/remove.py | 2 +- .../booster/sideEffectToggleState.py | 2 +- .../{ => gui}/booster/toggleState.py | 2 +- .../{commandFit => gui/cargo}/__init__.py | 0 gui/fitCommands/{ => gui}/cargo/add.py | 2 +- .../{ => gui}/cargo/changeAmount.py | 4 +- gui/fitCommands/{ => gui}/cargo/remove.py | 2 +- .../{implant => gui/commandFit}/__init__.py | 0 gui/fitCommands/{ => gui}/commandFit/add.py | 2 +- .../{ => gui}/commandFit/remove.py | 2 +- .../{ => gui}/commandFit/toggleState.py | 2 +- gui/fitCommands/{ => gui}/fitRename.py | 2 +- gui/fitCommands/{ => gui}/guiCargoToModule.py | 8 +- gui/fitCommands/{ => gui}/guiMetaSwap.py | 18 +-- gui/fitCommands/{ => gui}/guiModuleToCargo.py | 8 +- .../{ => gui}/guiSwapCloneModule.py | 4 +- .../{localDrone => gui/implant}/__init__.py | 0 gui/fitCommands/{ => gui}/implant/add.py | 4 +- .../{ => gui}/implant/changeLocation.py | 2 +- gui/fitCommands/{ => gui}/implant/remove.py | 2 +- .../{ => gui}/implant/toggleState.py | 2 +- gui/fitCommands/{ => gui}/itemsRebase.py | 8 +- .../localDrone}/__init__.py | 0 gui/fitCommands/{ => gui}/localDrone/add.py | 2 +- .../{ => gui}/localDrone/changeAmount.py | 4 +- .../{ => gui}/localDrone/remove.py | 2 +- .../{ => gui}/localDrone/toggleState.py | 2 +- .../localFighter}/__init__.py | 0 .../localFighter/abilityToggleState.py | 2 +- gui/fitCommands/{ => gui}/localFighter/add.py | 2 +- .../{ => gui}/localFighter/changeAmount.py | 4 +- .../{ => gui}/localFighter/remove.py | 2 +- .../{ => gui}/localFighter/toggleState.py | 2 +- .../localModule}/__init__.py | 0 gui/fitCommands/{ => gui}/localModule/add.py | 6 +- .../{ => gui}/localModule/changeCharges.py | 2 +- .../{ => gui}/localModule/changeSpool.py | 2 +- .../{ => gui}/localModule/changeStates.py | 2 +- gui/fitCommands/{ => gui}/localModule/fill.py | 2 +- .../{ => gui}/localModule/mutatedConvert.py | 2 +- .../{ => gui}/localModule/mutatedImport.py | 2 +- .../{ => gui}/localModule/mutatedRevert.py | 2 +- .../{ => gui}/localModule/remove.py | 2 +- .../projectedDrone}/__init__.py | 0 .../{ => gui}/projectedDrone/add.py | 2 +- .../{ => gui}/projectedDrone/changeAmount.py | 4 +- .../{ => gui}/projectedDrone/remove.py | 2 +- .../{ => gui}/projectedDrone/toggleState.py | 2 +- .../projectedFighter}/__init__.py | 0 .../projectedFighter/abilityToggleState.py | 2 +- .../{ => gui}/projectedFighter/add.py | 2 +- .../projectedFighter/changeAmount.py | 4 +- .../{ => gui}/projectedFighter/remove.py | 2 +- .../{ => gui}/projectedFighter/toggleState.py | 2 +- .../projectedFit}/__init__.py | 0 gui/fitCommands/{ => gui}/projectedFit/add.py | 2 +- .../{ => gui}/projectedFit/changeAmount.py | 4 +- .../{ => gui}/projectedFit/remove.py | 2 +- .../{ => gui}/projectedFit/toggleState.py | 2 +- .../gui/projectedModule/__init__.py | 0 .../{ => gui}/projectedModule/add.py | 2 +- .../projectedModule/changeCharges.py | 2 +- .../{ => gui}/projectedModule/changeSpool.py | 2 +- .../{ => gui}/projectedModule/changeState.py | 2 +- .../{ => gui}/projectedModule/remove.py | 2 +- gui/fitCommands/{ => gui}/shipModeChange.py | 2 +- service/port/efs.py | 4 +- 127 files changed, 143 insertions(+), 143 deletions(-) rename gui/fitCommands/{booster => calc}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc/booster}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc}/booster/add.py (100%) rename gui/fitCommands/{calcCommands => calc}/booster/remove.py (100%) rename gui/fitCommands/{calcCommands => calc}/booster/sideEffectToggleState.py (100%) rename gui/fitCommands/{calcCommands => calc}/booster/toggleState.py (100%) rename gui/fitCommands/{calcCommands/booster => calc/cargo}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc}/cargo/add.py (100%) rename gui/fitCommands/{calcCommands => calc}/cargo/changeAmount.py (100%) rename gui/fitCommands/{calcCommands => calc}/cargo/remove.py (100%) rename gui/fitCommands/{calcCommands/cargo => calc/commandFit}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc}/commandFit/add.py (100%) rename gui/fitCommands/{calcCommands => calc}/commandFit/remove.py (100%) rename gui/fitCommands/{calcCommands => calc}/commandFit/toggleState.py (100%) rename gui/fitCommands/{calcCommands/commandFit => calc/drone}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc}/drone/localAdd.py (100%) rename gui/fitCommands/{calcCommands => calc}/drone/localChangeAmount.py (100%) rename gui/fitCommands/{calcCommands => calc}/drone/localRemove.py (100%) rename gui/fitCommands/{calcCommands => calc}/drone/localToggleState.py (100%) rename gui/fitCommands/{calcCommands => calc}/drone/projectedAdd.py (100%) rename gui/fitCommands/{calcCommands => calc}/drone/projectedChangeAmount.py (100%) rename gui/fitCommands/{calcCommands => calc}/drone/projectedRemove.py (100%) rename gui/fitCommands/{calcCommands => calc}/drone/projectedToggleState.py (100%) rename gui/fitCommands/{calcCommands/drone => calc/fighter}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc}/fighter/abilityToggleState.py (100%) rename gui/fitCommands/{calcCommands => calc}/fighter/changeAmount.py (100%) rename gui/fitCommands/{calcCommands => calc}/fighter/localAdd.py (100%) rename gui/fitCommands/{calcCommands => calc}/fighter/localRemove.py (100%) rename gui/fitCommands/{calcCommands => calc}/fighter/projectedAdd.py (100%) rename gui/fitCommands/{calcCommands => calc}/fighter/projectedRemove.py (100%) rename gui/fitCommands/{calcCommands => calc}/fighter/toggleState.py (100%) rename gui/fitCommands/{calcCommands => calc}/fitRename.py (100%) rename gui/fitCommands/{calcCommands/fighter => calc/implant}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc}/implant/add.py (100%) rename gui/fitCommands/{calcCommands => calc}/implant/changeLocation.py (100%) rename gui/fitCommands/{calcCommands => calc}/implant/remove.py (100%) rename gui/fitCommands/{calcCommands => calc}/implant/toggleState.py (100%) rename gui/fitCommands/{calcCommands => calc}/itemRebase.py (100%) rename gui/fitCommands/{calcCommands/implant => calc/module}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/changeCharges.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/changeSpool.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/localAdd.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/localChangeStates.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/localClone.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/localRemove.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/localReplace.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/localSwap.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/projectedAdd.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/projectedChangeState.py (100%) rename gui/fitCommands/{calcCommands => calc}/module/projectedRemove.py (100%) rename gui/fitCommands/{calcCommands/module => calc/projectedFit}/__init__.py (100%) rename gui/fitCommands/{calcCommands => calc}/projectedFit/add.py (100%) rename gui/fitCommands/{calcCommands => calc}/projectedFit/changeAmount.py (100%) rename gui/fitCommands/{calcCommands => calc}/projectedFit/remove.py (100%) rename gui/fitCommands/{calcCommands => calc}/projectedFit/toggleState.py (100%) rename gui/fitCommands/{calcCommands => calc}/shipModeChange.py (100%) rename gui/fitCommands/{calcCommands/projectedFit => gui}/__init__.py (100%) rename gui/fitCommands/{cargo => gui/booster}/__init__.py (100%) rename gui/fitCommands/{ => gui}/booster/add.py (93%) rename gui/fitCommands/{ => gui}/booster/remove.py (92%) rename gui/fitCommands/{ => gui}/booster/sideEffectToggleState.py (90%) rename gui/fitCommands/{ => gui}/booster/toggleState.py (91%) rename gui/fitCommands/{commandFit => gui/cargo}/__init__.py (100%) rename gui/fitCommands/{ => gui}/cargo/add.py (92%) rename gui/fitCommands/{ => gui}/cargo/changeAmount.py (88%) rename gui/fitCommands/{ => gui}/cargo/remove.py (92%) rename gui/fitCommands/{implant => gui/commandFit}/__init__.py (100%) rename gui/fitCommands/{ => gui}/commandFit/add.py (92%) rename gui/fitCommands/{ => gui}/commandFit/remove.py (92%) rename gui/fitCommands/{ => gui}/commandFit/toggleState.py (91%) rename gui/fitCommands/{ => gui}/fitRename.py (92%) rename gui/fitCommands/{ => gui}/guiCargoToModule.py (90%) rename gui/fitCommands/{ => gui}/guiMetaSwap.py (80%) rename gui/fitCommands/{ => gui}/guiModuleToCargo.py (90%) rename gui/fitCommands/{ => gui}/guiSwapCloneModule.py (91%) rename gui/fitCommands/{localDrone => gui/implant}/__init__.py (100%) rename gui/fitCommands/{ => gui}/implant/add.py (87%) rename gui/fitCommands/{ => gui}/implant/changeLocation.py (91%) rename gui/fitCommands/{ => gui}/implant/remove.py (92%) rename gui/fitCommands/{ => gui}/implant/toggleState.py (91%) rename gui/fitCommands/{ => gui}/itemsRebase.py (89%) rename gui/fitCommands/{localFighter => gui/localDrone}/__init__.py (100%) rename gui/fitCommands/{ => gui}/localDrone/add.py (93%) rename gui/fitCommands/{ => gui}/localDrone/changeAmount.py (88%) rename gui/fitCommands/{ => gui}/localDrone/remove.py (92%) rename gui/fitCommands/{ => gui}/localDrone/toggleState.py (91%) rename gui/fitCommands/{localModule => gui/localFighter}/__init__.py (100%) rename gui/fitCommands/{ => gui}/localFighter/abilityToggleState.py (91%) rename gui/fitCommands/{ => gui}/localFighter/add.py (92%) rename gui/fitCommands/{ => gui}/localFighter/changeAmount.py (88%) rename gui/fitCommands/{ => gui}/localFighter/remove.py (91%) rename gui/fitCommands/{ => gui}/localFighter/toggleState.py (91%) rename gui/fitCommands/{projectedDrone => gui/localModule}/__init__.py (100%) rename gui/fitCommands/{ => gui}/localModule/add.py (89%) rename gui/fitCommands/{ => gui}/localModule/changeCharges.py (92%) rename gui/fitCommands/{ => gui}/localModule/changeSpool.py (93%) rename gui/fitCommands/{ => gui}/localModule/changeStates.py (92%) rename gui/fitCommands/{ => gui}/localModule/fill.py (93%) rename gui/fitCommands/{ => gui}/localModule/mutatedConvert.py (94%) rename gui/fitCommands/{ => gui}/localModule/mutatedImport.py (94%) rename gui/fitCommands/{ => gui}/localModule/mutatedRevert.py (94%) rename gui/fitCommands/{ => gui}/localModule/remove.py (93%) rename gui/fitCommands/{projectedFighter => gui/projectedDrone}/__init__.py (100%) rename gui/fitCommands/{ => gui}/projectedDrone/add.py (92%) rename gui/fitCommands/{ => gui}/projectedDrone/changeAmount.py (88%) rename gui/fitCommands/{ => gui}/projectedDrone/remove.py (92%) rename gui/fitCommands/{ => gui}/projectedDrone/toggleState.py (90%) rename gui/fitCommands/{projectedFit => gui/projectedFighter}/__init__.py (100%) rename gui/fitCommands/{ => gui}/projectedFighter/abilityToggleState.py (91%) rename gui/fitCommands/{ => gui}/projectedFighter/add.py (91%) rename gui/fitCommands/{ => gui}/projectedFighter/changeAmount.py (88%) rename gui/fitCommands/{ => gui}/projectedFighter/remove.py (91%) rename gui/fitCommands/{ => gui}/projectedFighter/toggleState.py (91%) rename gui/fitCommands/{projectedModule => gui/projectedFit}/__init__.py (100%) rename gui/fitCommands/{ => gui}/projectedFit/add.py (92%) rename gui/fitCommands/{ => gui}/projectedFit/changeAmount.py (88%) rename gui/fitCommands/{ => gui}/projectedFit/remove.py (91%) rename gui/fitCommands/{ => gui}/projectedFit/toggleState.py (91%) create mode 100644 gui/fitCommands/gui/projectedModule/__init__.py rename gui/fitCommands/{ => gui}/projectedModule/add.py (91%) rename gui/fitCommands/{ => gui}/projectedModule/changeCharges.py (92%) rename gui/fitCommands/{ => gui}/projectedModule/changeSpool.py (93%) rename gui/fitCommands/{ => gui}/projectedModule/changeState.py (90%) rename gui/fitCommands/{ => gui}/projectedModule/remove.py (91%) rename gui/fitCommands/{ => gui}/shipModeChange.py (92%) diff --git a/gui/fitCommands/__init__.py b/gui/fitCommands/__init__.py index 41c4fc561..1aa65ddd8 100644 --- a/gui/fitCommands/__init__.py +++ b/gui/fitCommands/__init__.py @@ -1,57 +1,57 @@ -from .booster.add import GuiAddBoosterCommand -from .booster.remove import GuiRemoveBoosterCommand -from .booster.sideEffectToggleState import GuiToggleBoosterSideEffectStateCommand -from .booster.toggleState import GuiToggleBoosterStateCommand -from .cargo.add import GuiAddCargoCommand -from .cargo.changeAmount import GuiChangeCargoAmountCommand -from .cargo.remove import GuiRemoveCargoCommand -from .commandFit.add import GuiAddCommandFitCommand -from .commandFit.remove import GuiRemoveCommandFitCommand -from .commandFit.toggleState import GuiToggleCommandFitStateCommand -from .localDrone.add import GuiAddLocalDroneCommand -from .localDrone.changeAmount import GuiChangeLocalDroneAmountCommand -from .localDrone.remove import GuiRemoveLocalDroneCommand -from .localDrone.toggleState import GuiToggleLocalDroneStateCommand -from .localFighter.abilityToggleState import GuiToggleLocalFighterAbilityStateCommand -from .localFighter.add import GuiAddLocalFighterCommand -from .localFighter.changeAmount import GuiChangeLocalFighterAmountCommand -from .localFighter.remove import GuiRemoveLocalFighterCommand -from .localFighter.toggleState import GuiToggleLocalFighterStateCommand -from .guiCargoToModule import GuiCargoToModuleCommand -from .fitRename import GuiRenameFitCommand -from .guiMetaSwap import GuiMetaSwapCommand -from .guiModuleToCargo import GuiModuleToCargoCommand -from .itemsRebase import GuiRebaseItemsCommand -from .shipModeChange import GuiChangeShipModeCommand -from .guiSwapCloneModule import GuiModuleSwapOrCloneCommand -from .implant.add import GuiAddImplantCommand -from .implant.changeLocation import GuiChangeImplantLocationCommand -from .implant.remove import GuiRemoveImplantCommand -from .implant.toggleState import GuiToggleImplantStateCommand -from .localModule.add import GuiAddLocalModuleCommand -from .localModule.changeCharges import GuiChangeLocalModuleChargesCommand -from .localModule.changeSpool import GuiChangeLocalModuleSpoolCommand -from .localModule.changeStates import GuiChangeLocalModuleStatesCommand -from .localModule.fill import GuiFillWithLocalModulesCommand -from .localModule.mutatedConvert import GuiConvertMutatedLocalModuleCommand -from .localModule.mutatedImport import GuiImportLocalMutatedModuleCommand -from .localModule.mutatedRevert import GuiRevertMutatedLocalModuleCommand -from .localModule.remove import GuiRemoveLocalModuleCommand -from .projectedDrone.add import GuiAddProjectedDroneCommand -from .projectedDrone.changeAmount import GuiChangeProjectedDroneAmountCommand -from .projectedDrone.remove import GuiRemoveProjectedDroneCommand -from .projectedDrone.toggleState import GuiToggleProjectedDroneStateCommand -from .projectedFighter.abilityToggleState import GuiToggleProjectedFighterAbilityStateCommand -from .projectedFighter.add import GuiAddProjectedFighterCommand -from .projectedFighter.changeAmount import GuiChangeProjectedFighterAmountCommand -from .projectedFighter.remove import GuiRemoveProjectedFighterCommand -from .projectedFighter.toggleState import GuiToggleProjectedFighterStateCommand -from .projectedFit.add import GuiAddProjectedFitCommand -from .projectedFit.changeAmount import GuiChangeProjectedFitAmountCommand -from .projectedFit.remove import GuiRemoveProjectedFitCommand -from .projectedFit.toggleState import GuiToggleProjectedFitStateCommand -from .projectedModule.add import GuiAddProjectedModuleCommand -from .projectedModule.changeCharges import GuiChangeProjectedModuleChargesCommand -from .projectedModule.changeSpool import GuiChangeProjectedModuleSpoolCommand -from .projectedModule.changeState import GuiChangeProjectedModuleStateCommand -from .projectedModule.remove import GuiRemoveProjectedModuleCommand +from .gui.booster.add import GuiAddBoosterCommand +from .gui.booster.remove import GuiRemoveBoosterCommand +from .gui.booster.sideEffectToggleState import GuiToggleBoosterSideEffectStateCommand +from .gui.booster.toggleState import GuiToggleBoosterStateCommand +from .gui.cargo.add import GuiAddCargoCommand +from .gui.cargo.changeAmount import GuiChangeCargoAmountCommand +from .gui.cargo.remove import GuiRemoveCargoCommand +from .gui.commandFit.add import GuiAddCommandFitCommand +from .gui.commandFit.remove import GuiRemoveCommandFitCommand +from .gui.commandFit.toggleState import GuiToggleCommandFitStateCommand +from .gui.fitRename import GuiRenameFitCommand +from .gui.guiCargoToModule import GuiCargoToModuleCommand +from .gui.guiMetaSwap import GuiMetaSwapCommand +from .gui.guiModuleToCargo import GuiModuleToCargoCommand +from .gui.guiSwapCloneModule import GuiModuleSwapOrCloneCommand +from .gui.implant.add import GuiAddImplantCommand +from .gui.implant.changeLocation import GuiChangeImplantLocationCommand +from .gui.implant.remove import GuiRemoveImplantCommand +from .gui.implant.toggleState import GuiToggleImplantStateCommand +from .gui.itemsRebase import GuiRebaseItemsCommand +from .gui.localDrone.add import GuiAddLocalDroneCommand +from .gui.localDrone.changeAmount import GuiChangeLocalDroneAmountCommand +from .gui.localDrone.remove import GuiRemoveLocalDroneCommand +from .gui.localDrone.toggleState import GuiToggleLocalDroneStateCommand +from .gui.localFighter.abilityToggleState import GuiToggleLocalFighterAbilityStateCommand +from .gui.localFighter.add import GuiAddLocalFighterCommand +from .gui.localFighter.changeAmount import GuiChangeLocalFighterAmountCommand +from .gui.localFighter.remove import GuiRemoveLocalFighterCommand +from .gui.localFighter.toggleState import GuiToggleLocalFighterStateCommand +from .gui.localModule.add import GuiAddLocalModuleCommand +from .gui.localModule.changeCharges import GuiChangeLocalModuleChargesCommand +from .gui.localModule.changeSpool import GuiChangeLocalModuleSpoolCommand +from .gui.localModule.changeStates import GuiChangeLocalModuleStatesCommand +from .gui.localModule.fill import GuiFillWithLocalModulesCommand +from .gui.localModule.mutatedConvert import GuiConvertMutatedLocalModuleCommand +from .gui.localModule.mutatedImport import GuiImportLocalMutatedModuleCommand +from .gui.localModule.mutatedRevert import GuiRevertMutatedLocalModuleCommand +from .gui.localModule.remove import GuiRemoveLocalModuleCommand +from .gui.projectedDrone.add import GuiAddProjectedDroneCommand +from .gui.projectedDrone.changeAmount import GuiChangeProjectedDroneAmountCommand +from .gui.projectedDrone.remove import GuiRemoveProjectedDroneCommand +from .gui.projectedDrone.toggleState import GuiToggleProjectedDroneStateCommand +from .gui.projectedFighter.abilityToggleState import GuiToggleProjectedFighterAbilityStateCommand +from .gui.projectedFighter.add import GuiAddProjectedFighterCommand +from .gui.projectedFighter.changeAmount import GuiChangeProjectedFighterAmountCommand +from .gui.projectedFighter.remove import GuiRemoveProjectedFighterCommand +from .gui.projectedFighter.toggleState import GuiToggleProjectedFighterStateCommand +from .gui.projectedFit.add import GuiAddProjectedFitCommand +from .gui.projectedFit.changeAmount import GuiChangeProjectedFitAmountCommand +from .gui.projectedFit.remove import GuiRemoveProjectedFitCommand +from .gui.projectedFit.toggleState import GuiToggleProjectedFitStateCommand +from .gui.projectedModule.add import GuiAddProjectedModuleCommand +from .gui.projectedModule.changeCharges import GuiChangeProjectedModuleChargesCommand +from .gui.projectedModule.changeSpool import GuiChangeProjectedModuleSpoolCommand +from .gui.projectedModule.changeState import GuiChangeProjectedModuleStateCommand +from .gui.projectedModule.remove import GuiRemoveProjectedModuleCommand +from .gui.shipModeChange import GuiChangeShipModeCommand diff --git a/gui/fitCommands/booster/__init__.py b/gui/fitCommands/calc/__init__.py similarity index 100% rename from gui/fitCommands/booster/__init__.py rename to gui/fitCommands/calc/__init__.py diff --git a/gui/fitCommands/calcCommands/__init__.py b/gui/fitCommands/calc/booster/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/__init__.py rename to gui/fitCommands/calc/booster/__init__.py diff --git a/gui/fitCommands/calcCommands/booster/add.py b/gui/fitCommands/calc/booster/add.py similarity index 100% rename from gui/fitCommands/calcCommands/booster/add.py rename to gui/fitCommands/calc/booster/add.py diff --git a/gui/fitCommands/calcCommands/booster/remove.py b/gui/fitCommands/calc/booster/remove.py similarity index 100% rename from gui/fitCommands/calcCommands/booster/remove.py rename to gui/fitCommands/calc/booster/remove.py diff --git a/gui/fitCommands/calcCommands/booster/sideEffectToggleState.py b/gui/fitCommands/calc/booster/sideEffectToggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/booster/sideEffectToggleState.py rename to gui/fitCommands/calc/booster/sideEffectToggleState.py diff --git a/gui/fitCommands/calcCommands/booster/toggleState.py b/gui/fitCommands/calc/booster/toggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/booster/toggleState.py rename to gui/fitCommands/calc/booster/toggleState.py diff --git a/gui/fitCommands/calcCommands/booster/__init__.py b/gui/fitCommands/calc/cargo/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/booster/__init__.py rename to gui/fitCommands/calc/cargo/__init__.py diff --git a/gui/fitCommands/calcCommands/cargo/add.py b/gui/fitCommands/calc/cargo/add.py similarity index 100% rename from gui/fitCommands/calcCommands/cargo/add.py rename to gui/fitCommands/calc/cargo/add.py diff --git a/gui/fitCommands/calcCommands/cargo/changeAmount.py b/gui/fitCommands/calc/cargo/changeAmount.py similarity index 100% rename from gui/fitCommands/calcCommands/cargo/changeAmount.py rename to gui/fitCommands/calc/cargo/changeAmount.py diff --git a/gui/fitCommands/calcCommands/cargo/remove.py b/gui/fitCommands/calc/cargo/remove.py similarity index 100% rename from gui/fitCommands/calcCommands/cargo/remove.py rename to gui/fitCommands/calc/cargo/remove.py diff --git a/gui/fitCommands/calcCommands/cargo/__init__.py b/gui/fitCommands/calc/commandFit/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/cargo/__init__.py rename to gui/fitCommands/calc/commandFit/__init__.py diff --git a/gui/fitCommands/calcCommands/commandFit/add.py b/gui/fitCommands/calc/commandFit/add.py similarity index 100% rename from gui/fitCommands/calcCommands/commandFit/add.py rename to gui/fitCommands/calc/commandFit/add.py diff --git a/gui/fitCommands/calcCommands/commandFit/remove.py b/gui/fitCommands/calc/commandFit/remove.py similarity index 100% rename from gui/fitCommands/calcCommands/commandFit/remove.py rename to gui/fitCommands/calc/commandFit/remove.py diff --git a/gui/fitCommands/calcCommands/commandFit/toggleState.py b/gui/fitCommands/calc/commandFit/toggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/commandFit/toggleState.py rename to gui/fitCommands/calc/commandFit/toggleState.py diff --git a/gui/fitCommands/calcCommands/commandFit/__init__.py b/gui/fitCommands/calc/drone/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/commandFit/__init__.py rename to gui/fitCommands/calc/drone/__init__.py diff --git a/gui/fitCommands/calcCommands/drone/localAdd.py b/gui/fitCommands/calc/drone/localAdd.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/localAdd.py rename to gui/fitCommands/calc/drone/localAdd.py diff --git a/gui/fitCommands/calcCommands/drone/localChangeAmount.py b/gui/fitCommands/calc/drone/localChangeAmount.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/localChangeAmount.py rename to gui/fitCommands/calc/drone/localChangeAmount.py diff --git a/gui/fitCommands/calcCommands/drone/localRemove.py b/gui/fitCommands/calc/drone/localRemove.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/localRemove.py rename to gui/fitCommands/calc/drone/localRemove.py diff --git a/gui/fitCommands/calcCommands/drone/localToggleState.py b/gui/fitCommands/calc/drone/localToggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/localToggleState.py rename to gui/fitCommands/calc/drone/localToggleState.py diff --git a/gui/fitCommands/calcCommands/drone/projectedAdd.py b/gui/fitCommands/calc/drone/projectedAdd.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/projectedAdd.py rename to gui/fitCommands/calc/drone/projectedAdd.py diff --git a/gui/fitCommands/calcCommands/drone/projectedChangeAmount.py b/gui/fitCommands/calc/drone/projectedChangeAmount.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/projectedChangeAmount.py rename to gui/fitCommands/calc/drone/projectedChangeAmount.py diff --git a/gui/fitCommands/calcCommands/drone/projectedRemove.py b/gui/fitCommands/calc/drone/projectedRemove.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/projectedRemove.py rename to gui/fitCommands/calc/drone/projectedRemove.py diff --git a/gui/fitCommands/calcCommands/drone/projectedToggleState.py b/gui/fitCommands/calc/drone/projectedToggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/projectedToggleState.py rename to gui/fitCommands/calc/drone/projectedToggleState.py diff --git a/gui/fitCommands/calcCommands/drone/__init__.py b/gui/fitCommands/calc/fighter/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/drone/__init__.py rename to gui/fitCommands/calc/fighter/__init__.py diff --git a/gui/fitCommands/calcCommands/fighter/abilityToggleState.py b/gui/fitCommands/calc/fighter/abilityToggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/fighter/abilityToggleState.py rename to gui/fitCommands/calc/fighter/abilityToggleState.py diff --git a/gui/fitCommands/calcCommands/fighter/changeAmount.py b/gui/fitCommands/calc/fighter/changeAmount.py similarity index 100% rename from gui/fitCommands/calcCommands/fighter/changeAmount.py rename to gui/fitCommands/calc/fighter/changeAmount.py diff --git a/gui/fitCommands/calcCommands/fighter/localAdd.py b/gui/fitCommands/calc/fighter/localAdd.py similarity index 100% rename from gui/fitCommands/calcCommands/fighter/localAdd.py rename to gui/fitCommands/calc/fighter/localAdd.py diff --git a/gui/fitCommands/calcCommands/fighter/localRemove.py b/gui/fitCommands/calc/fighter/localRemove.py similarity index 100% rename from gui/fitCommands/calcCommands/fighter/localRemove.py rename to gui/fitCommands/calc/fighter/localRemove.py diff --git a/gui/fitCommands/calcCommands/fighter/projectedAdd.py b/gui/fitCommands/calc/fighter/projectedAdd.py similarity index 100% rename from gui/fitCommands/calcCommands/fighter/projectedAdd.py rename to gui/fitCommands/calc/fighter/projectedAdd.py diff --git a/gui/fitCommands/calcCommands/fighter/projectedRemove.py b/gui/fitCommands/calc/fighter/projectedRemove.py similarity index 100% rename from gui/fitCommands/calcCommands/fighter/projectedRemove.py rename to gui/fitCommands/calc/fighter/projectedRemove.py diff --git a/gui/fitCommands/calcCommands/fighter/toggleState.py b/gui/fitCommands/calc/fighter/toggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/fighter/toggleState.py rename to gui/fitCommands/calc/fighter/toggleState.py diff --git a/gui/fitCommands/calcCommands/fitRename.py b/gui/fitCommands/calc/fitRename.py similarity index 100% rename from gui/fitCommands/calcCommands/fitRename.py rename to gui/fitCommands/calc/fitRename.py diff --git a/gui/fitCommands/calcCommands/fighter/__init__.py b/gui/fitCommands/calc/implant/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/fighter/__init__.py rename to gui/fitCommands/calc/implant/__init__.py diff --git a/gui/fitCommands/calcCommands/implant/add.py b/gui/fitCommands/calc/implant/add.py similarity index 100% rename from gui/fitCommands/calcCommands/implant/add.py rename to gui/fitCommands/calc/implant/add.py diff --git a/gui/fitCommands/calcCommands/implant/changeLocation.py b/gui/fitCommands/calc/implant/changeLocation.py similarity index 100% rename from gui/fitCommands/calcCommands/implant/changeLocation.py rename to gui/fitCommands/calc/implant/changeLocation.py diff --git a/gui/fitCommands/calcCommands/implant/remove.py b/gui/fitCommands/calc/implant/remove.py similarity index 100% rename from gui/fitCommands/calcCommands/implant/remove.py rename to gui/fitCommands/calc/implant/remove.py diff --git a/gui/fitCommands/calcCommands/implant/toggleState.py b/gui/fitCommands/calc/implant/toggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/implant/toggleState.py rename to gui/fitCommands/calc/implant/toggleState.py diff --git a/gui/fitCommands/calcCommands/itemRebase.py b/gui/fitCommands/calc/itemRebase.py similarity index 100% rename from gui/fitCommands/calcCommands/itemRebase.py rename to gui/fitCommands/calc/itemRebase.py diff --git a/gui/fitCommands/calcCommands/implant/__init__.py b/gui/fitCommands/calc/module/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/implant/__init__.py rename to gui/fitCommands/calc/module/__init__.py diff --git a/gui/fitCommands/calcCommands/module/changeCharges.py b/gui/fitCommands/calc/module/changeCharges.py similarity index 100% rename from gui/fitCommands/calcCommands/module/changeCharges.py rename to gui/fitCommands/calc/module/changeCharges.py diff --git a/gui/fitCommands/calcCommands/module/changeSpool.py b/gui/fitCommands/calc/module/changeSpool.py similarity index 100% rename from gui/fitCommands/calcCommands/module/changeSpool.py rename to gui/fitCommands/calc/module/changeSpool.py diff --git a/gui/fitCommands/calcCommands/module/localAdd.py b/gui/fitCommands/calc/module/localAdd.py similarity index 100% rename from gui/fitCommands/calcCommands/module/localAdd.py rename to gui/fitCommands/calc/module/localAdd.py diff --git a/gui/fitCommands/calcCommands/module/localChangeStates.py b/gui/fitCommands/calc/module/localChangeStates.py similarity index 100% rename from gui/fitCommands/calcCommands/module/localChangeStates.py rename to gui/fitCommands/calc/module/localChangeStates.py diff --git a/gui/fitCommands/calcCommands/module/localClone.py b/gui/fitCommands/calc/module/localClone.py similarity index 100% rename from gui/fitCommands/calcCommands/module/localClone.py rename to gui/fitCommands/calc/module/localClone.py diff --git a/gui/fitCommands/calcCommands/module/localRemove.py b/gui/fitCommands/calc/module/localRemove.py similarity index 100% rename from gui/fitCommands/calcCommands/module/localRemove.py rename to gui/fitCommands/calc/module/localRemove.py diff --git a/gui/fitCommands/calcCommands/module/localReplace.py b/gui/fitCommands/calc/module/localReplace.py similarity index 100% rename from gui/fitCommands/calcCommands/module/localReplace.py rename to gui/fitCommands/calc/module/localReplace.py diff --git a/gui/fitCommands/calcCommands/module/localSwap.py b/gui/fitCommands/calc/module/localSwap.py similarity index 100% rename from gui/fitCommands/calcCommands/module/localSwap.py rename to gui/fitCommands/calc/module/localSwap.py diff --git a/gui/fitCommands/calcCommands/module/projectedAdd.py b/gui/fitCommands/calc/module/projectedAdd.py similarity index 100% rename from gui/fitCommands/calcCommands/module/projectedAdd.py rename to gui/fitCommands/calc/module/projectedAdd.py diff --git a/gui/fitCommands/calcCommands/module/projectedChangeState.py b/gui/fitCommands/calc/module/projectedChangeState.py similarity index 100% rename from gui/fitCommands/calcCommands/module/projectedChangeState.py rename to gui/fitCommands/calc/module/projectedChangeState.py diff --git a/gui/fitCommands/calcCommands/module/projectedRemove.py b/gui/fitCommands/calc/module/projectedRemove.py similarity index 100% rename from gui/fitCommands/calcCommands/module/projectedRemove.py rename to gui/fitCommands/calc/module/projectedRemove.py diff --git a/gui/fitCommands/calcCommands/module/__init__.py b/gui/fitCommands/calc/projectedFit/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/module/__init__.py rename to gui/fitCommands/calc/projectedFit/__init__.py diff --git a/gui/fitCommands/calcCommands/projectedFit/add.py b/gui/fitCommands/calc/projectedFit/add.py similarity index 100% rename from gui/fitCommands/calcCommands/projectedFit/add.py rename to gui/fitCommands/calc/projectedFit/add.py diff --git a/gui/fitCommands/calcCommands/projectedFit/changeAmount.py b/gui/fitCommands/calc/projectedFit/changeAmount.py similarity index 100% rename from gui/fitCommands/calcCommands/projectedFit/changeAmount.py rename to gui/fitCommands/calc/projectedFit/changeAmount.py diff --git a/gui/fitCommands/calcCommands/projectedFit/remove.py b/gui/fitCommands/calc/projectedFit/remove.py similarity index 100% rename from gui/fitCommands/calcCommands/projectedFit/remove.py rename to gui/fitCommands/calc/projectedFit/remove.py diff --git a/gui/fitCommands/calcCommands/projectedFit/toggleState.py b/gui/fitCommands/calc/projectedFit/toggleState.py similarity index 100% rename from gui/fitCommands/calcCommands/projectedFit/toggleState.py rename to gui/fitCommands/calc/projectedFit/toggleState.py diff --git a/gui/fitCommands/calcCommands/shipModeChange.py b/gui/fitCommands/calc/shipModeChange.py similarity index 100% rename from gui/fitCommands/calcCommands/shipModeChange.py rename to gui/fitCommands/calc/shipModeChange.py diff --git a/gui/fitCommands/calcCommands/projectedFit/__init__.py b/gui/fitCommands/gui/__init__.py similarity index 100% rename from gui/fitCommands/calcCommands/projectedFit/__init__.py rename to gui/fitCommands/gui/__init__.py diff --git a/gui/fitCommands/cargo/__init__.py b/gui/fitCommands/gui/booster/__init__.py similarity index 100% rename from gui/fitCommands/cargo/__init__.py rename to gui/fitCommands/gui/booster/__init__.py diff --git a/gui/fitCommands/booster/add.py b/gui/fitCommands/gui/booster/add.py similarity index 93% rename from gui/fitCommands/booster/add.py rename to gui/fitCommands/gui/booster/add.py index 7be53b03c..69203fd50 100644 --- a/gui/fitCommands/booster/add.py +++ b/gui/fitCommands/gui/booster/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.booster.add import CalcAddBoosterCommand +from gui.fitCommands.calc.booster.add import CalcAddBoosterCommand from gui.fitCommands.helpers import BoosterInfo, InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/booster/remove.py b/gui/fitCommands/gui/booster/remove.py similarity index 92% rename from gui/fitCommands/booster/remove.py rename to gui/fitCommands/gui/booster/remove.py index 89902a5a3..d2d704bf1 100644 --- a/gui/fitCommands/booster/remove.py +++ b/gui/fitCommands/gui/booster/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.booster.remove import CalcRemoveBoosterCommand +from gui.fitCommands.calc.booster.remove import CalcRemoveBoosterCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/booster/sideEffectToggleState.py b/gui/fitCommands/gui/booster/sideEffectToggleState.py similarity index 90% rename from gui/fitCommands/booster/sideEffectToggleState.py rename to gui/fitCommands/gui/booster/sideEffectToggleState.py index 9937f18d7..7331313e6 100644 --- a/gui/fitCommands/booster/sideEffectToggleState.py +++ b/gui/fitCommands/gui/booster/sideEffectToggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.booster.sideEffectToggleState import CalcToggleBoosterSideEffectStateCommand +from gui.fitCommands.calc.booster.sideEffectToggleState import CalcToggleBoosterSideEffectStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/booster/toggleState.py b/gui/fitCommands/gui/booster/toggleState.py similarity index 91% rename from gui/fitCommands/booster/toggleState.py rename to gui/fitCommands/gui/booster/toggleState.py index 664f01b91..5b080f403 100644 --- a/gui/fitCommands/booster/toggleState.py +++ b/gui/fitCommands/gui/booster/toggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.booster.toggleState import CalcToggleBoosterStateCommand +from gui.fitCommands.calc.booster.toggleState import CalcToggleBoosterStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/commandFit/__init__.py b/gui/fitCommands/gui/cargo/__init__.py similarity index 100% rename from gui/fitCommands/commandFit/__init__.py rename to gui/fitCommands/gui/cargo/__init__.py diff --git a/gui/fitCommands/cargo/add.py b/gui/fitCommands/gui/cargo/add.py similarity index 92% rename from gui/fitCommands/cargo/add.py rename to gui/fitCommands/gui/cargo/add.py index a22348941..70a043e0e 100644 --- a/gui/fitCommands/cargo/add.py +++ b/gui/fitCommands/gui/cargo/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.cargo.add import CalcAddCargoCommand +from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand from gui.fitCommands.helpers import CargoInfo, InternalCommandHistory diff --git a/gui/fitCommands/cargo/changeAmount.py b/gui/fitCommands/gui/cargo/changeAmount.py similarity index 88% rename from gui/fitCommands/cargo/changeAmount.py rename to gui/fitCommands/gui/cargo/changeAmount.py index 687670cc9..4b7fac530 100644 --- a/gui/fitCommands/cargo/changeAmount.py +++ b/gui/fitCommands/gui/cargo/changeAmount.py @@ -4,8 +4,8 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.cargo.changeAmount import CalcChangeCargoAmountCommand -from gui.fitCommands.calcCommands.cargo.remove import CalcRemoveCargoCommand +from gui.fitCommands.calc.cargo.changeAmount import CalcChangeCargoAmountCommand +from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand from gui.fitCommands.helpers import CargoInfo, InternalCommandHistory diff --git a/gui/fitCommands/cargo/remove.py b/gui/fitCommands/gui/cargo/remove.py similarity index 92% rename from gui/fitCommands/cargo/remove.py rename to gui/fitCommands/gui/cargo/remove.py index dbebc0745..77bcb2cdb 100644 --- a/gui/fitCommands/cargo/remove.py +++ b/gui/fitCommands/gui/cargo/remove.py @@ -4,7 +4,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.cargo.remove import CalcRemoveCargoCommand +from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand from gui.fitCommands.helpers import CargoInfo, InternalCommandHistory diff --git a/gui/fitCommands/implant/__init__.py b/gui/fitCommands/gui/commandFit/__init__.py similarity index 100% rename from gui/fitCommands/implant/__init__.py rename to gui/fitCommands/gui/commandFit/__init__.py diff --git a/gui/fitCommands/commandFit/add.py b/gui/fitCommands/gui/commandFit/add.py similarity index 92% rename from gui/fitCommands/commandFit/add.py rename to gui/fitCommands/gui/commandFit/add.py index dffa72717..549da6bc1 100644 --- a/gui/fitCommands/commandFit/add.py +++ b/gui/fitCommands/gui/commandFit/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.commandFit.add import CalcAddCommandCommand +from gui.fitCommands.calc.commandFit.add import CalcAddCommandCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/commandFit/remove.py b/gui/fitCommands/gui/commandFit/remove.py similarity index 92% rename from gui/fitCommands/commandFit/remove.py rename to gui/fitCommands/gui/commandFit/remove.py index 17217b63a..f519eb03d 100644 --- a/gui/fitCommands/commandFit/remove.py +++ b/gui/fitCommands/gui/commandFit/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.commandFit.remove import CalcRemoveCommandCommand +from gui.fitCommands.calc.commandFit.remove import CalcRemoveCommandCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/commandFit/toggleState.py b/gui/fitCommands/gui/commandFit/toggleState.py similarity index 91% rename from gui/fitCommands/commandFit/toggleState.py rename to gui/fitCommands/gui/commandFit/toggleState.py index 1701f1625..1ca34fd81 100644 --- a/gui/fitCommands/commandFit/toggleState.py +++ b/gui/fitCommands/gui/commandFit/toggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.commandFit.toggleState import CalcToggleCommandFitStateCommand +from gui.fitCommands.calc.commandFit.toggleState import CalcToggleCommandFitStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/fitRename.py b/gui/fitCommands/gui/fitRename.py similarity index 92% rename from gui/fitCommands/fitRename.py rename to gui/fitCommands/gui/fitRename.py index 3fa6a32d5..f4bb2863a 100644 --- a/gui/fitCommands/fitRename.py +++ b/gui/fitCommands/gui/fitRename.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui.builtinShipBrowser.events import FitRenamed -from gui.fitCommands.calcCommands.fitRename import CalcFitRenameCommand +from gui.fitCommands.calc.fitRename import CalcFitRenameCommand from gui.fitCommands.helpers import InternalCommandHistory diff --git a/gui/fitCommands/guiCargoToModule.py b/gui/fitCommands/gui/guiCargoToModule.py similarity index 90% rename from gui/fitCommands/guiCargoToModule.py rename to gui/fitCommands/gui/guiCargoToModule.py index 159ca65ac..a3b187160 100644 --- a/gui/fitCommands/guiCargoToModule.py +++ b/gui/fitCommands/gui/guiCargoToModule.py @@ -3,11 +3,11 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -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.calc.module.changeCharges import CalcChangeModuleChargesCommand +from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand +from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand from gui.fitCommands.helpers import ModuleInfo -from .calcCommands.cargo.add import CalcAddCargoCommand +from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiMetaSwap.py b/gui/fitCommands/gui/guiMetaSwap.py similarity index 80% rename from gui/fitCommands/guiMetaSwap.py rename to gui/fitCommands/gui/guiMetaSwap.py index a4f77a814..472742408 100644 --- a/gui/fitCommands/guiMetaSwap.py +++ b/gui/fitCommands/gui/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 .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 +from gui.fitCommands.calc.implant.remove import CalcRemoveImplantCommand +from gui.fitCommands.calc.implant.add import CalcAddImplantCommand +from gui.fitCommands.calc.booster.add import CalcAddBoosterCommand +from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand +from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand +from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand +from gui.fitCommands.calc.fighter.localAdd import CalcAddLocalFighterCommand +from gui.fitCommands.calc.fighter.localRemove import CalcRemoveLocalFighterCommand +from gui.fitCommands.calc.itemRebase import CalcRebaseItemCommand class GuiMetaSwapCommand(wx.Command): diff --git a/gui/fitCommands/guiModuleToCargo.py b/gui/fitCommands/gui/guiModuleToCargo.py similarity index 90% rename from gui/fitCommands/guiModuleToCargo.py rename to gui/fitCommands/gui/guiModuleToCargo.py index 4dbb50285..6ecb02966 100644 --- a/gui/fitCommands/guiModuleToCargo.py +++ b/gui/fitCommands/gui/guiModuleToCargo.py @@ -3,12 +3,12 @@ from logbook import Logger import gui.mainFrame from gui import globalEvents as GE -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.calc.cargo.remove import CalcRemoveCargoCommand +from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModuleCommand +from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand from gui.fitCommands.helpers import ModuleInfo from service.fit import Fit -from .calcCommands.cargo.add import CalcAddCargoCommand +from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiSwapCloneModule.py b/gui/fitCommands/gui/guiSwapCloneModule.py similarity index 91% rename from gui/fitCommands/guiSwapCloneModule.py rename to gui/fitCommands/gui/guiSwapCloneModule.py index 2bff84711..57fbe2aa3 100644 --- a/gui/fitCommands/guiSwapCloneModule.py +++ b/gui/fitCommands/gui/guiSwapCloneModule.py @@ -3,8 +3,8 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.localSwap import CalcSwapLocalModuleCommand -from .calcCommands.module.localClone import CalcCloneLocalModuleCommand +from gui.fitCommands.calc.module.localSwap import CalcSwapLocalModuleCommand +from gui.fitCommands.calc.module.localClone import CalcCloneLocalModuleCommand from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/localDrone/__init__.py b/gui/fitCommands/gui/implant/__init__.py similarity index 100% rename from gui/fitCommands/localDrone/__init__.py rename to gui/fitCommands/gui/implant/__init__.py diff --git a/gui/fitCommands/implant/add.py b/gui/fitCommands/gui/implant/add.py similarity index 87% rename from gui/fitCommands/implant/add.py rename to gui/fitCommands/gui/implant/add.py index 1fd137e09..2560a4320 100644 --- a/gui/fitCommands/implant/add.py +++ b/gui/fitCommands/gui/implant/add.py @@ -3,8 +3,8 @@ import wx import gui.mainFrame from eos.const import ImplantLocation from gui import globalEvents as GE -from gui.fitCommands.calcCommands.implant.add import CalcAddImplantCommand -from gui.fitCommands.calcCommands.implant.changeLocation import CalcChangeImplantLocationCommand +from gui.fitCommands.calc.implant.add import CalcAddImplantCommand +from gui.fitCommands.calc.implant.changeLocation import CalcChangeImplantLocationCommand from gui.fitCommands.helpers import ImplantInfo, InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/implant/changeLocation.py b/gui/fitCommands/gui/implant/changeLocation.py similarity index 91% rename from gui/fitCommands/implant/changeLocation.py rename to gui/fitCommands/gui/implant/changeLocation.py index 08b606a82..a5b3ec7b3 100644 --- a/gui/fitCommands/implant/changeLocation.py +++ b/gui/fitCommands/gui/implant/changeLocation.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.implant.changeLocation import CalcChangeImplantLocationCommand +from gui.fitCommands.calc.implant.changeLocation import CalcChangeImplantLocationCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/implant/remove.py b/gui/fitCommands/gui/implant/remove.py similarity index 92% rename from gui/fitCommands/implant/remove.py rename to gui/fitCommands/gui/implant/remove.py index e4cf1a902..a06e88915 100644 --- a/gui/fitCommands/implant/remove.py +++ b/gui/fitCommands/gui/implant/remove.py @@ -4,7 +4,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import InternalCommandHistory -from gui.fitCommands.calcCommands.implant.remove import CalcRemoveImplantCommand +from gui.fitCommands.calc.implant.remove import CalcRemoveImplantCommand class GuiRemoveImplantCommand(wx.Command): diff --git a/gui/fitCommands/implant/toggleState.py b/gui/fitCommands/gui/implant/toggleState.py similarity index 91% rename from gui/fitCommands/implant/toggleState.py rename to gui/fitCommands/gui/implant/toggleState.py index d7883bf7f..b51586d75 100644 --- a/gui/fitCommands/implant/toggleState.py +++ b/gui/fitCommands/gui/implant/toggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.implant.toggleState import CalcToggleImplantStateCommand +from gui.fitCommands.calc.implant.toggleState import CalcToggleImplantStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/itemsRebase.py b/gui/fitCommands/gui/itemsRebase.py similarity index 89% rename from gui/fitCommands/itemsRebase.py rename to gui/fitCommands/gui/itemsRebase.py index caa3d985c..70d960a83 100644 --- a/gui/fitCommands/itemsRebase.py +++ b/gui/fitCommands/gui/itemsRebase.py @@ -5,10 +5,10 @@ import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import CargoInfo, InternalCommandHistory from service.fit import Fit -from .calcCommands.cargo.add import CalcAddCargoCommand -from .calcCommands.cargo.remove import CalcRemoveCargoCommand -from .calcCommands.itemRebase import CalcRebaseItemCommand -from .calcCommands.module.changeCharges import CalcChangeModuleChargesCommand +from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand +from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand +from gui.fitCommands.calc.itemRebase import CalcRebaseItemCommand +from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand class GuiRebaseItemsCommand(wx.Command): diff --git a/gui/fitCommands/localFighter/__init__.py b/gui/fitCommands/gui/localDrone/__init__.py similarity index 100% rename from gui/fitCommands/localFighter/__init__.py rename to gui/fitCommands/gui/localDrone/__init__.py diff --git a/gui/fitCommands/localDrone/add.py b/gui/fitCommands/gui/localDrone/add.py similarity index 93% rename from gui/fitCommands/localDrone/add.py rename to gui/fitCommands/gui/localDrone/add.py index 2097f475b..e5f9367a8 100644 --- a/gui/fitCommands/localDrone/add.py +++ b/gui/fitCommands/gui/localDrone/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.drone.localAdd import CalcAddLocalDroneCommand +from gui.fitCommands.calc.drone.localAdd import CalcAddLocalDroneCommand from gui.fitCommands.helpers import DroneInfo, InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localDrone/changeAmount.py b/gui/fitCommands/gui/localDrone/changeAmount.py similarity index 88% rename from gui/fitCommands/localDrone/changeAmount.py rename to gui/fitCommands/gui/localDrone/changeAmount.py index e0da9c824..cf25ae073 100644 --- a/gui/fitCommands/localDrone/changeAmount.py +++ b/gui/fitCommands/gui/localDrone/changeAmount.py @@ -4,8 +4,8 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.drone.localChangeAmount import CalcChangeLocalDroneAmountCommand -from gui.fitCommands.calcCommands.drone.localRemove import CalcRemoveLocalDroneCommand +from gui.fitCommands.calc.drone.localChangeAmount import CalcChangeLocalDroneAmountCommand +from gui.fitCommands.calc.drone.localRemove import CalcRemoveLocalDroneCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localDrone/remove.py b/gui/fitCommands/gui/localDrone/remove.py similarity index 92% rename from gui/fitCommands/localDrone/remove.py rename to gui/fitCommands/gui/localDrone/remove.py index 9cc5b03bf..2077ca04b 100644 --- a/gui/fitCommands/localDrone/remove.py +++ b/gui/fitCommands/gui/localDrone/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.drone.localRemove import CalcRemoveLocalDroneCommand +from gui.fitCommands.calc.drone.localRemove import CalcRemoveLocalDroneCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localDrone/toggleState.py b/gui/fitCommands/gui/localDrone/toggleState.py similarity index 91% rename from gui/fitCommands/localDrone/toggleState.py rename to gui/fitCommands/gui/localDrone/toggleState.py index c1e2b9a4c..f9adb50c3 100644 --- a/gui/fitCommands/localDrone/toggleState.py +++ b/gui/fitCommands/gui/localDrone/toggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.drone.localToggleState import CalcToggleLocalDroneStateCommand +from gui.fitCommands.calc.drone.localToggleState import CalcToggleLocalDroneStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localModule/__init__.py b/gui/fitCommands/gui/localFighter/__init__.py similarity index 100% rename from gui/fitCommands/localModule/__init__.py rename to gui/fitCommands/gui/localFighter/__init__.py diff --git a/gui/fitCommands/localFighter/abilityToggleState.py b/gui/fitCommands/gui/localFighter/abilityToggleState.py similarity index 91% rename from gui/fitCommands/localFighter/abilityToggleState.py rename to gui/fitCommands/gui/localFighter/abilityToggleState.py index 7f7489ad4..128565f1c 100644 --- a/gui/fitCommands/localFighter/abilityToggleState.py +++ b/gui/fitCommands/gui/localFighter/abilityToggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.abilityToggleState import CalcToggleFighterAbilityStateCommand +from gui.fitCommands.calc.fighter.abilityToggleState import CalcToggleFighterAbilityStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localFighter/add.py b/gui/fitCommands/gui/localFighter/add.py similarity index 92% rename from gui/fitCommands/localFighter/add.py rename to gui/fitCommands/gui/localFighter/add.py index 608ad8951..20458d362 100644 --- a/gui/fitCommands/localFighter/add.py +++ b/gui/fitCommands/gui/localFighter/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.localAdd import CalcAddLocalFighterCommand +from gui.fitCommands.calc.fighter.localAdd import CalcAddLocalFighterCommand from gui.fitCommands.helpers import FighterInfo, InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localFighter/changeAmount.py b/gui/fitCommands/gui/localFighter/changeAmount.py similarity index 88% rename from gui/fitCommands/localFighter/changeAmount.py rename to gui/fitCommands/gui/localFighter/changeAmount.py index e18da0087..6e463c469 100644 --- a/gui/fitCommands/localFighter/changeAmount.py +++ b/gui/fitCommands/gui/localFighter/changeAmount.py @@ -2,8 +2,8 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.changeAmount import CalcChangeFighterAmountCommand -from gui.fitCommands.calcCommands.fighter.localRemove import CalcRemoveLocalFighterCommand +from gui.fitCommands.calc.fighter.changeAmount import CalcChangeFighterAmountCommand +from gui.fitCommands.calc.fighter.localRemove import CalcRemoveLocalFighterCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localFighter/remove.py b/gui/fitCommands/gui/localFighter/remove.py similarity index 91% rename from gui/fitCommands/localFighter/remove.py rename to gui/fitCommands/gui/localFighter/remove.py index ade856990..3a3d130a4 100644 --- a/gui/fitCommands/localFighter/remove.py +++ b/gui/fitCommands/gui/localFighter/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.localRemove import CalcRemoveLocalFighterCommand +from gui.fitCommands.calc.fighter.localRemove import CalcRemoveLocalFighterCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localFighter/toggleState.py b/gui/fitCommands/gui/localFighter/toggleState.py similarity index 91% rename from gui/fitCommands/localFighter/toggleState.py rename to gui/fitCommands/gui/localFighter/toggleState.py index 6a7f63433..d97b2d61b 100644 --- a/gui/fitCommands/localFighter/toggleState.py +++ b/gui/fitCommands/gui/localFighter/toggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.toggleState import CalcToggleFighterStateCommand +from gui.fitCommands.calc.fighter.toggleState import CalcToggleFighterStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedDrone/__init__.py b/gui/fitCommands/gui/localModule/__init__.py similarity index 100% rename from gui/fitCommands/projectedDrone/__init__.py rename to gui/fitCommands/gui/localModule/__init__.py diff --git a/gui/fitCommands/localModule/add.py b/gui/fitCommands/gui/localModule/add.py similarity index 89% rename from gui/fitCommands/localModule/add.py rename to gui/fitCommands/gui/localModule/add.py index 5f518d86b..5a5339b80 100644 --- a/gui/fitCommands/localModule/add.py +++ b/gui/fitCommands/gui/localModule/add.py @@ -2,9 +2,9 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.changeCharges import CalcChangeModuleChargesCommand -from gui.fitCommands.calcCommands.module.localAdd import CalcAddLocalModuleCommand -from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand +from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand +from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand +from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo from service.fit import Fit from service.market import Market diff --git a/gui/fitCommands/localModule/changeCharges.py b/gui/fitCommands/gui/localModule/changeCharges.py similarity index 92% rename from gui/fitCommands/localModule/changeCharges.py rename to gui/fitCommands/gui/localModule/changeCharges.py index c325dc844..eefc31628 100644 --- a/gui/fitCommands/localModule/changeCharges.py +++ b/gui/fitCommands/gui/localModule/changeCharges.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.changeCharges import CalcChangeModuleChargesCommand +from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localModule/changeSpool.py b/gui/fitCommands/gui/localModule/changeSpool.py similarity index 93% rename from gui/fitCommands/localModule/changeSpool.py rename to gui/fitCommands/gui/localModule/changeSpool.py index 17973008e..ff9017a20 100644 --- a/gui/fitCommands/localModule/changeSpool.py +++ b/gui/fitCommands/gui/localModule/changeSpool.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.changeSpool import CalcChangeModuleSpoolCommand +from gui.fitCommands.calc.module.changeSpool import CalcChangeModuleSpoolCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localModule/changeStates.py b/gui/fitCommands/gui/localModule/changeStates.py similarity index 92% rename from gui/fitCommands/localModule/changeStates.py rename to gui/fitCommands/gui/localModule/changeStates.py index 100826178..cf466144d 100644 --- a/gui/fitCommands/localModule/changeStates.py +++ b/gui/fitCommands/gui/localModule/changeStates.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.localChangeStates import CalcChangeLocalModuleStatesCommand +from gui.fitCommands.calc.module.localChangeStates import CalcChangeLocalModuleStatesCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/localModule/fill.py b/gui/fitCommands/gui/localModule/fill.py similarity index 93% rename from gui/fitCommands/localModule/fill.py rename to gui/fitCommands/gui/localModule/fill.py index 0af5b4373..189ce13bd 100644 --- a/gui/fitCommands/localModule/fill.py +++ b/gui/fitCommands/gui/localModule/fill.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.localAdd import CalcAddLocalModuleCommand +from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo from service.fit import Fit diff --git a/gui/fitCommands/localModule/mutatedConvert.py b/gui/fitCommands/gui/localModule/mutatedConvert.py similarity index 94% rename from gui/fitCommands/localModule/mutatedConvert.py rename to gui/fitCommands/gui/localModule/mutatedConvert.py index f13ce3e50..f648423af 100644 --- a/gui/fitCommands/localModule/mutatedConvert.py +++ b/gui/fitCommands/gui/localModule/mutatedConvert.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand +from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo from service.fit import Fit diff --git a/gui/fitCommands/localModule/mutatedImport.py b/gui/fitCommands/gui/localModule/mutatedImport.py similarity index 94% rename from gui/fitCommands/localModule/mutatedImport.py rename to gui/fitCommands/gui/localModule/mutatedImport.py index 0ae755432..4e8b1daac 100644 --- a/gui/fitCommands/localModule/mutatedImport.py +++ b/gui/fitCommands/gui/localModule/mutatedImport.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.localAdd import CalcAddLocalModuleCommand +from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo from service.fit import Fit diff --git a/gui/fitCommands/localModule/mutatedRevert.py b/gui/fitCommands/gui/localModule/mutatedRevert.py similarity index 94% rename from gui/fitCommands/localModule/mutatedRevert.py rename to gui/fitCommands/gui/localModule/mutatedRevert.py index 1265687b7..d91d8b555 100644 --- a/gui/fitCommands/localModule/mutatedRevert.py +++ b/gui/fitCommands/gui/localModule/mutatedRevert.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand +from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo from service.fit import Fit diff --git a/gui/fitCommands/localModule/remove.py b/gui/fitCommands/gui/localModule/remove.py similarity index 93% rename from gui/fitCommands/localModule/remove.py rename to gui/fitCommands/gui/localModule/remove.py index eb3fe57b0..4852782a0 100644 --- a/gui/fitCommands/localModule/remove.py +++ b/gui/fitCommands/gui/localModule/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.localRemove import CalcRemoveLocalModuleCommand +from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModuleCommand from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo from service.fit import Fit diff --git a/gui/fitCommands/projectedFighter/__init__.py b/gui/fitCommands/gui/projectedDrone/__init__.py similarity index 100% rename from gui/fitCommands/projectedFighter/__init__.py rename to gui/fitCommands/gui/projectedDrone/__init__.py diff --git a/gui/fitCommands/projectedDrone/add.py b/gui/fitCommands/gui/projectedDrone/add.py similarity index 92% rename from gui/fitCommands/projectedDrone/add.py rename to gui/fitCommands/gui/projectedDrone/add.py index 7f765691f..eb43f6b25 100644 --- a/gui/fitCommands/projectedDrone/add.py +++ b/gui/fitCommands/gui/projectedDrone/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.drone.projectedAdd import CalcAddProjectedDroneCommand +from gui.fitCommands.calc.drone.projectedAdd import CalcAddProjectedDroneCommand from gui.fitCommands.helpers import DroneInfo, InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedDrone/changeAmount.py b/gui/fitCommands/gui/projectedDrone/changeAmount.py similarity index 88% rename from gui/fitCommands/projectedDrone/changeAmount.py rename to gui/fitCommands/gui/projectedDrone/changeAmount.py index c415b1a4c..2df9fcaba 100644 --- a/gui/fitCommands/projectedDrone/changeAmount.py +++ b/gui/fitCommands/gui/projectedDrone/changeAmount.py @@ -4,8 +4,8 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.drone.projectedChangeAmount import CalcChangeProjectedDroneAmountCommand -from gui.fitCommands.calcCommands.drone.projectedRemove import CalcRemoveProjectedDroneCommand +from gui.fitCommands.calc.drone.projectedChangeAmount import CalcChangeProjectedDroneAmountCommand +from gui.fitCommands.calc.drone.projectedRemove import CalcRemoveProjectedDroneCommand from gui.fitCommands.helpers import DroneInfo, InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedDrone/remove.py b/gui/fitCommands/gui/projectedDrone/remove.py similarity index 92% rename from gui/fitCommands/projectedDrone/remove.py rename to gui/fitCommands/gui/projectedDrone/remove.py index 8d115ac99..eaccf9b3c 100644 --- a/gui/fitCommands/projectedDrone/remove.py +++ b/gui/fitCommands/gui/projectedDrone/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.drone.projectedRemove import CalcRemoveProjectedDroneCommand +from gui.fitCommands.calc.drone.projectedRemove import CalcRemoveProjectedDroneCommand from gui.fitCommands.helpers import DroneInfo, InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedDrone/toggleState.py b/gui/fitCommands/gui/projectedDrone/toggleState.py similarity index 90% rename from gui/fitCommands/projectedDrone/toggleState.py rename to gui/fitCommands/gui/projectedDrone/toggleState.py index 197b959b2..8c592be42 100644 --- a/gui/fitCommands/projectedDrone/toggleState.py +++ b/gui/fitCommands/gui/projectedDrone/toggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.drone.projectedToggleState import CalcToggleProjectedDroneStateCommand +from gui.fitCommands.calc.drone.projectedToggleState import CalcToggleProjectedDroneStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedFit/__init__.py b/gui/fitCommands/gui/projectedFighter/__init__.py similarity index 100% rename from gui/fitCommands/projectedFit/__init__.py rename to gui/fitCommands/gui/projectedFighter/__init__.py diff --git a/gui/fitCommands/projectedFighter/abilityToggleState.py b/gui/fitCommands/gui/projectedFighter/abilityToggleState.py similarity index 91% rename from gui/fitCommands/projectedFighter/abilityToggleState.py rename to gui/fitCommands/gui/projectedFighter/abilityToggleState.py index 2e1b76027..4d2773a25 100644 --- a/gui/fitCommands/projectedFighter/abilityToggleState.py +++ b/gui/fitCommands/gui/projectedFighter/abilityToggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.abilityToggleState import CalcToggleFighterAbilityStateCommand +from gui.fitCommands.calc.fighter.abilityToggleState import CalcToggleFighterAbilityStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedFighter/add.py b/gui/fitCommands/gui/projectedFighter/add.py similarity index 91% rename from gui/fitCommands/projectedFighter/add.py rename to gui/fitCommands/gui/projectedFighter/add.py index 85c0f2146..4296f601b 100644 --- a/gui/fitCommands/projectedFighter/add.py +++ b/gui/fitCommands/gui/projectedFighter/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.projectedAdd import CalcAddProjectedFighterCommand +from gui.fitCommands.calc.fighter.projectedAdd import CalcAddProjectedFighterCommand from gui.fitCommands.helpers import FighterInfo, InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedFighter/changeAmount.py b/gui/fitCommands/gui/projectedFighter/changeAmount.py similarity index 88% rename from gui/fitCommands/projectedFighter/changeAmount.py rename to gui/fitCommands/gui/projectedFighter/changeAmount.py index 3c72e63ec..bceab03a3 100644 --- a/gui/fitCommands/projectedFighter/changeAmount.py +++ b/gui/fitCommands/gui/projectedFighter/changeAmount.py @@ -2,8 +2,8 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.changeAmount import CalcChangeFighterAmountCommand -from gui.fitCommands.calcCommands.fighter.projectedRemove import CalcRemoveProjectedFighterCommand +from gui.fitCommands.calc.fighter.changeAmount import CalcChangeFighterAmountCommand +from gui.fitCommands.calc.fighter.projectedRemove import CalcRemoveProjectedFighterCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedFighter/remove.py b/gui/fitCommands/gui/projectedFighter/remove.py similarity index 91% rename from gui/fitCommands/projectedFighter/remove.py rename to gui/fitCommands/gui/projectedFighter/remove.py index 579b7d890..cb15b986d 100644 --- a/gui/fitCommands/projectedFighter/remove.py +++ b/gui/fitCommands/gui/projectedFighter/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.projectedRemove import CalcRemoveProjectedFighterCommand +from gui.fitCommands.calc.fighter.projectedRemove import CalcRemoveProjectedFighterCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedFighter/toggleState.py b/gui/fitCommands/gui/projectedFighter/toggleState.py similarity index 91% rename from gui/fitCommands/projectedFighter/toggleState.py rename to gui/fitCommands/gui/projectedFighter/toggleState.py index ba2d23abf..051af3f11 100644 --- a/gui/fitCommands/projectedFighter/toggleState.py +++ b/gui/fitCommands/gui/projectedFighter/toggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.fighter.toggleState import CalcToggleFighterStateCommand +from gui.fitCommands.calc.fighter.toggleState import CalcToggleFighterStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedModule/__init__.py b/gui/fitCommands/gui/projectedFit/__init__.py similarity index 100% rename from gui/fitCommands/projectedModule/__init__.py rename to gui/fitCommands/gui/projectedFit/__init__.py diff --git a/gui/fitCommands/projectedFit/add.py b/gui/fitCommands/gui/projectedFit/add.py similarity index 92% rename from gui/fitCommands/projectedFit/add.py rename to gui/fitCommands/gui/projectedFit/add.py index f3e3c5883..9a67bdac1 100644 --- a/gui/fitCommands/projectedFit/add.py +++ b/gui/fitCommands/gui/projectedFit/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.projectedFit.add import CalcAddProjectedFitCommand +from gui.fitCommands.calc.projectedFit.add import CalcAddProjectedFitCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedFit/changeAmount.py b/gui/fitCommands/gui/projectedFit/changeAmount.py similarity index 88% rename from gui/fitCommands/projectedFit/changeAmount.py rename to gui/fitCommands/gui/projectedFit/changeAmount.py index fac64d9ff..65ac93a43 100644 --- a/gui/fitCommands/projectedFit/changeAmount.py +++ b/gui/fitCommands/gui/projectedFit/changeAmount.py @@ -2,8 +2,8 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.projectedFit.changeAmount import CalcChangeProjectedFitAmountCommand -from gui.fitCommands.calcCommands.projectedFit.remove import CalcRemoveProjectedFitCommand +from gui.fitCommands.calc.projectedFit.changeAmount import CalcChangeProjectedFitAmountCommand +from gui.fitCommands.calc.projectedFit.remove import CalcRemoveProjectedFitCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedFit/remove.py b/gui/fitCommands/gui/projectedFit/remove.py similarity index 91% rename from gui/fitCommands/projectedFit/remove.py rename to gui/fitCommands/gui/projectedFit/remove.py index 0123c7546..e1264962b 100644 --- a/gui/fitCommands/projectedFit/remove.py +++ b/gui/fitCommands/gui/projectedFit/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.projectedFit.remove import CalcRemoveProjectedFitCommand +from gui.fitCommands.calc.projectedFit.remove import CalcRemoveProjectedFitCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedFit/toggleState.py b/gui/fitCommands/gui/projectedFit/toggleState.py similarity index 91% rename from gui/fitCommands/projectedFit/toggleState.py rename to gui/fitCommands/gui/projectedFit/toggleState.py index cb427e68f..234af1eea 100644 --- a/gui/fitCommands/projectedFit/toggleState.py +++ b/gui/fitCommands/gui/projectedFit/toggleState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.projectedFit.toggleState import CalcToggleProjectedFitCommand +from gui.fitCommands.calc.projectedFit.toggleState import CalcToggleProjectedFitCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/gui/projectedModule/__init__.py b/gui/fitCommands/gui/projectedModule/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/gui/fitCommands/projectedModule/add.py b/gui/fitCommands/gui/projectedModule/add.py similarity index 91% rename from gui/fitCommands/projectedModule/add.py rename to gui/fitCommands/gui/projectedModule/add.py index e81f56290..23444b197 100644 --- a/gui/fitCommands/projectedModule/add.py +++ b/gui/fitCommands/gui/projectedModule/add.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.projectedAdd import CalcAddProjectedModuleCommand +from gui.fitCommands.calc.module.projectedAdd import CalcAddProjectedModuleCommand from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo from service.fit import Fit diff --git a/gui/fitCommands/projectedModule/changeCharges.py b/gui/fitCommands/gui/projectedModule/changeCharges.py similarity index 92% rename from gui/fitCommands/projectedModule/changeCharges.py rename to gui/fitCommands/gui/projectedModule/changeCharges.py index 0c4e58719..3dbc35856 100644 --- a/gui/fitCommands/projectedModule/changeCharges.py +++ b/gui/fitCommands/gui/projectedModule/changeCharges.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.changeCharges import CalcChangeModuleChargesCommand +from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedModule/changeSpool.py b/gui/fitCommands/gui/projectedModule/changeSpool.py similarity index 93% rename from gui/fitCommands/projectedModule/changeSpool.py rename to gui/fitCommands/gui/projectedModule/changeSpool.py index 5e731a65b..2d4317124 100644 --- a/gui/fitCommands/projectedModule/changeSpool.py +++ b/gui/fitCommands/gui/projectedModule/changeSpool.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.changeSpool import CalcChangeModuleSpoolCommand +from gui.fitCommands.calc.module.changeSpool import CalcChangeModuleSpoolCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedModule/changeState.py b/gui/fitCommands/gui/projectedModule/changeState.py similarity index 90% rename from gui/fitCommands/projectedModule/changeState.py rename to gui/fitCommands/gui/projectedModule/changeState.py index 1ee2d7723..70e78cbcb 100644 --- a/gui/fitCommands/projectedModule/changeState.py +++ b/gui/fitCommands/gui/projectedModule/changeState.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.projectedChangeState import CalcChangeProjectedModuleStateCommand +from gui.fitCommands.calc.module.projectedChangeState import CalcChangeProjectedModuleStateCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/projectedModule/remove.py b/gui/fitCommands/gui/projectedModule/remove.py similarity index 91% rename from gui/fitCommands/projectedModule/remove.py rename to gui/fitCommands/gui/projectedModule/remove.py index 931e720c6..c3f18eb69 100644 --- a/gui/fitCommands/projectedModule/remove.py +++ b/gui/fitCommands/gui/projectedModule/remove.py @@ -2,7 +2,7 @@ import wx import gui.mainFrame from gui import globalEvents as GE -from gui.fitCommands.calcCommands.module.projectedRemove import CalcRemoveProjectedModuleCommand +from gui.fitCommands.calc.module.projectedRemove import CalcRemoveProjectedModuleCommand from gui.fitCommands.helpers import InternalCommandHistory from service.fit import Fit diff --git a/gui/fitCommands/shipModeChange.py b/gui/fitCommands/gui/shipModeChange.py similarity index 92% rename from gui/fitCommands/shipModeChange.py rename to gui/fitCommands/gui/shipModeChange.py index 999a8da6f..da16d6c81 100644 --- a/gui/fitCommands/shipModeChange.py +++ b/gui/fitCommands/gui/shipModeChange.py @@ -4,7 +4,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE from gui.fitCommands.helpers import InternalCommandHistory -from gui.fitCommands.calcCommands.shipModeChange import CalcChangeShipModeCommand +from gui.fitCommands.calc.shipModeChange import CalcChangeShipModeCommand class GuiChangeShipModeCommand(wx.Command): diff --git a/service/port/efs.py b/service/port/efs.py index 9243251d7..3aa22d35b 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.calcCommands.module.localAdd import CalcAddLocalModuleCommand -from gui.fitCommands.calcCommands.module.localRemove import CalcRemoveLocalModuleCommand +from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand +from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModuleCommand from gui.fitCommands.helpers import ModuleInfo