From: daid303 <daid303@gmail.com>
Date: Tue, 29 Jan 2013 08:38:46 +0000 (+0100)
Subject: Some small fixes suggested by Erik after testing.
X-Git-Tag: 13.03~68
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7f72193c613d818ba79ae047345eed6955480f3d;p=cura.git

Some small fixes suggested by Erik after testing.
---

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 5b007acd..8e2871ed 100644
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -294,11 +294,11 @@ class SelectParts(InfoPage):
 		self.AddText('To assist you in having better default settings for your Ultimaker\nCura would like to know which upgrades you have in your machine.')
 		self.AddSeperator()
 		self.springExtruder = self.AddCheckbox('Extruder drive upgrade')
-		self.heatedBed = self.AddCheckbox('Heated printer bed (self build)')
+		self.heatedBed = self.AddCheckbox('Heated printer bed (self built)')
 		self.dualExtrusion = self.AddCheckbox('Dual extrusion (experimental)')
 		self.AddSeperator()
-		self.AddText('If you have an Ultimaker bought after october 2012 you will have the\nExtruder drive upgrade. If you do not have this upgrade,\nit is highly recommended to improve reliablity.')
-		self.AddText('This upgrade can be bought from the Ultimaker webshop shop\nor found on thingiverse as thing:26094')
+		self.AddText('If you have an Ultimaker bought after october 2012 you will have the\nExtruder drive upgrade. If you do not have this upgrade,\nit is highly recommended to improve reliability.')
+		self.AddText('This upgrade can be bought from the Ultimaker webshop\nor found on thingiverse as thing:26094')
 		self.springExtruder.SetValue(True)
 
 	def StoreData(self):
@@ -859,6 +859,7 @@ class bedLevelWizardMain(InfoPage):
 		if self.comm.isOperational():
 			if self._wizardState == 0:
 				wx.CallAfter(self.infoBox.SetInfo, 'Homing printer...')
+				self.comm.sendCommand('M105')
 				self.comm.sendCommand('G28')
 				self._wizardState = 1
 			elif self._wizardState == 10 and not self.comm.isPrinting():
diff --git a/Cura/gui/pluginPanel.py b/Cura/gui/pluginPanel.py
index e816de8c..e665f14b 100644
--- a/Cura/gui/pluginPanel.py
+++ b/Cura/gui/pluginPanel.py
@@ -69,7 +69,7 @@ class pluginPanel(wx.Panel):
 		for pluginTest in self.pluginList:
 			if pluginTest['filename'] == pluginConfig['filename']:
 				plugin = pluginTest
-		if plugin == None:
+		if plugin is None:
 			return False
 		
 		pluginPanel = wx.Panel(self.pluginEnabledPanel)
@@ -127,6 +127,7 @@ class pluginPanel(wx.Panel):
 	
 	def OnAdd(self, e):
 		if self.listbox.GetSelection() < 0:
+			wx.MessageBox('You need to select a plugin before you can add anything.', 'Error: no plugin selected', wx.OK | wx.ICON_INFORMATION)
 			return
 		plugin = self.pluginList[self.listbox.GetSelection()]
 		newConfig = {'filename': plugin['filename'], 'params': {}}
diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 58db2535..ee1426db 100644
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -41,6 +41,19 @@ class glGuiPanel(glcanvas.GLCanvas):
 		self.OnMouseMotion(e)
 
 	def _OnGuiPaint(self, e):
+		h = self.GetSize().GetHeight()
+		w = self.GetSize().GetWidth()
+		if h / 3 > w / 4:
+			w = h * 4 / 3
+		if w < 64 * 10:
+			self._buttonSize = 48
+		elif w < 64 * 15:
+			self._buttonSize = 64
+		elif w < 64 * 20:
+			self._buttonSize = 80
+		else:
+			self._buttonSize = 96
+
 		dc = wx.PaintDC(self)
 		self.SetCurrent(self._context)
 		self.OnPaint(e)
diff --git a/package.sh b/package.sh
index 5f601ab4..cb1c1484 100755
--- a/package.sh
+++ b/package.sh
@@ -90,6 +90,8 @@ fi
 #############################
 
 if [ "$BUILD_TARGET" = "darwin" ]; then
+    TARGET_DIR=Cura-${BUILD_NAME}-MacOS
+
 	rm -rf scripts/darwin/build
 	rm -rf scripts/darwin/dist