Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index e1bf8934a1d4c7dc401a8515b943420bde79e450..97a871f2ba1de1404d6627af5b6662f8186f95ff 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -355,6 +355,18 @@ class mainWindow(wx.Frame):
                self.normalSettingsPanel.updateProfileToControls()
                self.simpleSettingsPanel.updateProfileToControls()
 
+       def reloadSettingPanels(self):
+               self.leftSizer.Detach(self.simpleSettingsPanel)
+               self.leftSizer.Detach(self.normalSettingsPanel)
+               self.simpleSettingsPanel.Destroy()
+               self.normalSettingsPanel.Destroy()
+               self.simpleSettingsPanel = simpleMode.simpleModePanel(self.leftPane, lambda : self.scene.sceneUpdated())
+               self.normalSettingsPanel = normalSettingsPanel(self.leftPane, lambda : self.scene.sceneUpdated())
+               self.leftSizer.Add(self.simpleSettingsPanel, 1)
+               self.leftSizer.Add(self.normalSettingsPanel, 1, wx.EXPAND)
+               self.updateSliceMode()
+               self.updateProfileToAllControls()
+
        def OnLoadProfile(self, e):
                dlg=wx.FileDialog(self, _("Select profile file to load"), os.path.split(profile.getPreference('lastFile'))[0], style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
                dlg.SetWildcard("ini files (*.ini)|*.ini")
@@ -427,7 +439,7 @@ class mainWindow(wx.Frame):
                self.Hide()
                configWizard.configWizard()
                self.Show()
-               self.updateProfileToAllControls()
+               self.reloadSettingPanels()
 
        def OnAddNewMachine(self, e):
                self.Hide()
@@ -437,7 +449,7 @@ class mainWindow(wx.Frame):
                profile.setActiveMachine(n)
                configWizard.configWizard(True)
                self.Show()
-               self.updateProfileToAllControls()
+               self.reloadSettingPanels()
 
        def OnBedLevelWizard(self, e):
                configWizard.bedLevelWizard()
@@ -580,8 +592,7 @@ class normalSettingsPanel(configBase.configPanelBase):
                                p = right
                        configBase.TitleRow(p, title)
                        for s in profile.getSettingsForCategory(category, title):
-                               if s.checkConditions():
-                                       configBase.SettingRow(p, s.getName())
+                               configBase.SettingRow(p, s.getName())
 
        def SizeLabelWidths(self, left, right):
                leftWidth = self.getLabelColumnWidth(left)

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index c70fca072daf4fead5277f4814161544d6cefac2..b650f993b3740fcf27b77f9ee5a9e3b8ee5da8b1 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -72,7 +72,5 @@ class preferencesDialog(wx.Dialog):
                self.Fit()
 
        def OnClose(self, e):
-               if self.oldExtruderAmount != int(profile.getMachineSetting('extruder_amount')):
-                       wx.MessageBox(_("After changing the amount of extruders you need to restart Cura for full effect."), _("Extruder amount warning."), wx.OK | wx.ICON_INFORMATION)
-               self.parent.updateProfileToAllControls()
+               self.parent.reloadSettingPanels()
                self.Destroy()

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 89740158556b514790ff7bc5765a67c030a982f3..1177bcf378f9a6735dde58916e80e1b090c88ae8 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -729,6 +729,7 @@ def checkAndUpdateMachineName():
        n = 0
        while getMachineSetting('machine_name', n) != '':
                if n == _selectedMachineIndex:
+                       n += 1
                        continue
                print name, index, getMachineSetting('machine_name', n)
                if index is None: