From: daid Date: Wed, 18 Sep 2013 11:42:15 +0000 (+0200) Subject: Fix first-run-wizard layout. X-Git-Tag: 13.10~73 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7c46860ed385b9a8c28478c59f389289fb99c2dc;p=cura.git Fix first-run-wizard layout. --- diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py index 9f575fd5..e6e4591a 100644 --- 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)