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 7f1b11d4d95754092c039ba611218cc7b0be523a..f4a6b8fe76561f05978f463b3b4b60f5f51e691d 100644 (file)
--- 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 e382ba67cebea4c23282b3cbd55e7a60ecb85e43..1c25d95746e7ec0a3c10ea27d4abbf3726d9ba7b 100644 (file)
--- 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())