Add taskbar progress to both the project planner and normal slicing.

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 5d8731f3d9980845171011edc4777110422119fc..4098b6843d45f98d5dd3b9875e804271eec51ee5 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -22,6 +22,7 @@ from gui import icon
 from gui import configBase\r
 from gui import printWindow\r
 from gui import dropTarget\r
+from gui import taskbar\r
 from util import validators\r
 from util import profile\r
 from util import util3d\r
@@ -931,6 +932,7 @@ class ProjectSliceProgressWindow(wx.Frame):
                progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000\r
                self.progressGauge.SetValue(int(progresValue))\r
                self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")\r
+               taskbar.setProgress(self, 10000 * self.progressGauge2.GetValue() + int(progresValue), 10000 * len(self.actionList))\r
        \r
        def OnRun(self):\r
                resultFile = open(self.resultFilename, "w")\r
@@ -1058,6 +1060,7 @@ class ProjectSliceProgressWindow(wx.Frame):
                self.Bind(wx.EVT_BUTTON, self.OnShowLog, self.logButton)\r
                self.Layout()\r
                self.Fit()\r
+               taskbar.setBusy(self, False)\r
 \r
        def OnCopyToSD(self, e):\r
                filename = os.path.basename(self.resultFilename)\r

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 9cc68431d5954c4810ec30a089686dacbe9a2433..238248e7f24ce4f51da82780c70d049cbca7c448 100644 (file)
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -3,6 +3,7 @@ import __init__
 
 import wx, sys, os, shutil, math, threading, subprocess, time, re
 
+from gui import taskbar
 from util import profile
 from util import sliceRun
 from util import exporer
@@ -112,6 +113,7 @@ class sliceProgessPanel(wx.Panel):
                self.abort = True
                if self.mainWindow.preview3d.loadReModelFiles(self.filelist):
                        self.mainWindow.preview3d.setViewMode("GCode")
+               taskbar.setBusy(self.GetParent(), False)
        
        def SetProgress(self, stepName, layer, maxLayer):
                if self.prevStep != stepName:
@@ -123,6 +125,7 @@ class sliceProgessPanel(wx.Panel):
                
                progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000
                self.progressGauge.SetValue(int(progresValue))
+               taskbar.setProgress(self.GetParent(), int(progresValue), self.progressGauge.GetRange())
                self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")
 
 class WorkerThread(threading.Thread):