Initial layout for print window

diff --git a/Cura/newui/mainWindow.py b/Cura/newui/mainWindow.py
index e1b1f8c1e86bf466f98da4e1f5918c63ca0f3e20..7ac31951af1bf23477be35c45f2450d38abd64d9 100644 (file)
--- a/Cura/newui/mainWindow.py
+++ b/Cura/newui/mainWindow.py
@@ -261,7 +261,13 @@ class mainWindow(configBase.configWindowBase):
                self.progressPanelList.append(spp)
        
        def OnPrint(self, e):
-               printWindow.printWindow()
+               if self.filename == None:
+                       wx.MessageBox('You need to load a file before you can print it.', 'Print error', wx.OK | wx.ICON_INFORMATION)
+                       return
+               if not os.path.exists(self.filename[: self.filename.rfind('.')] + "_export.gcode"):
+                       wx.MessageBox('You need to slice the file to GCode before you can print it.', 'Print error', wx.OK | wx.ICON_INFORMATION)
+                       return
+               printWindow.printFile(self.filename[: self.filename.rfind('.')] + "_export.gcode")
 
        def OnExpertOpen(self, e):
                acw = advancedConfig.advancedConfigWindow()

diff --git a/Cura/newui/printWindow.py b/Cura/newui/printWindow.py
index 9df9794aa8d79c467be297e723f8682bd237db55..7b28a45dba88fbf72611e5fac7052f5947b55269 100644 (file)
--- a/Cura/newui/printWindow.py
+++ b/Cura/newui/printWindow.py
@@ -17,14 +17,26 @@ class printWindow(wx.Frame):
        "Main user interface window"\r
        def __init__(self):\r
                super(printWindow, self).__init__(None, -1, title='Printing')\r
-               self.SetSizer(wx.GridBagSizer(2, 2))\r
+               self.SetSizer(wx.BoxSizer())\r
+               self.panel = wx.Panel(self)\r
+               self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)\r
+               self.sizer = wx.GridBagSizer(2, 2)\r
+               self.panel.SetSizer(self.sizer)\r
                \r
-               self.statsPanel = wx.Panel(self)\r
-               self.GetSizer().Add(self.statsPanel, pos=(0,0), span=(4,1), flag=wx.EXPAND)\r
+               sb = wx.StaticBox(self.panel, label="Statistics")\r
+               boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)\r
+               boxsizer.Add(wx.StaticText(self.panel, -1, "Filament: #.##m #.##g"), flag=wx.LEFT, border=5)\r
+               boxsizer.Add(wx.StaticText(self.panel, -1, "Print time: ##:##"), flag=wx.LEFT, border=5)\r
                \r
-               self.GetSizer().Add(wx.Button(self, -1, 'Test'), pos=(0,1))\r
-               self.GetSizer().Add(wx.Button(self, -1, 'Test'), pos=(1,1))\r
-               self.GetSizer().Add(wx.Button(self, -1, 'Test'), pos=(2,1))\r
+               self.sizer.Add(boxsizer, pos=(0,0), span=(4,1), flag=wx.EXPAND)\r
+               \r
+               self.sizer.Add(wx.Button(self.panel, -1, 'Connect'), pos=(0,1))\r
+               self.sizer.Add(wx.Button(self.panel, -1, 'Load GCode'), pos=(1,1))\r
+               self.sizer.Add(wx.Button(self.panel, -1, 'Print GCode'), pos=(2,1))\r
+               self.sizer.Add(wx.Button(self.panel, -1, 'Cancel print'), pos=(3,1))\r
+               self.sizer.Add(wx.Gauge(self.panel, -1), pos=(4,0), span=(1,2), flag=wx.EXPAND)\r
+               self.sizer.AddGrowableRow(3)\r
+               self.sizer.AddGrowableCol(0)\r
                \r
                self.Bind(wx.EVT_CLOSE, self.OnClose)\r
                \r