From: daid303 <daid303@gmail.com>
Date: Wed, 10 Oct 2012 11:43:44 +0000 (+0200)
Subject: Add taskbar progress to both the project planner and normal slicing.
X-Git-Tag: 13.03~256
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7ad7ec687308073bc48bf23f790658cbc2628ac7;p=cura.git

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

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