From: daid <daid303@gmail.com>
Date: Thu, 13 Feb 2014 09:16:17 +0000 (+0100)
Subject: Update new version dialog. Remove ffmpeg.
X-Git-Tag: 14.02-RC1~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=47a57855ac0e82a1114eabe2b02a2a0b980be27c;p=cura.git

Update new version dialog. Remove ffmpeg.
---

diff --git a/Cura/gui/newVersionDialog.py b/Cura/gui/newVersionDialog.py
index d154d358..338ad299 100644
--- a/Cura/gui/newVersionDialog.py
+++ b/Cura/gui/newVersionDialog.py
@@ -28,6 +28,16 @@ class newVersionDialog(wx.Dialog):
 		s.Add(wx.StaticText(p, -1, 'New in this version:'))
 		s.Add(wx.StaticText(p, -1, '* Improved the LayerView rendering speed.'))
 		s.Add(wx.StaticText(p, -1, '* Made the LayerView update during slicing, so you can see the result before it is ready.'))
+		s.Add(wx.StaticText(p, -1, '* New USB printing dialog, smaller, cleaner.'))
+		s.Add(wx.StaticText(p, -1, '* Selectable USB printing dialogs, from plugins.'))
+		s.Add(wx.StaticText(p, -1, '* Selection between new grid or old line based support material.'))
+		s.Add(wx.StaticText(p, -1, '* Profile settings are now stored per machine instead of global for all machines.'))
+		s.Add(wx.StaticText(p, -1, '* Added TweakAtZ 3.1 plugin per default. Thanks to Steve Morlock, Ricardo Gomez and Stefan Heule.'))
+		s.Add(wx.StaticText(p, -1, '* Added separate speeds for outer and inner shells.'))
+		s.Add(wx.StaticText(p, -1, '* Added expert Z-Hop feature.'))
+		s.Add(wx.StaticText(p, -1, '* Removed need for temp files, which speeds up Cura on slower harddisks.'))
+		s.Add(wx.StaticText(p, -1, '* Added expert setting to configure support material angle.'))
+		s.Add(wx.StaticText(p, -1, '* Allow round printer beds for Deltabots.'))
 
 		self.hasUltimaker = None
 		self.hasUltimaker2 = None
diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 1870bef1..f2be8bf4 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -377,6 +377,7 @@ class SceneView(openglGui.glGuiPanel):
 	def OnViewChange(self):
 		if self.viewSelection.getValue() == 4:
 			self.viewMode = 'gcode'
+			self.tool = previewTools.toolNone(self)
 		elif self.viewSelection.getValue() == 1:
 			self.viewMode = 'overhang'
 		elif self.viewSelection.getValue() == 2:
diff --git a/package.sh b/package.sh
index 376446df..5a94a668 100755
--- a/package.sh
+++ b/package.sh
@@ -223,7 +223,7 @@ if [ $BUILD_TARGET = "win32" ]; then
 	downloadURL http://sourceforge.net/projects/pyopengl/files/PyOpenGL/3.0.1/PyOpenGL-3.0.1.win32.exe
 	downloadURL http://sourceforge.net/projects/numpy/files/NumPy/1.6.2/numpy-1.6.2-win32-superpack-python2.7.exe
 	downloadURL http://videocapture.sourceforge.net/VideoCapture-0.9-5.zip
-	downloadURL http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20120927-git-13f0cd6-win32-static.7z
+	#downloadURL http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20120927-git-13f0cd6-win32-static.7z
 	downloadURL http://sourceforge.net/projects/comtypes/files/comtypes/0.6.2/comtypes-0.6.2.win32.exe
 	downloadURL http://www.uwe-sieber.de/files/ejectmedia.zip
 	#Get the power module for python
@@ -249,8 +249,8 @@ if [ $BUILD_TARGET = "win32" ]; then
 	extract numpy-1.6.2-win32-superpack-python2.7.exe numpy-1.6.2-sse2.exe
 	extract numpy-1.6.2-sse2.exe PLATLIB
 	extract VideoCapture-0.9-5.zip VideoCapture-0.9-5/Python27/DLLs/vidcap.pyd
-	extract ffmpeg-20120927-git-13f0cd6-win32-static.7z ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe
-	extract ffmpeg-20120927-git-13f0cd6-win32-static.7z ffmpeg-20120927-git-13f0cd6-win32-static/licenses
+	#extract ffmpeg-20120927-git-13f0cd6-win32-static.7z ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe
+	#extract ffmpeg-20120927-git-13f0cd6-win32-static.7z ffmpeg-20120927-git-13f0cd6-win32-static/licenses
 	extract comtypes-0.6.2.win32.exe
 	extract ejectmedia.zip Win32
 
@@ -264,8 +264,8 @@ if [ $BUILD_TARGET = "win32" ]; then
 	mv PLATLIB/numpy ${TARGET_DIR}/python/Lib
 	mv Power/power ${TARGET_DIR}/python/Lib
 	mv VideoCapture-0.9-5/Python27/DLLs/vidcap.pyd ${TARGET_DIR}/python/DLLs
-	mv ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe ${TARGET_DIR}/Cura/
-	mv ffmpeg-20120927-git-13f0cd6-win32-static/licenses ${TARGET_DIR}/Cura/ffmpeg-licenses/
+	#mv ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe ${TARGET_DIR}/Cura/
+	#mv ffmpeg-20120927-git-13f0cd6-win32-static/licenses ${TARGET_DIR}/Cura/ffmpeg-licenses/
 	mv Win32/EjectMedia.exe ${TARGET_DIR}/Cura/
 	
 	rm -rf Power/
@@ -274,7 +274,7 @@ if [ $BUILD_TARGET = "win32" ]; then
 	rm -rf PLATLIB
 	rm -rf VideoCapture-0.9-5
 	rm -rf numpy-1.6.2-sse2.exe
-	rm -rf ffmpeg-20120927-git-13f0cd6-win32-static
+	#rm -rf ffmpeg-20120927-git-13f0cd6-win32-static
 
 	#Clean up portable python a bit, to keep the package size down.
 	rm -rf ${TARGET_DIR}/python/PyScripter.*