From 5af211778ba1eeacbac1a6002f28e9661013c055 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 16 Apr 2019 18:16:53 +0300 Subject: [PATCH] Rename context menu files --- gui/builtinAdditionPanes/commandView.py | 8 ++-- .../{ammoPattern.py => ammoToDmgPattern.py} | 4 +- .../{cargo.py => cargoAdd.py} | 4 +- .../{cargoAmmo.py => cargoAddAmmo.py} | 4 +- .../{commandFits.py => commandFitAdd.py} | 6 +-- ...amagePattern.py => damagePatternChange.py} | 4 +- .../{droneStack.py => droneAddStack.py} | 4 +- gui/builtinContextMenus/droneRemoveStack.py | 4 +- .../{droneSplit.py => droneSplitStack.py} | 4 +- .../{whProjector.py => envEffectAdd.py} | 4 +- gui/builtinContextMenus/fighterAbilities.py | 4 +- .../{tabbedFits.py => fitAddCurrentlyOpen.py} | 4 +- .../{openFit.py => fitOpenNewTab.py} | 4 +- .../{implantSets.py => implantSetAdd.py} | 5 +-- .../{amount.py => itemAmountChange.py} | 4 +- .../{marketJump.py => itemMarketJump.py} | 4 +- .../{project.py => itemProject.py} | 4 +- gui/builtinContextMenus/itemRemove.py | 4 +- .../{metaSwap.py => itemVariationChange.py} | 4 +- ...oduleAmmoPicker.py => moduleAmmoChange.py} | 4 +- ...alAmmoPicker.py => moduleAmmoChangeAll.py} | 10 ++--- .../{fillWithModule.py => moduleFill.py} | 0 .../{mutaplasmids.py => moduleMutations.py} | 4 +- .../{spoolUp.py => moduleSpool.py} | 4 +- gui/builtinContextMenus/shipJump.py | 4 +- .../{tacticalMode.py => shipModeChange.py} | 4 +- ...geAffectingSkills.py => skillAffectors.py} | 0 gui/builtinViewColumns/baseName.py | 4 +- gui/contextMenu.py | 44 +++++++++---------- 29 files changed, 80 insertions(+), 81 deletions(-) rename gui/builtinContextMenus/{ammoPattern.py => ammoToDmgPattern.py} (95%) rename gui/builtinContextMenus/{cargo.py => cargoAdd.py} (95%) rename gui/builtinContextMenus/{cargoAmmo.py => cargoAddAmmo.py} (94%) rename gui/builtinContextMenus/{commandFits.py => commandFitAdd.py} (97%) rename gui/builtinContextMenus/{damagePattern.py => damagePatternChange.py} (98%) rename gui/builtinContextMenus/{droneStack.py => droneAddStack.py} (94%) rename gui/builtinContextMenus/{droneSplit.py => droneSplitStack.py} (97%) rename gui/builtinContextMenus/{whProjector.py => envEffectAdd.py} (99%) rename gui/builtinContextMenus/{tabbedFits.py => fitAddCurrentlyOpen.py} (96%) rename gui/builtinContextMenus/{openFit.py => fitOpenNewTab.py} (93%) rename gui/builtinContextMenus/{implantSets.py => implantSetAdd.py} (97%) rename gui/builtinContextMenus/{amount.py => itemAmountChange.py} (98%) rename gui/builtinContextMenus/{marketJump.py => itemMarketJump.py} (97%) rename gui/builtinContextMenus/{project.py => itemProject.py} (96%) rename gui/builtinContextMenus/{metaSwap.py => itemVariationChange.py} (98%) rename gui/builtinContextMenus/{moduleAmmoPicker.py => moduleAmmoChange.py} (99%) rename gui/builtinContextMenus/{moduleGlobalAmmoPicker.py => moduleAmmoChangeAll.py} (85%) rename gui/builtinContextMenus/{fillWithModule.py => moduleFill.py} (100%) rename gui/builtinContextMenus/{mutaplasmids.py => moduleMutations.py} (96%) rename gui/builtinContextMenus/{spoolUp.py => moduleSpool.py} (98%) rename gui/builtinContextMenus/{tacticalMode.py => shipModeChange.py} (96%) rename gui/builtinContextMenus/{changeAffectingSkills.py => skillAffectors.py} (100%) diff --git a/gui/builtinAdditionPanes/commandView.py b/gui/builtinAdditionPanes/commandView.py index 73f9d8a14..5001824c4 100644 --- a/gui/builtinAdditionPanes/commandView.py +++ b/gui/builtinAdditionPanes/commandView.py @@ -25,7 +25,7 @@ import gui.display as d import gui.globalEvents as GE from gui.builtinShipBrowser.events import EVT_FIT_REMOVED from eos.saveddata.drone import Drone as es_Drone -from gui.builtinContextMenus.commandFits import CommandFits +from gui.builtinContextMenus.commandFitAdd import AddCommandFit from gui.builtinViewColumns.state import State from gui.contextMenu import ContextMenu from gui.utils.staticHelpers import DragDropHelper @@ -68,8 +68,8 @@ class CommandView(d.Display): self.lastFitId = None - self.mainFrame.Bind(GE.FIT_CHANGED, CommandFits.fitChanged) - self.mainFrame.Bind(EVT_FIT_REMOVED, CommandFits.populateFits) + self.mainFrame.Bind(GE.FIT_CHANGED, AddCommandFit.fitChanged) + self.mainFrame.Bind(EVT_FIT_REMOVED, AddCommandFit.populateFits) self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged) self.Bind(wx.EVT_LEFT_DOWN, self.click) self.Bind(wx.EVT_LEFT_DCLICK, self.remove) @@ -128,7 +128,7 @@ class CommandView(d.Display): sFit = Fit.getInstance() fit = sFit.getFit(event.fitID) - CommandFits.populateFits(event) + AddCommandFit.populateFits(event) self.Parent.Parent.DisablePage(self, not fit or fit.isStructure) diff --git a/gui/builtinContextMenus/ammoPattern.py b/gui/builtinContextMenus/ammoToDmgPattern.py similarity index 95% rename from gui/builtinContextMenus/ammoPattern.py rename to gui/builtinContextMenus/ammoToDmgPattern.py index 1b8dfd95c..467a6ec10 100644 --- a/gui/builtinContextMenus/ammoPattern.py +++ b/gui/builtinContextMenus/ammoToDmgPattern.py @@ -7,7 +7,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class AmmoPattern(ContextMenu): +class AmmoToDmgPattern(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -40,4 +40,4 @@ class AmmoPattern(ContextMenu): return None -AmmoPattern.register() +AmmoToDmgPattern.register() diff --git a/gui/builtinContextMenus/cargo.py b/gui/builtinContextMenus/cargoAdd.py similarity index 95% rename from gui/builtinContextMenus/cargo.py rename to gui/builtinContextMenus/cargoAdd.py index 9a7627d50..e62d83337 100644 --- a/gui/builtinContextMenus/cargo.py +++ b/gui/builtinContextMenus/cargoAdd.py @@ -5,7 +5,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class Cargo(ContextMenu): +class AddToCargo(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -38,4 +38,4 @@ class Cargo(ContextMenu): self.mainFrame.additionsPane.select("Cargo") -Cargo.register() +AddToCargo.register() diff --git a/gui/builtinContextMenus/cargoAmmo.py b/gui/builtinContextMenus/cargoAddAmmo.py similarity index 94% rename from gui/builtinContextMenus/cargoAmmo.py rename to gui/builtinContextMenus/cargoAddAmmo.py index b92ba8e3a..3f7c8dd90 100644 --- a/gui/builtinContextMenus/cargoAmmo.py +++ b/gui/builtinContextMenus/cargoAddAmmo.py @@ -4,7 +4,7 @@ from gui.contextMenu import ContextMenu from service.settings import ContextMenuSettings -class CargoAmmo(ContextMenu): +class AddToCargoAmmo(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -32,4 +32,4 @@ class CargoAmmo(ContextMenu): self.mainFrame.additionsPane.select("Cargo") -CargoAmmo.register() +AddToCargoAmmo.register() diff --git a/gui/builtinContextMenus/commandFits.py b/gui/builtinContextMenus/commandFitAdd.py similarity index 97% rename from gui/builtinContextMenus/commandFits.py rename to gui/builtinContextMenus/commandFitAdd.py index 17cb2ccf5..b33e8545f 100644 --- a/gui/builtinContextMenus/commandFits.py +++ b/gui/builtinContextMenus/commandFitAdd.py @@ -9,7 +9,7 @@ from service.market import Market from service.settings import ContextMenuSettings -class CommandFits(ContextMenu): +class AddCommandFit(ContextMenu): # Get list of items that define a command fit sMkt = Market.getInstance() grp = sMkt.getGroup(1770) # Command burst group @@ -101,5 +101,5 @@ class CommandFits(ContextMenu): self.mainFrame.command.Submit(cmd.GuiAddCommandFitCommand(fitID, fit.ID)) -CommandFits.populateFits(None) -CommandFits.register() +AddCommandFit.populateFits(None) +AddCommandFit.register() diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePatternChange.py similarity index 98% rename from gui/builtinContextMenus/damagePattern.py rename to gui/builtinContextMenus/damagePatternChange.py index 6cc1979ef..5ece19850 100644 --- a/gui/builtinContextMenus/damagePattern.py +++ b/gui/builtinContextMenus/damagePatternChange.py @@ -12,7 +12,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class DamagePattern(ContextMenu): +class ChangeDamagePattern(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -115,4 +115,4 @@ class DamagePattern(ContextMenu): wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) -DamagePattern.register() +ChangeDamagePattern.register() diff --git a/gui/builtinContextMenus/droneStack.py b/gui/builtinContextMenus/droneAddStack.py similarity index 94% rename from gui/builtinContextMenus/droneStack.py rename to gui/builtinContextMenus/droneAddStack.py index e0f2d48e4..d24ba9d28 100644 --- a/gui/builtinContextMenus/droneStack.py +++ b/gui/builtinContextMenus/droneAddStack.py @@ -4,7 +4,7 @@ from gui.contextMenu import ContextMenu from service.settings import ContextMenuSettings -class DroneStack(ContextMenu): +class DroneAddStack(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() @@ -34,4 +34,4 @@ class DroneStack(ContextMenu): self.mainFrame.additionsPane.select('Drones') -DroneStack.register() +DroneAddStack.register() diff --git a/gui/builtinContextMenus/droneRemoveStack.py b/gui/builtinContextMenus/droneRemoveStack.py index f3e43dcb6..a3945354d 100644 --- a/gui/builtinContextMenus/droneRemoveStack.py +++ b/gui/builtinContextMenus/droneRemoveStack.py @@ -7,7 +7,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class ItemRemove(ContextMenu): +class DroneRemoveStack(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -33,4 +33,4 @@ class ItemRemove(ContextMenu): fitID=fitID, itemID=drone.itemID, amount=math.inf)) -ItemRemove.register() +DroneRemoveStack.register() diff --git a/gui/builtinContextMenus/droneSplit.py b/gui/builtinContextMenus/droneSplitStack.py similarity index 97% rename from gui/builtinContextMenus/droneSplit.py rename to gui/builtinContextMenus/droneSplitStack.py index a8625f025..fff6b3004 100644 --- a/gui/builtinContextMenus/droneSplit.py +++ b/gui/builtinContextMenus/droneSplitStack.py @@ -10,7 +10,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class DroneSplit(ContextMenu): +class DroneSplitStack(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -44,7 +44,7 @@ class DroneSplit(ContextMenu): amount=int(cleanInput))) -DroneSplit.register() +DroneSplitStack.register() class DroneStackSplit(wx.Dialog): diff --git a/gui/builtinContextMenus/whProjector.py b/gui/builtinContextMenus/envEffectAdd.py similarity index 99% rename from gui/builtinContextMenus/whProjector.py rename to gui/builtinContextMenus/envEffectAdd.py index 6c71f9238..1da3044a8 100644 --- a/gui/builtinContextMenus/whProjector.py +++ b/gui/builtinContextMenus/envEffectAdd.py @@ -11,7 +11,7 @@ from service.market import Market from service.settings import ContextMenuSettings -class WhProjector(ContextMenu): +class AddEnvironmentEffect(ContextMenu): # CCP doesn't currently provide a mapping between the general Environment, and the specific environment effect # (which can be random when going into Abyssal space). This is how we currently define it: @@ -223,4 +223,4 @@ class WhProjector(ContextMenu): return grouped, () -WhProjector.register() +AddEnvironmentEffect.register() diff --git a/gui/builtinContextMenus/fighterAbilities.py b/gui/builtinContextMenus/fighterAbilities.py index 4dccce834..5433a7b8a 100644 --- a/gui/builtinContextMenus/fighterAbilities.py +++ b/gui/builtinContextMenus/fighterAbilities.py @@ -8,7 +8,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class FighterAbility(ContextMenu): +class FighterAbilities(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -69,4 +69,4 @@ class FighterAbility(ContextMenu): -FighterAbility.register() +FighterAbilities.register() diff --git a/gui/builtinContextMenus/tabbedFits.py b/gui/builtinContextMenus/fitAddCurrentlyOpen.py similarity index 96% rename from gui/builtinContextMenus/tabbedFits.py rename to gui/builtinContextMenus/fitAddCurrentlyOpen.py index 56f9539b0..9db0c4f3e 100644 --- a/gui/builtinContextMenus/tabbedFits.py +++ b/gui/builtinContextMenus/fitAddCurrentlyOpen.py @@ -8,7 +8,7 @@ from gui.contextMenu import ContextMenu from service.fit import Fit -class TabbedFits(ContextMenu): +class AddCurrentlyOpenFit(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() @@ -59,4 +59,4 @@ class TabbedFits(ContextMenu): self.mainFrame.command.Submit(cmd.GuiAddProjectedFitCommand(fitID=fitID, projectedFitID=fit.ID)) -TabbedFits.register() +AddCurrentlyOpenFit.register() diff --git a/gui/builtinContextMenus/openFit.py b/gui/builtinContextMenus/fitOpenNewTab.py similarity index 93% rename from gui/builtinContextMenus/openFit.py rename to gui/builtinContextMenus/fitOpenNewTab.py index 8b6f6668e..e064d0dc5 100644 --- a/gui/builtinContextMenus/openFit.py +++ b/gui/builtinContextMenus/fitOpenNewTab.py @@ -7,7 +7,7 @@ from gui.contextMenu import ContextMenu from service.settings import ContextMenuSettings -class OpenFit(ContextMenu): +class OpenFitInNewTab(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -31,4 +31,4 @@ class OpenFit(ContextMenu): wx.PostEvent(self.mainFrame, FitSelected(fitID=fit.ID, startup=2)) -OpenFit.register() +OpenFitInNewTab.register() diff --git a/gui/builtinContextMenus/implantSets.py b/gui/builtinContextMenus/implantSetAdd.py similarity index 97% rename from gui/builtinContextMenus/implantSets.py rename to gui/builtinContextMenus/implantSetAdd.py index ee7ec0dd4..ffa0aa186 100644 --- a/gui/builtinContextMenus/implantSets.py +++ b/gui/builtinContextMenus/implantSetAdd.py @@ -6,12 +6,11 @@ import gui.globalEvents as GE import gui.mainFrame from gui.contextMenu import ContextMenu from service.character import Character -from service.fit import Fit from service.implantSet import ImplantSets as s_ImplantSets from service.settings import ContextMenuSettings -class ImplantSets(ContextMenu): +class addImplantSet(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -89,4 +88,4 @@ class ImplantSets(ContextMenu): itemIDs=[i.itemID for i in set.implants])) -ImplantSets.register() +addImplantSet.register() diff --git a/gui/builtinContextMenus/amount.py b/gui/builtinContextMenus/itemAmountChange.py similarity index 98% rename from gui/builtinContextMenus/amount.py rename to gui/builtinContextMenus/itemAmountChange.py index 76d2366a9..75ed89629 100644 --- a/gui/builtinContextMenus/amount.py +++ b/gui/builtinContextMenus/itemAmountChange.py @@ -14,7 +14,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class ChangeAmount(ContextMenu): +class ChangeItemAmount(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -66,7 +66,7 @@ class ChangeAmount(ContextMenu): self.mainFrame.command.Submit(cmd.GuiChangeLocalFighterAmountCommand(fitID, fit.fighters.index(thing), cleanInput)) -ChangeAmount.register() +ChangeItemAmount.register() class AmountChanger(wx.Dialog): diff --git a/gui/builtinContextMenus/marketJump.py b/gui/builtinContextMenus/itemMarketJump.py similarity index 97% rename from gui/builtinContextMenus/marketJump.py rename to gui/builtinContextMenus/itemMarketJump.py index 7feb261fa..010f35fd7 100644 --- a/gui/builtinContextMenus/marketJump.py +++ b/gui/builtinContextMenus/itemMarketJump.py @@ -4,7 +4,7 @@ from service.market import Market from service.settings import ContextMenuSettings -class MarketJump(ContextMenu): +class JumpToMarketItem(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -57,4 +57,4 @@ class MarketJump(ContextMenu): self.mainFrame.marketBrowser.jump(item) -MarketJump.register() +JumpToMarketItem.register() diff --git a/gui/builtinContextMenus/project.py b/gui/builtinContextMenus/itemProject.py similarity index 96% rename from gui/builtinContextMenus/project.py rename to gui/builtinContextMenus/itemProject.py index 70290efaf..9893773e4 100644 --- a/gui/builtinContextMenus/project.py +++ b/gui/builtinContextMenus/itemProject.py @@ -5,7 +5,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class Project(ContextMenu): +class ProjectItem(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -45,4 +45,4 @@ class Project(ContextMenu): self.mainFrame.additionsPane.select('Projected') -Project.register() +ProjectItem.register() diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py index 9be97ad82..42a7efa92 100644 --- a/gui/builtinContextMenus/itemRemove.py +++ b/gui/builtinContextMenus/itemRemove.py @@ -5,7 +5,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class ItemRemove(ContextMenu): +class RemoveItem(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -73,4 +73,4 @@ class ItemRemove(ContextMenu): fitID=fitID, commandFitID=selection[0].ID)) -ItemRemove.register() +RemoveItem.register() diff --git a/gui/builtinContextMenus/metaSwap.py b/gui/builtinContextMenus/itemVariationChange.py similarity index 98% rename from gui/builtinContextMenus/metaSwap.py rename to gui/builtinContextMenus/itemVariationChange.py index 3e9e8bdb4..0ff0cdfaf 100644 --- a/gui/builtinContextMenus/metaSwap.py +++ b/gui/builtinContextMenus/itemVariationChange.py @@ -9,7 +9,7 @@ from service.market import Market from service.settings import ContextMenuSettings -class MetaSwap(ContextMenu): +class ChangeItemToVariation(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -170,4 +170,4 @@ class MetaSwap(ContextMenu): fitID=fitID, position=position, newItemID=item.ID)) -MetaSwap.register() +ChangeItemToVariation.register() diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoChange.py similarity index 99% rename from gui/builtinContextMenus/moduleAmmoPicker.py rename to gui/builtinContextMenus/moduleAmmoChange.py index fa29b3c16..99e74dffc 100644 --- a/gui/builtinContextMenus/moduleAmmoPicker.py +++ b/gui/builtinContextMenus/moduleAmmoChange.py @@ -10,7 +10,7 @@ from service.market import Market from service.settings import ContextMenuSettings -class ModuleAmmoPicker(ContextMenu): +class ChangeModuleAmmo(ContextMenu): DAMAGE_TYPES = ("em", "explosive", "kinetic", "thermal") MISSILE_ORDER = ("em", "thermal", "kinetic", "explosive", "mixed") @@ -235,4 +235,4 @@ class ModuleAmmoPicker(ContextMenu): fitID=fitID, modules=self.modules, chargeItemID=charge.ID if charge is not None else None)) -ModuleAmmoPicker.register() +ChangeModuleAmmo.register() diff --git a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoChangeAll.py similarity index 85% rename from gui/builtinContextMenus/moduleGlobalAmmoPicker.py rename to gui/builtinContextMenus/moduleAmmoChangeAll.py index d65bf8c27..be5e02a32 100644 --- a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py +++ b/gui/builtinContextMenus/moduleAmmoChangeAll.py @@ -1,14 +1,14 @@ import gui.fitCommands as cmd import gui.mainFrame -from gui.builtinContextMenus.moduleAmmoPicker import ModuleAmmoPicker +from gui.builtinContextMenus.moduleAmmoChange import ChangeModuleAmmo from service.fit import Fit from service.settings import ContextMenuSettings -class ModuleGlobalAmmoPicker(ModuleAmmoPicker): +class ChangeModuleAmmoAll(ChangeModuleAmmo): def __init__(self): - super(ModuleGlobalAmmoPicker, self).__init__() + super(ChangeModuleAmmoAll, self).__init__() self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -52,7 +52,7 @@ class ModuleGlobalAmmoPicker(ModuleAmmoPicker): if selectionLen != 1: return False - return super(ModuleGlobalAmmoPicker, self).display(srcContext, selection) + return super(ChangeModuleAmmoAll, self).display(srcContext, selection) -ModuleGlobalAmmoPicker.register() +ChangeModuleAmmoAll.register() diff --git a/gui/builtinContextMenus/fillWithModule.py b/gui/builtinContextMenus/moduleFill.py similarity index 100% rename from gui/builtinContextMenus/fillWithModule.py rename to gui/builtinContextMenus/moduleFill.py diff --git a/gui/builtinContextMenus/mutaplasmids.py b/gui/builtinContextMenus/moduleMutations.py similarity index 96% rename from gui/builtinContextMenus/mutaplasmids.py rename to gui/builtinContextMenus/moduleMutations.py index c01feab69..549a60528 100644 --- a/gui/builtinContextMenus/mutaplasmids.py +++ b/gui/builtinContextMenus/moduleMutations.py @@ -7,7 +7,7 @@ from gui.fitCommands import GuiConvertMutatedLocalModuleCommand, GuiRevertMutate from service.settings import ContextMenuSettings -class MutaplasmidCM(ContextMenu): +class ChangeModuleMutation(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -71,4 +71,4 @@ class MutaplasmidCM(ContextMenu): return None -MutaplasmidCM.register() +ChangeModuleMutation.register() diff --git a/gui/builtinContextMenus/spoolUp.py b/gui/builtinContextMenus/moduleSpool.py similarity index 98% rename from gui/builtinContextMenus/spoolUp.py rename to gui/builtinContextMenus/moduleSpool.py index 3a2ddc8c5..9b1e71991 100644 --- a/gui/builtinContextMenus/spoolUp.py +++ b/gui/builtinContextMenus/moduleSpool.py @@ -9,7 +9,7 @@ from gui.contextMenu import ContextMenu from service.settings import ContextMenuSettings -class SpoolUp(ContextMenu): +class ChangeModuleSpool(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -89,4 +89,4 @@ class SpoolUp(ContextMenu): spoolAmount=spoolAmount)) -SpoolUp.register() +ChangeModuleSpool.register() diff --git a/gui/builtinContextMenus/shipJump.py b/gui/builtinContextMenus/shipJump.py index 43741e62b..7dac4296b 100644 --- a/gui/builtinContextMenus/shipJump.py +++ b/gui/builtinContextMenus/shipJump.py @@ -8,7 +8,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class ShipJump(ContextMenu): +class JumpToShip(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -32,4 +32,4 @@ class ShipJump(ContextMenu): wx.PostEvent(self.mainFrame.shipBrowser, Stage3Selected(shipID=stuff.item.ID, back=groupID)) -ShipJump.register() +JumpToShip.register() diff --git a/gui/builtinContextMenus/tacticalMode.py b/gui/builtinContextMenus/shipModeChange.py similarity index 96% rename from gui/builtinContextMenus/tacticalMode.py rename to gui/builtinContextMenus/shipModeChange.py index 0e31c5c11..b7b3057bb 100644 --- a/gui/builtinContextMenus/tacticalMode.py +++ b/gui/builtinContextMenus/shipModeChange.py @@ -8,7 +8,7 @@ from service.fit import Fit from service.settings import ContextMenuSettings -class TacticalMode(ContextMenu): +class ChangeShipTacticalMode(ContextMenu): def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.settings = ContextMenuSettings.getInstance() @@ -64,4 +64,4 @@ class TacticalMode(ContextMenu): self.mainFrame.command.Submit(cmd.GuiChangeShipModeCommand(fitID, self.modeIds[event.Id].item.ID)) -TacticalMode.register() +ChangeShipTacticalMode.register() diff --git a/gui/builtinContextMenus/changeAffectingSkills.py b/gui/builtinContextMenus/skillAffectors.py similarity index 100% rename from gui/builtinContextMenus/changeAffectingSkills.py rename to gui/builtinContextMenus/skillAffectors.py diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py index cad1eebd0..f5dbc0ec0 100644 --- a/gui/builtinViewColumns/baseName.py +++ b/gui/builtinViewColumns/baseName.py @@ -31,7 +31,7 @@ from eos.const import FittingSlot from service.fit import Fit as FitSvc from service.market import Market from gui.viewColumn import ViewColumn -from gui.builtinContextMenus.whProjector import WhProjector +from gui.builtinContextMenus.envEffectAdd import AddEnvironmentEffect import gui.mainFrame pyfalog = Logger(__name__) @@ -83,7 +83,7 @@ class BaseName(ViewColumn): if self.projectedView: # check for projected abyssal name name_check = stuff.item.name[0:-2] - type = WhProjector.abyssal_mapping.get(name_check, None) + type = AddEnvironmentEffect.abyssal_mapping.get(name_check, None) if type: sMkt = Market.getInstance() type = sMkt.getItem(type) diff --git a/gui/contextMenu.py b/gui/contextMenu.py index b40876502..ff9821e54 100644 --- a/gui/contextMenu.py +++ b/gui/contextMenu.py @@ -204,35 +204,35 @@ class ContextMenu(object): # noinspection PyUnresolvedReferences from gui.builtinContextMenus import ( # noqa: E402,F401 - openFit, - moduleGlobalAmmoPicker, - moduleAmmoPicker, - spoolUp, + fitOpenNewTab, + moduleAmmoChangeAll, + moduleAmmoChange, + moduleSpool, itemStats, - damagePattern, - marketJump, - droneSplit, + damagePatternChange, + itemMarketJump, + droneSplitStack, itemRemove, - fillWithModule, + itemVariationChange, + moduleFill, droneRemoveStack, - ammoPattern, + ammoToDmgPattern, factorReload, - droneStack, - cargo, - cargoAmmo, - project, - whProjector, + droneAddStack, + cargoAdd, + cargoAddAmmo, + itemProject, + envEffectAdd, shipJump, - changeAffectingSkills, - tacticalMode, + skillAffectors, + shipModeChange, targetResists, priceOptions, - amount, - metaSwap, - implantSets, + itemAmountChange, + implantSetAdd, fighterAbilities, boosterSideEffects, - commandFits, - tabbedFits, - mutaplasmids, + commandFitAdd, + fitAddCurrentlyOpen, + moduleMutations, )