From 19cdf497337cebf84dafa1a070d78e37cab38058 Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 20 Sep 2012 15:17:49 +0200 Subject: [PATCH] Add a tools menu for the project planner and the batch runner, makes them easier to find then filling up the file menu. --- Cura/gui/mainWindow.py | 24 ++++++++++++------------ Cura/gui/simpleMode.py | 11 ++++------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index f20b01b..6e75d07 100644 --- 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 c509265..b133fa1 100644 --- 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')