From: daid303 <daid303@gmail.com>
Date: Thu, 21 Mar 2013 08:43:13 +0000 (+0100)
Subject: Remove the default Estep value bug. Add enter to the number entery gl control.
X-Git-Tag: 13.05~64^2~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=135268ce5edff50e6554de294e520b5a0ec756be;p=cura.git

Remove the default Estep value bug. Add enter to the number entery gl control.
---

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index dab0ea08..b08731a1 100644
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -602,8 +602,8 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
 	def __init__(self, parent):
 		super(UltimakerCalibrateStepsPerEPage, self).__init__(parent, "Ultimaker Calibration")
 
-		if profile.getPreference('steps_per_e') == '0':
-			profile.putPreference('steps_per_e', '865.888')
+		#if profile.getPreference('steps_per_e') == '0':
+		#	profile.putPreference('steps_per_e', '865.888')
 
 		self.AddText("Calibrating the Steps Per E requires some manual actions.")
 		self.AddText("First remove any filament from your machine.")
diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 1782d1fe..3dccef65 100644
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -825,7 +825,7 @@ class glNumberCtrl(glGuiControl):
 		if c == wx.WXK_DELETE:
 			self._value = self._value[0:self._selectPos] + self._value[self._selectPos + 1:]
 			self._callback(self._value)
-		if c == wx.WXK_TAB:
+		if c == wx.WXK_TAB or c == wx.WXK_NUMPAD_ENTER or c == wx.WXK_RETURN:
 			if wx.GetKeyState(wx.WXK_SHIFT):
 				self.focusPrevious()
 			else: