Added print and exporer open button to Project planner. No GCode viewer yet.

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 9aaba3d74dd53de22bfae8ab09bc12b6e6b13c05..3d0e44bc948f2ab64b593be588ed6b956936f236 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -21,11 +21,13 @@ from gui import toolbarUtil
 from gui import icon\r
 from gui import configBase\r
 from gui import validators\r
+from gui import printWindow\r
 from util import profile\r
 from util import util3d\r
 from util import stl\r
 from util import sliceRun\r
 from util import gcodeInterpreter\r
+from util import exporer\r
 \r
 class Action(object):\r
        pass\r
@@ -770,11 +772,11 @@ class ProjectSliceProgressWindow(wx.Frame):
                self.progressGauge2 = wx.Gauge(self, -1)\r
                self.progressGauge2.SetRange(len(self.actionList))\r
                self.abortButton = wx.Button(self, -1, "Abort")\r
-               self.sizer.Add(self.statusText, (0,0))\r
-               self.sizer.Add(self.progressGauge, (1, 0), flag=wx.EXPAND)\r
-               self.sizer.Add(self.progressGauge2, (2, 0), flag=wx.EXPAND)\r
+               self.sizer.Add(self.statusText, (0,0), span=(1,3))\r
+               self.sizer.Add(self.progressGauge, (1, 0), span=(1,3), flag=wx.EXPAND)\r
+               self.sizer.Add(self.progressGauge2, (2, 0), span=(1,3), flag=wx.EXPAND)\r
 \r
-               self.sizer.Add(self.abortButton, (3,0), flag=wx.ALIGN_CENTER)\r
+               self.sizer.Add(self.abortButton, (3,0), span=(1,3), flag=wx.ALIGN_CENTER)\r
                self.sizer.AddGrowableCol(0)\r
                self.sizer.AddGrowableRow(0)\r
 \r
@@ -879,9 +881,28 @@ class ProjectSliceProgressWindow(wx.Frame):
                if cost != False:\r
                        status += "\nCost: %s" % (cost)\r
                wx.CallAfter(self.statusText.SetLabel, status)\r
-               wx.CallAfter(self.abortButton.SetLabel, 'Close')\r
-               wx.CallAfter(self.Layout)\r
-               wx.CallAfter(self.Fit)\r
+               wx.CallAfter(self.OnSliceDone)\r
+       \r
+       def OnSliceDone(self):\r
+               self.abortButton.Destroy()\r
+               self.closeButton = wx.Button(self, -1, "Close")\r
+               self.printButton = wx.Button(self, -1, "Print")\r
+               self.sizer.Add(self.closeButton, (3,0), span=(1,1))\r
+               self.sizer.Add(self.printButton, (3,1), span=(1,1))\r
+               if exporer.hasExporer():\r
+                       self.openFileLocationButton = wx.Button(self, -1, "Open file location")\r
+                       self.Bind(wx.EVT_BUTTON, self.OnOpenFileLocation, self.openFileLocationButton)\r
+                       self.sizer.Add(self.openFileLocationButton, (3,2), span=(1,1))\r
+               self.Bind(wx.EVT_BUTTON, self.OnAbort, self.closeButton)\r
+               self.Bind(wx.EVT_BUTTON, self.OnPrint, self.printButton)\r
+               self.Layout()\r
+               self.Fit()\r
+\r
+       def OnOpenFileLocation(self, e):\r
+               exporer.openExporer(self.resultFilename)\r
+       \r
+       def OnPrint(self, e):\r
+               printWindow.printFile(self.resultFilename)\r
 \r
 class preferencesDialog(configBase.configWindowBase):\r
        def __init__(self, parent):\r