use self.getTranslation() for translations

[enigma2.git] / lib / python / Screens / StartWizard.py

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index 95fc24d1e762d3bcbaae56fec7abdb2479430db1..1c4cfb2485929cfb3ee97287de20b3ed92b1d047 100644 (file)
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -1,19 +1,24 @@
 from Wizard import wizardManager
 from Screens.WizardLanguage import WizardLanguage
+from Screens.ScanSetup import DefaultSatLists
+from Screens.DefaultWizard import DefaultWizard
 
 from Components.Pixmap import Pixmap, MovingPixmap
-from Components.config import config, ConfigBoolean, configfile
+from Components.config import config, ConfigBoolean, configfile, ConfigSubsection
 
 from LanguageSelection import LanguageSelection
-from DefaultWizard import DefaultWizard
 
 config.misc.firstrun = ConfigBoolean(default = True)
+config.misc.startwizard = ConfigSubsection()
+config.misc.startwizard.shownimconfig = ConfigBoolean(default = True)
+config.misc.startwizard.doservicescan = ConfigBoolean(default = True)
 config.misc.languageselected = ConfigBoolean(default = True)
 
-class StartWizard(WizardLanguage):
-       def __init__(self, session):
-               self.xmlfile = "startwizard.xml"
+class StartWizard(DefaultSatLists):
+       def __init__(self, session, silent = True, showSteps = False, neededTag = None):
+               self.xmlfile = ["startwizard.xml", "defaultsatlists.xml"]
                WizardLanguage.__init__(self, session, showSteps = False)
+               DefaultWizard.__init__(self, session, silent, showSteps, neededTag = "services")
                self["wizard"] = Pixmap()
                self["rc"] = MovingPixmap()
                self["arrowdown"] = MovingPixmap()
@@ -26,5 +31,4 @@ class StartWizard(WizardLanguage):
                configfile.save()
                
 wizardManager.registerWizard(LanguageSelection, config.misc.languageselected.value, priority = 5)
-wizardManager.registerWizard(DefaultWizard, config.misc.defaultchosen.value, priority = 1)
 wizardManager.registerWizard(StartWizard, config.misc.firstrun.value, priority = 20)