From: daid <daid303@gmail.com>
Date: Mon, 23 Apr 2012 16:23:29 +0000 (+0200)
Subject: Remove menu from project planner, and replace it with toolbar buttons.
X-Git-Tag: RC3~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3645523074ecead961c36811c58ec1acd1f2d657;p=cura.git

Remove menu from project planner, and replace it with toolbar buttons.
---

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index f5340ee0..18027f67 100644
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -36,18 +36,6 @@ class projectPlanner(wx.Frame):
 		wx.EVT_CLOSE(self, self.OnClose)
 		#self.SetIcon(icon.getMainIcon())
 		
-		menubar = wx.MenuBar()
-		fileMenu = wx.Menu()
-		i = fileMenu.Append(-1, 'Open Project...')
-		self.Bind(wx.EVT_MENU, self.OnLoadProject, i)
-		i = fileMenu.Append(-1, 'Save Project...')
-		self.Bind(wx.EVT_MENU, self.OnSaveProject, i)
-		fileMenu.AppendSeparator()
-		i = fileMenu.Append(wx.ID_EXIT, 'Quit')
-		self.Bind(wx.EVT_MENU, self.OnQuit, i)
-		menubar.Append(fileMenu, '&File')
-		self.SetMenuBar(menubar)
-		
 		self.list = []
 		self.selection = None
 
@@ -57,9 +45,14 @@ class projectPlanner(wx.Frame):
 
 		self.toolbar = toolbarUtil.Toolbar(self)
 
+		toolbarUtil.NormalButton(self.toolbar, self.OnLoadProject, 'open.png', 'Open project')
+		toolbarUtil.NormalButton(self.toolbar, self.OnSaveProject, 'save.png', 'Save project')
+		self.toolbar.AddSeparator()
 		group = []
 		toolbarUtil.RadioButton(self.toolbar, group, 'object-3d-on.png', 'object-3d-off.png', '3D view', callback=self.On3DClick)
 		toolbarUtil.RadioButton(self.toolbar, group, 'object-top-on.png', 'object-top-off.png', 'Topdown view', callback=self.OnTopClick).SetValue(True)
+		self.toolbar.AddSeparator()
+		toolbarUtil.NormalButton(self.toolbar, self.OnQuit, 'exit.png', 'Close project planner')
 		
 		self.toolbar.Realize()
 		
diff --git a/Cura/images/exit.png b/Cura/images/exit.png
new file mode 100644
index 00000000..846776e3
Binary files /dev/null and b/Cura/images/exit.png differ
diff --git a/Cura/images/open.png b/Cura/images/open.png
new file mode 100644
index 00000000..32ec3edb
Binary files /dev/null and b/Cura/images/open.png differ
diff --git a/Cura/images/save.png b/Cura/images/save.png
new file mode 100644
index 00000000..8072aea3
Binary files /dev/null and b/Cura/images/save.png differ