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

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

diff --git a/Cura/images/exit.png b/Cura/images/exit.png
new file mode 100644 (file)
index 0000000..846776e
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 (file)
index 0000000..32ec3ed
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 (file)
index 0000000..8072aea
Binary files /dev/null and b/Cura/images/save.png differ