dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Do not remove items on Del key used with modifier keys

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-29 00:02:29 +03:00
parent 8b75b5f184
commit cb7f0052c4
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinAdditionPanes/boosterView.py
View File

@@ -93,7 +93,7 @@ class BoosterView(d.Display):
self.unselectAll()
elif keycode == 65 and mstate.GetModifiers() == wx.MOD_CONTROL:
self.selectAll()
elif keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
elif keycode in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and mstate.GetModifiers() == wx.MOD_NONE:
boosters = self.getSelectedBoosters()
self.removeBoosters(boosters)
event.Skip()

2
gui/builtinAdditionPanes/cargoView.py
View File

@@ -109,7 +109,7 @@ class CargoView(d.Display):
self.unselectAll()
elif keycode == 65 and mstate.GetModifiers() == wx.MOD_CONTROL:
self.selectAll()
elif keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
elif keycode in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and mstate.GetModifiers() == wx.MOD_NONE:
cargos = self.getSelectedCargos()
self.removeCargos(cargos)
event.Skip()

2
gui/builtinAdditionPanes/commandView.py
View File

@@ -101,7 +101,7 @@ class CommandView(d.Display):
self.unselectAll()
elif keycode == 65 and mstate.GetModifiers() == wx.MOD_CONTROL:
self.selectAll()
elif keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
elif keycode in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and mstate.GetModifiers() == wx.MOD_NONE:
commandFits = self.getSelectedCommandFits()
self.removeCommandFits(commandFits)
event.Skip()

2
gui/builtinAdditionPanes/droneView.py
View File

@@ -125,7 +125,7 @@ class DroneView(Display):
self.unselectAll()
elif keycode == 65 and mstate.GetModifiers() == wx.MOD_CONTROL:
self.selectAll()
elif keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
elif keycode in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and mstate.GetModifiers() == wx.MOD_NONE:
drones = self.getSelectedDrones()
self.removeDroneStacks(drones)
event.Skip()

2
gui/builtinAdditionPanes/fighterView.py
View File

@@ -188,7 +188,7 @@ class FighterDisplay(d.Display):
self.unselectAll()
elif keycode == 65 and mstate.GetModifiers() == wx.MOD_CONTROL:
self.selectAll()
elif keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
elif keycode in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and mstate.GetModifiers() == wx.MOD_NONE:
fighters = self.getSelectedFighters()
self.removeFighters(fighters)
event.Skip()

2
gui/builtinAdditionPanes/implantView.py
View File

@@ -145,7 +145,7 @@ class ImplantDisplay(d.Display):
self.unselectAll()
elif keycode == 65 and mstate.GetModifiers() == wx.MOD_CONTROL:
self.selectAll()
elif keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
elif keycode in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and mstate.GetModifiers() == wx.MOD_NONE:
implants = self.getSelectedImplants()
self.removeImplants(implants)
event.Skip()

2
gui/builtinViews/fittingView.py
View File

@@ -285,7 +285,7 @@ class FittingView(d.Display):
self.unselectAll()
elif keycode == 65 and mstate.GetModifiers() == wx.MOD_CONTROL:
self.selectAll()
elif keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
elif keycode in (wx.WXK_DELETE, wx.WXK_NUMPAD_DELETE) and mstate.GetModifiers() == wx.MOD_NONE:
modules = [m for m in self.getSelectedMods() if not m.isEmpty]
self.removeModule(modules)
event.Skip()