From 3645523074ecead961c36811c58ec1acd1f2d657 Mon Sep 17 00:00:00 2001 From: daid Date: Mon, 23 Apr 2012 18:23:29 +0200 Subject: [PATCH] Remove menu from project planner, and replace it with toolbar buttons. --- Cura/gui/projectPlanner.py | 17 +++++------------ Cura/images/exit.png | Bin 0 -> 713 bytes Cura/images/open.png | Bin 0 -> 423 bytes Cura/images/save.png | Bin 0 -> 563 bytes 4 files changed, 5 insertions(+), 12 deletions(-) create mode 100644 Cura/images/exit.png create mode 100644 Cura/images/open.png create mode 100644 Cura/images/save.png 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 0000000000000000000000000000000000000000..846776e3b6fa3a2454d2d515187b92af7bdbd6bc GIT binary patch literal 713 zcmV;)0yh1LP)x zK~y-)rISBTQ(+XwfA77wx2^qyrCgBM##pqXk%Z9?fPX@Qi3xy)zu%H%gf*2AR=|u+uQ%FS{2FVHe_wBAnWS| z$>s8r&E{ogB`1Z#jtmb!oCSh^+dy@9UuS0KBO@bE@caE()~;-9>?IY?<1oNf%9F_DqLoq!e=vv>Z6fOIRy-cZ zah#(80w)JDOIOv4Q4qoKc-R|CB+^J@WAtdiDe!q6C(yoAq$`!8Qqxql=EL-R=H_Mz z1dbih8vw7p-pO=4KL0Hin;(zGUIk23`FwujnGD6pkI+g{*xF*?*1*06t@ZCa@H8}B ziuCj}RkY@uVNl)Jpq5JEv2B7=Q`8KTYeV-*r!rWkb-;oJU=)kx>hv_)bt$_ps$9mb zRA74>yIN&Aa-2BOe!iVjakCy!c3s(8SU_uy4TSd^Ht@NlgY4})xT&wSI1Z6WWY5AM zfSV!@OpydoZh#Y?U@!p2VrM6rp&{CmXR)>B%!P}j(`f+0;gAQ=N<>gfnScopgewKh zntUs=bFZ~^#%OL{3VFS?P$;Zy+uqLS^IoNl)7k9L<;BG>PwR5vRVr~e93F2q%|Re~ vxDP0x1!x8Q>TsNuQZ^6*N+RO^E6%?FI@&7dg_Aem00000NkvXXu0mjfqn$fK literal 0 HcmV?d00001 diff --git a/Cura/images/open.png b/Cura/images/open.png new file mode 100644 index 0000000000000000000000000000000000000000..32ec3edbb8b361d6006b9c93f267a3e671f3bdfd GIT binary patch literal 423 zcmV;Y0a*TtP)MPJ)&0003-NklQjTj}UYT3`qz)w0g-cGii---RU4GwJxso zgJHgz@B7d9pBX8gN$syH2@MyXbbY6Ac5&*KN7Gc%Xy~Hf?@t_>riyeXwdJOlG))!B zLtqX}opXhr8QZ)#0F2E($M{%0&U-2QZ8mM~7a|bnPAthDNa;AR3Jj zi^Uy@A@F#Ob(3dSMh@ENdDiyI*k;3%&=-=q zKgf*VU=D`jSADwLwh;46e;f=mfB>Z7ECdJ}gax(*b{_`cAS}d}F+QMPuVa}5e1T;? zJGY*$5U@T>pyda6Hd<`v3Un%0p2Q1rh3ZMJ3FM_pc118dcfjTPar21(@&i}m%Qd94 RDM|nU002ovPDHLkV1nZ{t|b5f literal 0 HcmV?d00001 diff --git a/Cura/images/save.png b/Cura/images/save.png new file mode 100644 index 0000000000000000000000000000000000000000..8072aea3268164eb2028a0cebfe44da82b4f4aca GIT binary patch literal 563 zcmV-30?hr1P)XvKK@k7Ytwo{YB(9F? z;2_0Ku;{F~yQsL?!9iy?1;;|c4%SjZ%{70TwwHKcBH=J-%EN&+{;d zhN(E7P<- zOhP?!y}wyJm`;b*`kqJvqBiX|nL~L2fd*Ux1d!eYF6Tbg5P<9ZC&&uF5~UDVJ~Kya z$B9GKW9yGCk1)gXRIvtRXipPk@<6(R{ z10;&Qkze=csdPHpgO1qUX}3Wtm&>>~JBMXkI4Be#D>XTZ+DDB(A$cT#*xhj)kQiey zO%sM;K-YE1@`TY9(UZv}-m29|6TcYK$LKUNox!$kO4I`&Fl}aA7Py>1;e44jn~%EA z#v7jv1002ovPDHLkV1jI` B^11*3 literal 0 HcmV?d00001 -- 2.30.2