diff --git a/gui/builtinAdditionPanes/boosterView.py b/gui/builtinAdditionPanes/boosterView.py index 41bdfbafb..c74e088ac 100644 --- a/gui/builtinAdditionPanes/boosterView.py +++ b/gui/builtinAdditionPanes/boosterView.py @@ -124,7 +124,7 @@ class BoosterView(d.Display): if item != -1: self.EnsureVisible(item) - self.deselectItems() + self.unselectAll() self.update(self.boosters) event.Skip() diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py index e6ab56150..e4db9539d 100644 --- a/gui/builtinAdditionPanes/cargoView.py +++ b/gui/builtinAdditionPanes/cargoView.py @@ -158,7 +158,7 @@ class CargoView(d.Display): if item != -1: self.EnsureVisible(item) - self.deselectItems() + self.unselectAll() self.populate(self.cargo) self.refresh(self.cargo) diff --git a/gui/builtinAdditionPanes/commandView.py b/gui/builtinAdditionPanes/commandView.py index 5d67b490a..69f142118 100644 --- a/gui/builtinAdditionPanes/commandView.py +++ b/gui/builtinAdditionPanes/commandView.py @@ -156,7 +156,7 @@ class CommandView(d.Display): if item != -1: self.EnsureVisible(item) - self.deselectItems() + self.unselectAll() # todo: verify if not stuff: diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py index b63b71d54..7c88962be 100644 --- a/gui/builtinAdditionPanes/droneView.py +++ b/gui/builtinAdditionPanes/droneView.py @@ -211,7 +211,7 @@ class DroneView(Display): if item != -1: self.EnsureVisible(item) - self.deselectItems() + self.unselectAll() self.update(self.drones) event.Skip() diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py index 88ad7902d..a25f336c0 100644 --- a/gui/builtinAdditionPanes/fighterView.py +++ b/gui/builtinAdditionPanes/fighterView.py @@ -257,7 +257,7 @@ class FighterDisplay(d.Display): if item != -1: self.EnsureVisible(item) - self.deselectItems() + self.unselectAll() self.update(self.fighters) event.Skip() diff --git a/gui/builtinAdditionPanes/implantView.py b/gui/builtinAdditionPanes/implantView.py index 2d0c144b1..acd1357dc 100644 --- a/gui/builtinAdditionPanes/implantView.py +++ b/gui/builtinAdditionPanes/implantView.py @@ -174,7 +174,7 @@ class ImplantDisplay(d.Display): if item != -1: self.EnsureVisible(item) - self.deselectItems() + self.unselectAll() self.update(self.implants) event.Skip() diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py index b7917ef1a..5d3e9ce17 100644 --- a/gui/builtinAdditionPanes/projectedView.py +++ b/gui/builtinAdditionPanes/projectedView.py @@ -223,7 +223,7 @@ class ProjectedView(d.Display): if item != -1: self.EnsureVisible(item) - self.deselectItems() + self.unselectAll() if not stuff: stuff = [DummyEntry("Drag an item or fit, or use right-click menu for wormhole effects")] diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py index ee49a0909..387f43769 100644 --- a/gui/builtinMarketBrowser/itemView.py +++ b/gui/builtinMarketBrowser/itemView.py @@ -258,7 +258,7 @@ class ItemView(Display): sMkt = self.sMkt self.metalvls = sMkt.directAttrRequest(items, attrs) # Clear selection - self.deselectItems() + self.unselectAll() # Perform sorting, using item's meta levels besides other stuff items.sort(key=self.itemSort) # Mark current item list as active diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 0049e2ead..ef884cc34 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -164,7 +164,7 @@ class FittingView(d.Display): self.hoveredRow = None self.hoveredColumn = None - self.Bind(wx.EVT_KEY_UP, self.kbEvent) + self.Bind(wx.EVT_KEY_DOWN, self.kbEvent) self.Bind(wx.EVT_LEFT_DOWN, self.click) self.Bind(wx.EVT_RIGHT_DOWN, self.click) self.Bind(wx.EVT_MIDDLE_DOWN, self.click) @@ -255,7 +255,7 @@ class FittingView(d.Display): if mod not in fit.modules: return - self.deselectItems() + self.unselectAll() self.Select(srcRow, True) data = wx.TextDataObject() @@ -284,6 +284,8 @@ class FittingView(d.Display): def kbEvent(self, event): keycode = event.GetKeyCode() + if keycode == 65 and wx.GetMouseState().cmdDown: + self.selectAll() if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE: modules = [m for m in self.getSelectedMods() if not m.isEmpty] self.removeModule(modules) diff --git a/gui/display.py b/gui/display.py index 496a96cda..a34f92d3d 100644 --- a/gui/display.py +++ b/gui/display.py @@ -167,12 +167,16 @@ class Display(wx.ListCtrl): return lastFound - def deselectItems(self): + def unselectAll(self): sel = self.GetFirstSelected() while sel != -1: self.Select(sel, False) sel = self.GetNextSelected(sel) + def selectAll(self): + for row in range(self.GetItemCount()): + self.Select(row, True) + def populate(self, stuff): if stuff is not None: