From: daid303 <daid303@gmail.com>
Date: Mon, 29 Oct 2012 09:18:12 +0000 (+0100)
Subject: Better way to add shortcut keys so they show on the Mac.
X-Git-Tag: 13.03~227
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=783515e60e0bc187fb221fc576ee3b81c036aa5f;p=cura.git

Better way to add shortcut keys so they show on the Mac.
---

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 7f1b11d4..f4a6b8fe 100644
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -59,8 +59,13 @@ class mainWindow(configBase.configWindowBase):
 		
 		menubar = wx.MenuBar()
 		fileMenu = wx.Menu()
-		i = fileMenu.Append(-1, 'Load model file...')
+		i = fileMenu.Append(-1, 'Load model file...\tCTRL+L')
 		self.Bind(wx.EVT_MENU, lambda e: self._showModelLoadDialog(1), i)
+		i = fileMenu.Append(-1, 'Prepare print...\tCTRL+R')
+		self.Bind(wx.EVT_MENU, self.OnSlice, i)
+		i = fileMenu.Append(-1, 'Print...\tCTRL+P')
+		self.Bind(wx.EVT_MENU, self.OnPrint, i)
+
 		fileMenu.AppendSeparator()
 		i = fileMenu.Append(-1, 'Open Profile...')
 		self.Bind(wx.EVT_MENU, self.OnLoadProfile, i)
@@ -293,11 +298,6 @@ class mainWindow(configBase.configWindowBase):
 		self.updateProfileToControls()
 
 		self.SetBackgroundColour(nb.GetBackgroundColour())
-
-		self.SetAcceleratorTable(wx.AcceleratorTable([(wx.ACCEL_CTRL, ord('L'), loadButton.GetId()),
-													  (wx.ACCEL_CTRL, ord('R'), sliceButton.GetId()),
-													  (wx.ACCEL_CTRL, ord('P'), printButton.GetId())
-													 ]))
 		
 		self.Fit()
 		if wx.Display().GetClientArea().GetWidth() < self.GetSize().GetWidth():
diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index e382ba67..1c25d957 100644
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -30,8 +30,12 @@ class simpleModeWindow(configBase.configWindowBase):
 		
 		menubar = wx.MenuBar()
 		fileMenu = wx.Menu()
-		i = fileMenu.Append(-1, 'Load model file...')
+		i = fileMenu.Append(-1, 'Load model file...\tCTRL+L')
 		self.Bind(wx.EVT_MENU, self.OnLoadModel, i)
+		i = fileMenu.Append(-1, 'Prepare print...\tCTRL+R')
+		self.Bind(wx.EVT_MENU, self.OnSlice, i)
+		i = fileMenu.Append(-1, 'Print...\tCTRL+P')
+		self.Bind(wx.EVT_MENU, self.OnPrint, i)
 		fileMenu.AppendSeparator()
 		i = fileMenu.Append(-1, 'Preferences...')
 		self.Bind(wx.EVT_MENU, self.OnPreferences, i)
@@ -137,11 +141,6 @@ class simpleModeWindow(configBase.configWindowBase):
 		self.printTypeNormal.SetValue(True)
 		self.printMaterialPLA.SetValue(True)
 
-		self.SetAcceleratorTable(wx.AcceleratorTable([(wx.ACCEL_CTRL, ord('L'), loadButton.GetId()),
-													  (wx.ACCEL_CTRL, ord('R'), sliceButton.GetId()),
-													  (wx.ACCEL_CTRL, ord('P'), printButton.GetId())
-													 ]))
-
 		self.Fit()
 		self.preview3d.Fit()
 		self.SetMinSize(self.GetSize())