Fixes #94
Toolbars in wx.Frame won't show buttons. They do show when a toolbar is added to a panel.master
parent
5e8630891a
commit
3c0f3b87e0
|
@ -164,7 +164,8 @@ class projectPlanner(wx.Frame):
|
||||||
util3d.Vector3(profile.getPreferenceFloat('extruder_offset_x2'), profile.getPreferenceFloat('extruder_offset_y2'), 0),
|
util3d.Vector3(profile.getPreferenceFloat('extruder_offset_x2'), profile.getPreferenceFloat('extruder_offset_y2'), 0),
|
||||||
util3d.Vector3(profile.getPreferenceFloat('extruder_offset_x3'), profile.getPreferenceFloat('extruder_offset_y3'), 0)]
|
util3d.Vector3(profile.getPreferenceFloat('extruder_offset_x3'), profile.getPreferenceFloat('extruder_offset_y3'), 0)]
|
||||||
|
|
||||||
self.toolbar = toolbarUtil.Toolbar(self)
|
self.toolbarPanel = wx.Panel(self, -1)
|
||||||
|
self.toolbar = toolbarUtil.Toolbar(self.toolbarPanel)
|
||||||
|
|
||||||
toolbarUtil.NormalButton(self.toolbar, self.OnLoadProject, 'open.png', 'Open project')
|
toolbarUtil.NormalButton(self.toolbar, self.OnLoadProject, 'open.png', 'Open project')
|
||||||
toolbarUtil.NormalButton(self.toolbar, self.OnSaveProject, 'save.png', 'Save project')
|
toolbarUtil.NormalButton(self.toolbar, self.OnSaveProject, 'save.png', 'Save project')
|
||||||
|
@ -179,7 +180,8 @@ class projectPlanner(wx.Frame):
|
||||||
|
|
||||||
self.toolbar.Realize()
|
self.toolbar.Realize()
|
||||||
|
|
||||||
self.toolbar2 = toolbarUtil.Toolbar(self)
|
self.toolbar2Panel = wx.Panel(self, -1)
|
||||||
|
self.toolbar2 = toolbarUtil.Toolbar(self.toolbar2Panel)
|
||||||
toolbarUtil.NormalButton(self.toolbar2, self.OnAddModel, 'object-add.png', 'Add model')
|
toolbarUtil.NormalButton(self.toolbar2, self.OnAddModel, 'object-add.png', 'Add model')
|
||||||
toolbarUtil.NormalButton(self.toolbar2, self.OnRemModel, 'object-remove.png', 'Remove model')
|
toolbarUtil.NormalButton(self.toolbar2, self.OnRemModel, 'object-remove.png', 'Remove model')
|
||||||
self.toolbar2.AddSeparator()
|
self.toolbar2.AddSeparator()
|
||||||
|
@ -201,8 +203,8 @@ class projectPlanner(wx.Frame):
|
||||||
self.sliceButton = wx.Button(self, -1, "Slice")
|
self.sliceButton = wx.Button(self, -1, "Slice")
|
||||||
self.autoPlaceButton = wx.Button(self, -1, "Auto Place")
|
self.autoPlaceButton = wx.Button(self, -1, "Auto Place")
|
||||||
|
|
||||||
sizer.Add(self.toolbar, (0,0), span=(1,1), flag=wx.EXPAND)
|
sizer.Add(self.toolbarPanel, (0,0), span=(1,1), flag=wx.EXPAND|wx.TOP|wx.LEFT|wx.RIGHT)
|
||||||
sizer.Add(self.toolbar2, (0,1), span=(1,2), flag=wx.EXPAND)
|
sizer.Add(self.toolbar2Panel, (0,1), span=(1,2), flag=wx.EXPAND|wx.TOP|wx.LEFT|wx.RIGHT)
|
||||||
sizer.Add(self.preview, (1,0), span=(4,1), flag=wx.EXPAND)
|
sizer.Add(self.preview, (1,0), span=(4,1), flag=wx.EXPAND)
|
||||||
sizer.Add(self.listbox, (1,1), span=(1,2), flag=wx.EXPAND)
|
sizer.Add(self.listbox, (1,1), span=(1,2), flag=wx.EXPAND)
|
||||||
sizer.Add(self.addButton, (2,1), span=(1,1))
|
sizer.Add(self.addButton, (2,1), span=(1,1))
|
||||||
|
|
Loading…
Reference in New Issue