From: daid Date: Wed, 26 Nov 2014 10:28:30 +0000 (+0100) Subject: Make ConfigWizard use proper naming convention. X-Git-Tag: lulzbot-14.12~19 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b4d95a3f193926b8e8a0fc0aff4d9c53471e5820;p=cura.git Make ConfigWizard use proper naming convention. Conflicts: Cura/gui/app.py --- diff --git a/Cura/gui/app.py b/Cura/gui/app.py index 94d11cc0..a281df4d 100644 --- a/Cura/gui/app.py +++ b/Cura/gui/app.py @@ -133,7 +133,7 @@ class CuraApp(wx.App): if self.splash is not None: self.splash.Show(False) self.splash = None - configWizard.configWizard() + configWizard.ConfigWizard() if profile.getPreference('check_for_updates') == 'True': newVersion = version.checkForNewerVersion() diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py index 387d4d49..a7fe6686 100644 --- a/Cura/gui/configWizard.py +++ b/Cura/gui/configWizard.py @@ -948,9 +948,9 @@ class LulzbotReadyPage(InfoPage): self.AddText(_('3D printer, please visit www.LulzBot.com/cura')) self.AddSeperator() -class configWizard(wx.wizard.Wizard): +class ConfigWizard(wx.wizard.Wizard): def __init__(self, addNew = False): - super(configWizard, self).__init__(None, -1, _("Configuration Wizard")) + super(ConfigWizard, self).__init__(None, -1, _("Configuration Wizard")) self._old_machine_index = int(profile.getPreferenceFloat('active_machine')) if addNew: diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index b55f635f..9f9139b1 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -558,7 +558,7 @@ class mainWindow(wx.Frame): def OnAddNewMachine(self, e): self.Hide() - configWizard.configWizard(True) + configWizard.ConfigWizard(True) self.Show() self.reloadSettingPanels() self.updateMachineMenu() diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py index 5ba79c67..113dbf55 100644 --- a/Cura/gui/preferencesDialog.py +++ b/Cura/gui/preferencesDialog.py @@ -138,7 +138,7 @@ class machineSettingsDialog(wx.Dialog): def OnAddMachine(self, e): self.Hide() self.parent.Hide() - configWizard.configWizard(True) + configWizard.ConfigWizard(True) self.parent.Show() self.parent.reloadSettingPanels() self.parent.updateMachineMenu()