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 dab0ea08991494b3eee539c48f7ae8d069b153d7..b08731a18ed97c246d82233d98362066876b777a 100644 (file)
--- 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 1782d1fe7f31b7a998dcb3b272ea6c5ed56907e3..3dccef6579d25c11f5f915654991f877dd4bd993 100644 (file)
--- 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: