Add a tools menu for the project planner and the batch runner, makes them easier...

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index f20b01b4b26439e7da5e68a346f2c72470efed6f..6e75d07681500e37bf195a13adf98ad1552e1017 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -61,28 +61,28 @@ class mainWindow(configBase.configWindowBase):
                i = fileMenu.Append(-1, 'Reset Profile to default')
                self.Bind(wx.EVT_MENU, self.OnResetProfile, i)
                fileMenu.AppendSeparator()
-               i = fileMenu.Append(-1, 'Batch run...')
-               self.Bind(wx.EVT_MENU, self.OnBatchRun, i)
                i = fileMenu.Append(-1, 'Preferences...')
                self.Bind(wx.EVT_MENU, self.OnPreferences, i)
                fileMenu.AppendSeparator()
-               i = fileMenu.Append(-1, 'Open project planner...')
-               self.Bind(wx.EVT_MENU, self.OnProjectPlanner, i)
-               fileMenu.AppendSeparator()
                i = fileMenu.Append(wx.ID_EXIT, 'Quit')
                self.Bind(wx.EVT_MENU, self.OnQuit, i)
                menubar.Append(fileMenu, '&File')
-               
-               simpleMenu = wx.Menu()
-               i = simpleMenu.Append(-1, 'Switch to Quickprint...')
+
+               toolsMenu = wx.Menu()
+               i = toolsMenu.Append(-1, 'Switch to Quickprint...')
                self.Bind(wx.EVT_MENU, self.OnSimpleSwitch, i)
-               menubar.Append(simpleMenu, 'Simple')
+               toolsMenu.AppendSeparator()
+               i = toolsMenu.Append(-1, 'Batch run...')
+               self.Bind(wx.EVT_MENU, self.OnBatchRun, i)
+               i = toolsMenu.Append(-1, 'Project planner...')
+               self.Bind(wx.EVT_MENU, self.OnProjectPlanner, i)
+#              i = toolsMenu.Append(-1, 'Open SVG (2D) slicer...')
+#              self.Bind(wx.EVT_MENU, self.OnSVGSlicerOpen, i)
+               menubar.Append(toolsMenu, 'Tools')
                
                expertMenu = wx.Menu()
                i = expertMenu.Append(-1, 'Open expert settings...')
                self.Bind(wx.EVT_MENU, self.OnExpertOpen, i)
-#              i = expertMenu.Append(-1, 'Open SVG (2D) slicer...')
-#              self.Bind(wx.EVT_MENU, self.OnSVGSlicerOpen, i)
                expertMenu.AppendSeparator()
                i = expertMenu.Append(-1, 'Install default Marlin firmware')
                self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, i)
@@ -95,7 +95,7 @@ class mainWindow(configBase.configWindowBase):
                
                helpMenu = wx.Menu()
                i = helpMenu.Append(-1, 'Online documentation...')
-               self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://github.com/daid/Cura/wiki'), i)
+               self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://daid.github.com/Cura'), i)
                i = helpMenu.Append(-1, 'Report a problem...')
                self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://github.com/daid/Cura/issues'), i)
                menubar.Append(helpMenu, 'Help')

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index c509265703d3b6de5269d433fb9114aa87b10338..b133fa1af665665a66f8f97115f9f76ff5ebcf79 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -36,17 +36,14 @@ class simpleModeWindow(configBase.configWindowBase):
                self.Bind(wx.EVT_MENU, self.OnQuit, i)
                menubar.Append(fileMenu, '&File')
                
-               expertMenu = wx.Menu()
-               i = expertMenu.Append(-1, 'Switch to Normal mode...')
+               toolsMenu = wx.Menu()
+               i = toolsMenu.Append(-1, 'Switch to Normal mode...')
                self.Bind(wx.EVT_MENU, self.OnNormalSwitch, i)
-               expertMenu.AppendSeparator()
-               i = expertMenu.Append(-1, 'ReRun first run wizard...')
-               self.Bind(wx.EVT_MENU, self.OnFirstRunWizard, i)
-               menubar.Append(expertMenu, 'Expert')
+               menubar.Append(toolsMenu, 'Tools')
                
                helpMenu = wx.Menu()
                i = helpMenu.Append(-1, 'Online documentation...')
-               self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://github.com/daid/Cura/wiki'), i)
+               self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://daid.github.com/Cura'), i)
                i = helpMenu.Append(-1, 'Report a problem...')
                self.Bind(wx.EVT_MENU, lambda e: webbrowser.open('https://github.com/daid/Cura/issues'), i)
                menubar.Append(helpMenu, 'Help')