Enable retraction when selecting the UM2. Fix the reset-profile which clears out...

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 8b6b1b23cbaeada4e0f3e5df02d34b39a54a1575..16452b4604abdfd625afdd2b98b248f50fd723b0 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -345,6 +345,7 @@ class MachineSelectPage(InfoPage):
                        profile.putMachineSetting('has_heated_bed', 'True')
                        profile.putMachineSetting('gcode_flavor', 'UltiGCode')
                        profile.putProfileSetting('nozzle_size', '0.4')
+                       profile.putProfileSetting('retraction_enable', 'True')
                        profile.putMachineSetting('extruder_head_size_min_x', '40.0')
                        profile.putMachineSetting('extruder_head_size_min_y', '10.0')
                        profile.putMachineSetting('extruder_head_size_max_x', '60.0')
@@ -373,6 +374,7 @@ class MachineSelectPage(InfoPage):
                        profile.putMachineSetting('gcode_flavor', 'RepRap (Marlin/Sprinter)')
                        profile.putPreference('startMode', 'Normal')
                        profile.putProfileSetting('nozzle_size', '0.5')
+                       profile.putProfileSetting('retraction_enable', 'True')
                profile.checkAndUpdateMachineName()
                profile.putProfileSetting('wall_thickness', float(profile.getProfileSetting('nozzle_size')) * 2)
                if self.SubmitUserStats.GetValue():

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 077032088852e26a3750ac1075cec3322bc1b0ba..58075d888d088c50d108a95e8e75a70a0d37f9c6 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -503,7 +503,7 @@ def resetProfile():
        #Read a configuration file as global config
        global settingsList
        for set in settingsList:
-               if set.isPreference():
+               if not set.isProfile():
                        continue
                set.setValue(set.getDefault())
 
@@ -516,6 +516,7 @@ def resetProfile():
                putProfileSetting('retraction_enable', 'True')
        else:
                putProfileSetting('nozzle_size', '0.5')
+               putProfileSetting('retraction_enable', 'True')
 
 def setProfileFromString(options):
        options = base64.b64decode(options)