From: daid303 <daid303@gmail.com>
Date: Tue, 4 Dec 2012 07:59:06 +0000 (+0100)
Subject: Improve the first run wizard with the communication error log, and add info buttons... 
X-Git-Tag: 13.03~183
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=95a120b412b7d1bf8862c32a2ee7ba7ad90e72c3;p=cura.git

Improve the first run wizard with the communication error log, and add info buttons to the Ultimaker wiki when steps fail.
---

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index a1fcdc32..e62e1b60 100644
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -98,14 +98,14 @@ class previewPanel(wx.Panel):
 		self.toolbar2 = toolbarUtil.Toolbar(self)
 
 		# Mirror
-		self.mirrorX = toolbarUtil.ToggleButton(self.toolbar2, 'flip_x', 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Mirror X', callback=self.updateModelTransform)
-		self.mirrorY = toolbarUtil.ToggleButton(self.toolbar2, 'flip_y', 'object-mirror-y-on.png', 'object-mirror-y-off.png', 'Mirror Y', callback=self.updateModelTransform)
-		self.mirrorZ = toolbarUtil.ToggleButton(self.toolbar2, 'flip_z', 'object-mirror-z-on.png', 'object-mirror-z-off.png', 'Mirror Z', callback=self.updateModelTransform)
+		self.mirrorX = toolbarUtil.ToggleButton(self.toolbar2, 'flip_x', 'object-mirror-x-on.png', 'object-mirror-x-off.png', 'Mirror X', callback=self.returnToNormalViewAndUpdateModel)
+		self.mirrorY = toolbarUtil.ToggleButton(self.toolbar2, 'flip_y', 'object-mirror-y-on.png', 'object-mirror-y-off.png', 'Mirror Y', callback=self.returnToNormalViewAndUpdateModel)
+		self.mirrorZ = toolbarUtil.ToggleButton(self.toolbar2, 'flip_z', 'object-mirror-z-on.png', 'object-mirror-z-off.png', 'Mirror Z', callback=self.returnToNormalViewAndUpdateModel)
 		self.toolbar2.AddSeparator()
 
 		# Swap
-		self.swapXZ = toolbarUtil.ToggleButton(self.toolbar2, 'swap_xz', 'object-swap-xz-on.png', 'object-swap-xz-off.png', 'Swap XZ', callback=self.updateModelTransform)
-		self.swapYZ = toolbarUtil.ToggleButton(self.toolbar2, 'swap_yz', 'object-swap-yz-on.png', 'object-swap-yz-off.png', 'Swap YZ', callback=self.updateModelTransform)
+		self.swapXZ = toolbarUtil.ToggleButton(self.toolbar2, 'swap_xz', 'object-swap-xz-on.png', 'object-swap-xz-off.png', 'Swap XZ', callback=self.returnToNormalViewAndUpdateModel)
+		self.swapYZ = toolbarUtil.ToggleButton(self.toolbar2, 'swap_yz', 'object-swap-yz-on.png', 'object-swap-yz-off.png', 'Swap YZ', callback=self.returnToNormalViewAndUpdateModel)
 		self.toolbar2.AddSeparator()
 
 		# Scale
@@ -140,6 +140,10 @@ class previewPanel(wx.Panel):
 		sizer.Add(self.toolbar2, 0, flag=wx.EXPAND|wx.BOTTOM|wx.LEFT|wx.RIGHT, border=1)
 		self.SetSizer(sizer)
 	
+	def returnToNormalViewAndUpdateModel(self):
+		self.normalViewButton.SetValue(True)
+		self.updateModelTransform()
+	
 	def OnMove(self, e = None):
 		if e != None:
 			e.Skip()