Fix first-run-wizard layout.

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 9f575fd5e38595a4be27fde122d2ee6639ab9370..e6e4591a1617f0f524d7df12cee7c61e3abbd323 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -16,6 +16,7 @@ from Cura.util import profile
 from Cura.util import gcodeGenerator
 from Cura.util.resources import getPathForImage
 
+
 class InfoBox(wx.Panel):
        def __init__(self, parent):
                super(InfoBox, self).__init__(parent)
@@ -287,6 +288,10 @@ class MachineSelectPage(InfoPage):
        def OnOtherSelect(self, e):
                wx.wizard.WizardPageSimple.Chain(self, self.GetParent().repRapInfoPage)
 
+       def AllowNext(self):
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().ultimaker2ReadyPage)
+               return True
+
        def StoreData(self):
                if self.Ultimaker2Radio.GetValue():
                        profile.putMachineSetting('machine_width', '230')
@@ -328,6 +333,7 @@ class MachineSelectPage(InfoPage):
                else:
                        profile.putPreference('submit_slice_information', 'False')
 
+
 class SelectParts(InfoPage):
        def __init__(self, parent):
                super(SelectParts, self).__init__(parent, _("Select upgraded parts you have"))
@@ -775,7 +781,8 @@ class configWizard(wx.wizard.Wizard):
                self.ultimaker2ReadyPage = Ultimaker2ReadyPage(self)
 
                wx.wizard.WizardPageSimple.Chain(self.firstInfoPage, self.machineSelectPage)
-               wx.wizard.WizardPageSimple.Chain(self.machineSelectPage, self.ultimaker2ReadyPage)
+               #wx.wizard.WizardPageSimple.Chain(self.machineSelectPage, self.ultimaker2ReadyPage)
+               wx.wizard.WizardPageSimple.Chain(self.machineSelectPage, self.ultimakerSelectParts)
                wx.wizard.WizardPageSimple.Chain(self.ultimakerSelectParts, self.ultimakerFirmwareUpgradePage)
                wx.wizard.WizardPageSimple.Chain(self.ultimakerFirmwareUpgradePage, self.ultimakerCheckupPage)
                wx.wizard.WizardPageSimple.Chain(self.ultimakerCheckupPage, self.bedLevelPage)