From: Daid Date: Mon, 15 Oct 2012 10:35:14 +0000 (+0200) Subject: Fix layout of print window for MacOS X-Git-Tag: 13.03~247 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=eab76a45662e540e074d6e0e9d46704c618e9ac8;p=cura.git Fix layout of print window for MacOS --- diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py index 36926250..76f900e2 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -117,7 +117,7 @@ class printWindow(wx.Frame): self.statsText = wx.StaticText(self.panel, -1, "Filament: ####.##m #.##g\nEstimated print time: #####:##\nMachine state:\nDetecting baudrateXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") boxsizer.Add(self.statsText, flag=wx.LEFT, border=5) - self.sizer.Add(boxsizer, pos=(0,0), span=(6,1), flag=wx.EXPAND) + self.sizer.Add(boxsizer, pos=(0,0), span=(7,1), flag=wx.EXPAND) self.connectButton = wx.Button(self.panel, -1, 'Connect') #self.loadButton = wx.Button(self.panel, -1, 'Load') @@ -127,16 +127,16 @@ class printWindow(wx.Frame): self.machineLogButton = wx.Button(self.panel, -1, 'Error log') self.progress = wx.Gauge(self.panel, -1) - self.sizer.Add(self.connectButton, pos=(0,1)) - #self.sizer.Add(self.loadButton, pos=(1,1)) - self.sizer.Add(self.printButton, pos=(2,1)) - self.sizer.Add(self.pauseButton, pos=(3,1)) - self.sizer.Add(self.cancelButton, pos=(4,1)) - self.sizer.Add(self.machineLogButton, pos=(5,1)) - self.sizer.Add(self.progress, pos=(6,0), span=(1,7), flag=wx.EXPAND) + self.sizer.Add(self.connectButton, pos=(1,1), flag=wx.EXPAND) + #self.sizer.Add(self.loadButton, pos=(1,1), flag=wx.EXPAND) + self.sizer.Add(self.printButton, pos=(2,1), flag=wx.EXPAND) + self.sizer.Add(self.pauseButton, pos=(3,1), flag=wx.EXPAND) + self.sizer.Add(self.cancelButton, pos=(4,1), flag=wx.EXPAND) + self.sizer.Add(self.machineLogButton, pos=(5,1), flag=wx.EXPAND) + self.sizer.Add(self.progress, pos=(7,0), span=(1,7), flag=wx.EXPAND) nb = wx.Notebook(self.panel) - self.sizer.Add(nb, pos=(0,3), span=(6,4), flag=wx.EXPAND) + self.sizer.Add(nb, pos=(0,2), span=(7,4), flag=wx.EXPAND) self.temperaturePanel = wx.Panel(nb) sizer = wx.GridBagSizer(2, 2)