diff --git a/gui/builtinContextMenus/fighterAbilities.py b/gui/builtinContextMenus/fighterAbilities.py index fbe811c66..670f0960a 100644 --- a/gui/builtinContextMenus/fighterAbilities.py +++ b/gui/builtinContextMenus/fighterAbilities.py @@ -69,7 +69,7 @@ class FighterAbilities(ContextMenuCombined): command = cmd.GuiToggleLocalFighterAbilityStateCommand if self.fighter in container: mainPosition = container.index(self.fighter) - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): fighters = getSimilarFighters(container, self.fighter) else: fighters = self.selection diff --git a/gui/builtinContextMenus/itemProjectionRange.py b/gui/builtinContextMenus/itemProjectionRange.py index bcf3a8118..987eaee03 100644 --- a/gui/builtinContextMenus/itemProjectionRange.py +++ b/gui/builtinContextMenus/itemProjectionRange.py @@ -55,7 +55,7 @@ class ChangeItemProjectionRange(ContextMenuCombined): fitID = self.mainFrame.getActiveFit() items = selection - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): if isinstance(mainItem, EosModule): fit = Fit.getInstance().getFit(fitID) positions = getSimilarModPositions(fit.projectedModules, mainItem) diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py index 2417ad302..58fd621bd 100644 --- a/gui/builtinContextMenus/itemRemove.py +++ b/gui/builtinContextMenus/itemRemove.py @@ -65,7 +65,7 @@ class RemoveItem(ContextMenuCombined): def __handleModule(self, callingWindow, mainItem, selection): fitID = self.mainFrame.getActiveFit() fit = Fit.getInstance().getFit(fitID) - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): positions = getSimilarModPositions(fit.modules, mainItem) else: positions = [] @@ -88,7 +88,7 @@ class RemoveItem(ContextMenuCombined): def __handleFighter(self, callingWindow, mainItem, selection): fitID = self.mainFrame.getActiveFit() fit = Fit.getInstance().getFit(fitID) - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): fighters = getSimilarFighters(fit.fighters, mainItem) else: fighters = selection @@ -131,7 +131,7 @@ class RemoveItem(ContextMenuCombined): self.mainFrame.command.Submit(cmd.GuiRemoveProjectedItemsCommand( fitID=fitID, items=selection, amount=math.inf)) elif isinstance(mainItem, EosModule): - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): fit = Fit.getInstance().getFit(fitID) positions = getSimilarModPositions(fit.projectedModules, mainItem) items = [fit.projectedModules[p] for p in positions] @@ -143,7 +143,7 @@ class RemoveItem(ContextMenuCombined): self.mainFrame.command.Submit(cmd.GuiRemoveProjectedItemsCommand( fitID=fitID, items=selection, amount=math.inf)) elif isinstance(mainItem, EosFighter): - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): fit = Fit.getInstance().getFit(fitID) items = getSimilarFighters(fit.projectedFighters, mainItem) else: diff --git a/gui/builtinContextMenus/itemVariationChange.py b/gui/builtinContextMenus/itemVariationChange.py index e09623367..026876e64 100644 --- a/gui/builtinContextMenus/itemVariationChange.py +++ b/gui/builtinContextMenus/itemVariationChange.py @@ -154,7 +154,7 @@ class ChangeItemToVariation(ContextMenuCombined): def __handleModule(self, varItem): fitID = self.mainFrame.getActiveFit() fit = Fit.getInstance().getFit(fitID) - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): positions = getSimilarModPositions(fit.modules, self.mainItem) else: sMkt = Market.getInstance() @@ -193,7 +193,7 @@ class ChangeItemToVariation(ContextMenuCombined): def __handleFighter(self, varItem): fitID = self.mainFrame.getActiveFit() fit = Fit.getInstance().getFit(fitID) - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): fighters = getSimilarFighters(fit.fighters, self.mainItem) else: fighters = self.selection @@ -246,7 +246,7 @@ class ChangeItemToVariation(ContextMenuCombined): def __handleProjectedModule(self, varItem): fitID = self.mainFrame.getActiveFit() fit = Fit.getInstance().getFit(fitID) - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): positions = getSimilarModPositions(fit.projectedModules, self.mainItem) else: sMkt = Market.getInstance() @@ -283,7 +283,7 @@ class ChangeItemToVariation(ContextMenuCombined): def __handleProjectedFighter(self, varItem): fitID = self.mainFrame.getActiveFit() fit = Fit.getInstance().getFit(fitID) - if wx.GetMouseState().GetModifiers() == wx.MOD_ALT: + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): fighters = getSimilarFighters(fit.projectedFighters, self.mainItem) else: fighters = self.selection