From a9070d83c9c3553420c3d23035557d38abfdd238 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 25 Jan 2012 13:57:09 +0400 Subject: [PATCH] Use cmdDown everywhere The same as ctrlDown on win and nix, but uses cmd on mac --- gui/builtinContextMenus/itemStats.py | 2 +- gui/builtinViews/fittingView.py | 6 +++--- gui/marketBrowser.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/builtinContextMenus/itemStats.py b/gui/builtinContextMenus/itemStats.py index dec776289..ccd9a3f17 100644 --- a/gui/builtinContextMenus/itemStats.py +++ b/gui/builtinContextMenus/itemStats.py @@ -30,7 +30,7 @@ class ItemStats(ContextMenu): mstate = wx.GetMouseState() reuse = False - if mstate.ControlDown() or mstate.CmdDown(): + if mstate.CmdDown(): reuse = True if self.mainFrame.GetActiveStatsWindow() == None and reuse: diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 00cafe131..b4a0d61fa 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -57,7 +57,7 @@ class FitSpawner(gui.multiSwitch.TabSpawner): if count <0: mstate = wx.GetMouseState() - if mstate.ControlDown() or mstate.MiddleDown(): + if mstate.CmdDown() or mstate.MiddleDown(): self.multiSwitch.AddPage() view = FittingView(self.multiSwitch) @@ -284,7 +284,7 @@ class FittingView(d.Display): def swapItems(self, x, y, itemID): mstate = wx.GetMouseState() - if mstate.CmdDown() or mstate.ControlDown(): + if mstate.CmdDown(): clone = True else: clone = False @@ -400,7 +400,7 @@ class FittingView(d.Display): sFit = service.Fit.getInstance() fitID = self.mainFrame.getActiveFit() - ctrl = wx.GetMouseState().ControlDown() + ctrl = wx.GetMouseState().CmdDown() click = "ctrl" if ctrl is True else "right" if event.Button == 3 else "left" sFit.toggleModulesState(fitID, self.mods[self.GetItemData(row)], mods, click) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit())) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index a979e275b..46da6ed12 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -75,7 +75,7 @@ class MarketBrowser(wx.Panel): def toggleMetaButton(self, event): """Process clicks on toggle buttons""" - ctrl = wx.GetMouseState().ControlDown() + ctrl = wx.GetMouseState().CmdDown() ebtn = event.EventObject if not ctrl: for btn in self.metaButtons: