From 5af211778ba1eeacbac1a6002f28e9661013c055 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 16 Apr 2019 18:16:53 +0300 Subject: [PATCH 1/4] 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, ) From af2da86f6ff5665d99b61da85155c0ba586f191f Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 16 Apr 2019 19:26:45 +0300 Subject: [PATCH 2/4] Change order of context menus --- gui/builtinContextMenus/__init__.py | 42 +++++++++++++++++++++ gui/builtinContextMenus/droneRemoveStack.py | 36 ------------------ gui/builtinContextMenus/itemRemove.py | 16 ++++---- gui/contextMenu.py | 35 +---------------- 4 files changed, 50 insertions(+), 79 deletions(-) delete mode 100644 gui/builtinContextMenus/droneRemoveStack.py diff --git a/gui/builtinContextMenus/__init__.py b/gui/builtinContextMenus/__init__.py index e69de29bb..b573f42be 100644 --- a/gui/builtinContextMenus/__init__.py +++ b/gui/builtinContextMenus/__init__.py @@ -0,0 +1,42 @@ +# noinspection PyUnresolvedReferences +from gui.builtinContextMenus import ( # noqa: E402,F401 + # Various command and projected-related items which we want to have first, + # before generic commands + fitOpenNewTab, + envEffectAdd, + fitAddCurrentlyOpen, + commandFitAdd, + # Often-used item manipulations + shipModeChange, + moduleAmmoChange, + moduleAmmoChangeAll, + moduleSpool, + boosterSideEffects, + fighterAbilities, + # Item info + itemStats, + itemMarketJump, + shipJump, + # Generic item manipulations + itemRemove, + moduleMutations, + itemAmountChange, + droneSplitStack, + itemVariationChange, + moduleFill, + skillAffectors, + # Market stuff + droneAddStack, + cargoAdd, + cargoAddAmmo, + itemProject, + ammoToDmgPattern, + implantSetAdd, + # Price + priceOptions, + # Resistance panel + damagePatternChange, + # Firepower panel + factorReload, + targetResists, +) diff --git a/gui/builtinContextMenus/droneRemoveStack.py b/gui/builtinContextMenus/droneRemoveStack.py deleted file mode 100644 index a3945354d..000000000 --- a/gui/builtinContextMenus/droneRemoveStack.py +++ /dev/null @@ -1,36 +0,0 @@ -import math - -import gui.fitCommands as cmd -import gui.mainFrame -from gui.contextMenu import ContextMenu -from service.fit import Fit -from service.settings import ContextMenuSettings - - -class DroneRemoveStack(ContextMenu): - def __init__(self): - self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() - - def display(self, srcContext, selection): - if not self.settings.get('droneRemoveStack'): - return False - if srcContext not in ('droneItem', 'projectedDrone'): - return False - return True - - def getText(self, itmContext, selection): - return "Remove {} Stack".format(itmContext) - - def activate(self, fullContext, selection, i): - drone = selection[0] - fitID = self.mainFrame.getActiveFit() - if 'droneItem' in fullContext: - self.mainFrame.command.Submit(cmd.GuiRemoveLocalDroneCommand( - fitID=fitID, position=Fit.getInstance().getFit(fitID).drones.index(drone), amount=math.inf)) - if 'projectedDrone' in fullContext: - self.mainFrame.command.Submit(cmd.GuiRemoveProjectedDroneCommand( - fitID=fitID, itemID=drone.itemID, amount=math.inf)) - - -DroneRemoveStack.register() diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py index 42a7efa92..16cdcc7e4 100644 --- a/gui/builtinContextMenus/itemRemove.py +++ b/gui/builtinContextMenus/itemRemove.py @@ -1,3 +1,5 @@ +import math + import gui.fitCommands as cmd import gui.mainFrame from gui.contextMenu import ContextMenu @@ -14,10 +16,9 @@ class RemoveItem(ContextMenu): if not self.settings.get('itemRemove'): return False - return srcContext in ("fittingModule", "fittingCharge", - "droneItem", "implantItem", - "boosterItem", "projectedModule", - "projectedCharge", "cargoItem", + return srcContext in ("fittingModule", "droneItem", + "implantItem", "boosterItem", + "projectedModule", "cargoItem", "projectedFit", "projectedDrone", "fighterItem", "projectedFighter", "commandFit") @@ -40,7 +41,7 @@ class RemoveItem(ContextMenu): fitID=fitID, modules=selection, chargeItemID=None)) elif srcContext == "droneItem": self.mainFrame.command.Submit(cmd.GuiRemoveLocalDroneCommand( - fitID=fitID, position=fit.drones.index(selection[0]), amount=1)) + fitID=fitID, position=fit.drones.index(selection[0]), amount=math.inf)) elif srcContext == "fighterItem": self.mainFrame.command.Submit(cmd.GuiRemoveLocalFighterCommand( fitID=fitID, position=fit.fighters.index(selection[0]))) @@ -61,13 +62,10 @@ class RemoveItem(ContextMenu): fitID=fitID, position=fit.projectedModules.index(selection[0]))) elif srcContext == "projectedDrone": self.mainFrame.command.Submit(cmd.GuiRemoveProjectedDroneCommand( - fitID=fitID, itemID=selection[0].itemID, amount=1)) + fitID=fitID, itemID=selection[0].itemID, amount=math.inf)) elif srcContext == "projectedFighter": self.mainFrame.command.Submit(cmd.GuiRemoveProjectedFighterCommand( fitID=fitID, position=fit.projectedFighters.index(selection[0]))) - elif srcContext == "projectedCharge": - self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand( - fitID=fitID, modules=[selection[0]], chargeItemID=None)) elif srcContext == "commandFit": self.mainFrame.command.Submit(cmd.GuiRemoveCommandFitCommand( fitID=fitID, commandFitID=selection[0].ID)) diff --git a/gui/contextMenu.py b/gui/contextMenu.py index ff9821e54..b537d650c 100644 --- a/gui/contextMenu.py +++ b/gui/contextMenu.py @@ -202,37 +202,4 @@ class ContextMenu(object): '''If menu item is enabled. Allows an item to display, but not be selected''' return True -# noinspection PyUnresolvedReferences -from gui.builtinContextMenus import ( # noqa: E402,F401 - fitOpenNewTab, - moduleAmmoChangeAll, - moduleAmmoChange, - moduleSpool, - itemStats, - damagePatternChange, - itemMarketJump, - droneSplitStack, - itemRemove, - itemVariationChange, - moduleFill, - droneRemoveStack, - ammoToDmgPattern, - factorReload, - droneAddStack, - cargoAdd, - cargoAddAmmo, - itemProject, - envEffectAdd, - shipJump, - skillAffectors, - shipModeChange, - targetResists, - priceOptions, - itemAmountChange, - implantSetAdd, - fighterAbilities, - boosterSideEffects, - commandFitAdd, - fitAddCurrentlyOpen, - moduleMutations, -) +import gui.builtinContextMenus From f100971fbe18b4f552b4ce55f0224337c0bf4c9e Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 16 Apr 2019 19:35:24 +0300 Subject: [PATCH 3/4] Set charge to all modules when cmd/control is pressed, instead of having separate menu item --- gui/builtinContextMenus/__init__.py | 1 - gui/builtinContextMenus/moduleAmmoChange.py | 33 +++++++++-- .../moduleAmmoChangeAll.py | 58 ------------------- .../pyfaContextMenuPreferences.py | 24 ++------ service/settings.py | 1 - 5 files changed, 31 insertions(+), 86 deletions(-) delete mode 100644 gui/builtinContextMenus/moduleAmmoChangeAll.py diff --git a/gui/builtinContextMenus/__init__.py b/gui/builtinContextMenus/__init__.py index b573f42be..b6143ffc6 100644 --- a/gui/builtinContextMenus/__init__.py +++ b/gui/builtinContextMenus/__init__.py @@ -9,7 +9,6 @@ from gui.builtinContextMenus import ( # noqa: E402,F401 # Often-used item manipulations shipModeChange, moduleAmmoChange, - moduleAmmoChangeAll, moduleSpool, boosterSideEffects, fighterAbilities, diff --git a/gui/builtinContextMenus/moduleAmmoChange.py b/gui/builtinContextMenus/moduleAmmoChange.py index 99e74dffc..e7efc21cc 100644 --- a/gui/builtinContextMenus/moduleAmmoChange.py +++ b/gui/builtinContextMenus/moduleAmmoChange.py @@ -6,6 +6,7 @@ import gui.mainFrame from eos.const import FittingHardpoint from gui.bitmap_loader import BitmapLoader from gui.contextMenu import ContextMenu +from service.fit import Fit from service.market import Market from service.settings import ContextMenuSettings @@ -227,12 +228,32 @@ class ChangeModuleAmmo(ContextMenu): return fitID = self.mainFrame.getActiveFit() - if self.context == 'fittingModule': - self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand( - fitID=fitID, modules=self.modules, chargeItemID=charge.ID if charge is not None else None)) - elif self.context == 'projectedModule': - self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand( - fitID=fitID, modules=self.modules, chargeItemID=charge.ID if charge is not None else None)) + # Set to all modules if ctrl is pressed + if wx.GetMouseState().CmdDown(): + fit = Fit.getInstance().getFit(fitID) + selectedModule = self.modules[0] + if self.context == 'fittingModule': + self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand( + fitID=fitID, + modules=[m for m in fit.modules if m.itemID is not None and m.itemID == selectedModule.itemID], + chargeItemID=charge.ID if charge is not None else None)) + elif self.context == 'projectedModule': + self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand( + fitID=fitID, + modules=[m for m in fit.projectedModules if + m.itemID is not None and m.itemID == selectedModule.itemID], + chargeItemID=charge.ID if charge is not None else None)) + else: + if self.context == 'fittingModule': + self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand( + fitID=fitID, + modules=self.modules, + chargeItemID=charge.ID if charge is not None else None)) + elif self.context == 'projectedModule': + self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand( + fitID=fitID, + modules=self.modules, + chargeItemID=charge.ID if charge is not None else None)) ChangeModuleAmmo.register() diff --git a/gui/builtinContextMenus/moduleAmmoChangeAll.py b/gui/builtinContextMenus/moduleAmmoChangeAll.py deleted file mode 100644 index be5e02a32..000000000 --- a/gui/builtinContextMenus/moduleAmmoChangeAll.py +++ /dev/null @@ -1,58 +0,0 @@ -import gui.fitCommands as cmd -import gui.mainFrame -from gui.builtinContextMenus.moduleAmmoChange import ChangeModuleAmmo -from service.fit import Fit -from service.settings import ContextMenuSettings - - -class ChangeModuleAmmoAll(ChangeModuleAmmo): - - def __init__(self): - super(ChangeModuleAmmoAll, self).__init__() - self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.settings = ContextMenuSettings.getInstance() - - def getText(self, itmContext, selection): - return "Charge (All)" - - def handleAmmoSwitch(self, event): - if len(self.modules) != 1: - event.Skip() - return - - charge = self.chargeIds.get(event.Id, False) - if charge is False: - event.Skip() - return - - fitID = self.mainFrame.getActiveFit() - fit = Fit.getInstance().getFit(fitID) - - selectedModule = self.modules[0] - if self.context == 'fittingModule': - self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand( - fitID=fitID, - modules=[m for m in fit.modules if m.itemID is not None and m.itemID == selectedModule.itemID], - chargeItemID=charge.ID if charge is not None else None)) - elif self.context == 'projectedModule': - self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand( - fitID=fitID, - modules=[m for m in fit.projectedModules if m.itemID is not None and m.itemID == selectedModule.itemID], - chargeItemID=charge.ID if charge is not None else None)) - - def display(self, srcContext, selection): - if not self.settings.get('moduleGlobalAmmoPicker'): - return False - - try: - selectionLen = len(selection) - except: - pass - else: - if selectionLen != 1: - return False - - return super(ChangeModuleAmmoAll, self).display(srcContext, selection) - - -ChangeModuleAmmoAll.register() diff --git a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py index d0f083448..937abfdfe 100644 --- a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py +++ b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py @@ -59,20 +59,10 @@ class PFContextMenuPref(PreferenceView): rbSizerRow2.Add(self.rbBox4, 1, wx.ALL, 5) self.rbBox4.Bind(wx.EVT_RADIOBOX, self.OnSetting4Change) - # self.rbBox5 = wx.RadioBox(panel, -1, "Charge", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) - # self.rbBox5.SetSelection(self.settings.get('moduleAmmoPicker')) - # rbSizerRow2.Add(self.rbBox5, 0, wx.ALL, 5) - # self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change) - - self.rbBox6 = wx.RadioBox(panel, -1, "Charge (All)", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) - self.rbBox6.SetSelection(self.settings.get('moduleGlobalAmmoPicker')) - rbSizerRow2.Add(self.rbBox6, 1, wx.ALL, 5) - self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change) - - self.rbBox7 = wx.RadioBox(panel, -1, "Project onto Fit", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) - self.rbBox7.SetSelection(self.settings.get('project')) - rbSizerRow2.Add(self.rbBox7, 1, wx.ALL, 5) - self.rbBox7.Bind(wx.EVT_RADIOBOX, self.OnSetting7Change) + self.rbBox5 = wx.RadioBox(panel, -1, "Project onto Fit", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) + self.rbBox5.SetSelection(self.settings.get('project')) + rbSizerRow2.Add(self.rbBox5, 1, wx.ALL, 5) + self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change) mainSizer.Add(rbSizerRow2, 1, wx.ALL | wx.EXPAND, 0) @@ -107,12 +97,6 @@ class PFContextMenuPref(PreferenceView): self.settings.set('metaSwap', event.GetInt()) def OnSetting5Change(self, event): - self.settings.set('moduleAmmoPicker', event.GetInt()) - - def OnSetting6Change(self, event): - self.settings.set('moduleGlobalAmmoPicker', event.GetInt()) - - def OnSetting7Change(self, event): self.settings.set('project', event.GetInt()) def OnSetting8Change(self, event): diff --git a/service/settings.py b/service/settings.py index aa55f98d4..360d39493 100644 --- a/service/settings.py +++ b/service/settings.py @@ -482,7 +482,6 @@ class ContextMenuSettings(object): "marketJump" : 1, "metaSwap" : 1, "moduleAmmoPicker" : 1, - "moduleGlobalAmmoPicker": 1, "openFit" : 1, "priceClear" : 1, "project" : 1, From 82adccadda739efe341b4e9f4afeebec56f3d8f4 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 16 Apr 2019 19:41:52 +0300 Subject: [PATCH 4/4] Always show factor reload time menu item --- gui/builtinContextMenus/factorReload.py | 3 -- .../pyfaContextMenuPreferences.py | 42 ++++++++----------- service/settings.py | 1 - 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py index 333b18b4c..be9fdb9f7 100644 --- a/gui/builtinContextMenus/factorReload.py +++ b/gui/builtinContextMenus/factorReload.py @@ -14,9 +14,6 @@ class FactorReload(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('factorReload'): - return False - return srcContext == "firepowerViewFull" @property diff --git a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py index 937abfdfe..a7efec4c9 100644 --- a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py +++ b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py @@ -44,8 +44,8 @@ class PFContextMenuPref(PreferenceView): rbSizerRow1.Add(self.rbBox2, 1, wx.ALL, 5) self.rbBox2.Bind(wx.EVT_RADIOBOX, self.OnSetting2Change) - self.rbBox3 = wx.RadioBox(panel, -1, "Factor in Reload Time", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) - self.rbBox3.SetSelection(self.settings.get('factorReload')) + self.rbBox3 = wx.RadioBox(panel, -1, "Variations", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) + self.rbBox3.SetSelection(self.settings.get('metaSwap')) rbSizerRow1.Add(self.rbBox3, 1, wx.ALL, 5) self.rbBox3.Bind(wx.EVT_RADIOBOX, self.OnSetting3Change) @@ -54,32 +54,27 @@ class PFContextMenuPref(PreferenceView): # Row 2 rbSizerRow2 = wx.BoxSizer(wx.HORIZONTAL) - self.rbBox4 = wx.RadioBox(panel, -1, "Variations", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) - self.rbBox4.SetSelection(self.settings.get('metaSwap')) + self.rbBox4 = wx.RadioBox(panel, -1, "Project onto Fit", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) + self.rbBox4.SetSelection(self.settings.get('project')) rbSizerRow2.Add(self.rbBox4, 1, wx.ALL, 5) self.rbBox4.Bind(wx.EVT_RADIOBOX, self.OnSetting4Change) - self.rbBox5 = wx.RadioBox(panel, -1, "Project onto Fit", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) - self.rbBox5.SetSelection(self.settings.get('project')) + self.rbBox5 = wx.RadioBox(panel, -1, "Fill with module", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) + self.rbBox5.SetSelection(self.settings.get('moduleFill')) rbSizerRow2.Add(self.rbBox5, 1, wx.ALL, 5) self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change) + self.rbBox6 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) + self.rbBox6.SetSelection(self.settings.get('spoolup')) + rbSizerRow2.Add(self.rbBox6, 1, wx.ALL, 5) + self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change) + mainSizer.Add(rbSizerRow2, 1, wx.ALL | wx.EXPAND, 0) # Row 3 - rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL) - - self.rbBox8 = wx.RadioBox(panel, -1, "Fill with module", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) - self.rbBox8.SetSelection(self.settings.get('moduleFill')) - rbSizerRow3.Add(self.rbBox8, 1, wx.ALL, 5) - self.rbBox8.Bind(wx.EVT_RADIOBOX, self.OnSetting8Change) - - self.rbBox9 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) - self.rbBox9.SetSelection(self.settings.get('spoolup')) - rbSizerRow3.Add(self.rbBox9, 1, wx.ALL, 5) - self.rbBox9.Bind(wx.EVT_RADIOBOX, self.OnSetting9Change) - - mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0) + # rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL) + # + # mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0) panel.SetSizer(mainSizer) panel.Layout() @@ -91,18 +86,15 @@ class PFContextMenuPref(PreferenceView): self.settings.set('changeAffectingSkills', event.GetInt()) def OnSetting3Change(self, event): - self.settings.set('factorReload', event.GetInt()) - - def OnSetting4Change(self, event): self.settings.set('metaSwap', event.GetInt()) - def OnSetting5Change(self, event): + def OnSetting4Change(self, event): self.settings.set('project', event.GetInt()) - def OnSetting8Change(self, event): + def OnSetting5Change(self, event): self.settings.set('moduleFill', event.GetInt()) - def OnSetting9Change(self, event): + def OnSetting6Change(self, event): self.settings.set('spoolup', event.GetInt()) def getImage(self): diff --git a/service/settings.py b/service/settings.py index 360d39493..cd05d1fa0 100644 --- a/service/settings.py +++ b/service/settings.py @@ -474,7 +474,6 @@ class ContextMenuSettings(object): "droneRemoveStack" : 1, "droneSplit" : 1, "droneStack" : 1, - "factorReload" : 1, "fighterAbilities" : 1, "implantSets" : 1, "itemStats" : 1,