don't show in startwizard

- tuner config if config.misc.startwizard.shownimconfig = False
- service scan if config.misc.startwizard.doservicescan = False
can be used to preconfigure an image through defaults in the dealer
partition

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 368b301ea8378295c3f6ae50f4224eb9bd89a97d..5604f90d1cda3c7646f02a1b21ef5484242d2ad6 100644 (file)
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -30,7 +30,7 @@ self["rc"].startMoving()
                <step id="nima">
                        <condition>
 from Components.NimManager import nimmanager
                <step id="nima">
                        <condition>
 from Components.NimManager import nimmanager

-self.condition = len(nimmanager.nim_slots) > 0 and not nimmanager.nim_slots[0].empty
+self.condition = len(nimmanager.nim_slots) > 0 and not nimmanager.nim_slots[0].empty and config.misc.startwizard.shownimconfig.value

                        </condition>
                        <text value="Use the left and right buttons to change an option.\n\nPlease set up tuner A" />
                        <config screen="NimSetup" module="Satconfig" args="0" type="ConfigList" />
                        </condition>
                        <text value="Use the left and right buttons to change an option.\n\nPlease set up tuner A" />
                        <config screen="NimSetup" module="Satconfig" args="0" type="ConfigList" />


@@ -48,7 +48,7 @@ self["arrowdown"].startMoving()
                <step id="nimb">
                        <condition>
 from Components.NimManager import nimmanager
                <step id="nimb">
                        <condition>
 from Components.NimManager import nimmanager

-self.condition = len(nimmanager.nim_slots) > 1 and not nimmanager.nim_slots[1].empty
+self.condition = len(nimmanager.nim_slots) > 1 and not nimmanager.nim_slots[1].empty and config.misc.startwizard.shownimconfig.value

                        </condition>
                        <text value="Please set up tuner B" />
                        <config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
                        </condition>
                        <text value="Please set up tuner B" />
                        <config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />


@@ -66,7 +66,7 @@ self["arrowdown"].startMoving()
                <step id="nimc">
                        <condition>
 from Components.NimManager import nimmanager
                <step id="nimc">
                        <condition>
 from Components.NimManager import nimmanager

-self.condition = len(nimmanager.nim_slots) > 2 and not nimmanager.nim_slots[2].empty
+self.condition = len(nimmanager.nim_slots) > 2 and not nimmanager.nim_slots[2].empty and config.misc.startwizard.shownimconfig.value

                        </condition>
                        <text value="Please set up tuner C" />
                        <config screen="NimSetup" module="Satconfig" args="2" type="ConfigList" />
                        </condition>
                        <text value="Please set up tuner C" />
                        <config screen="NimSetup" module="Satconfig" args="2" type="ConfigList" />


@@ -84,7 +84,7 @@ self["arrowdown"].startMoving()
                <step id="nimd">
                        <condition>
 from Components.NimManager import nimmanager
                <step id="nimd">
                        <condition>
 from Components.NimManager import nimmanager

-self.condition = len(nimmanager.nim_slots) > 3 and not nimmanager.nim_slots[3].empty
+self.condition = len(nimmanager.nim_slots) > 3 and not nimmanager.nim_slots[3].empty and config.misc.startwizard.shownimconfig.value

                        </condition>
                        <text value="Please set up tuner D" />
                        <config screen="NimSetup" module="Satconfig" args="3" type="ConfigList" />
                        </condition>
                        <text value="Please set up tuner D" />
                        <config screen="NimSetup" module="Satconfig" args="3" type="ConfigList" />


@@ -101,6 +101,9 @@ self["arrowdown"].startMoving()
                </step>
                <step id="scanquestion">
                        <text value="Do you want to do a service scan?" />
                </step>
                <step id="scanquestion">
                        <text value="Do you want to do a service scan?" />

+                       <condition>
+self.condition = config.misc.startwizard.doservicescan.value
+                       </condition>

                        <code>
 self["rc"].moveTo(800, 50, 1)
 self["rc"].startMoving()
                        <code>
 self["rc"].moveTo(800, 50, 1)
 self["rc"].startMoving()


@@ -116,14 +119,23 @@ self["arrowup2"].startMoving()
                        </list>
                </step>
                <step id="scan" nextstep="parentalcontrol">
                        </list>
                </step>
                <step id="scan" nextstep="parentalcontrol">

+                       <condition>
+self.condition = config.misc.startwizard.doservicescan.value
+                       </condition>                    

                        <text value="What do you want to scan?" />
                        <config screen="ScanSimple" module="ScanSetup" type="ConfigList" />
                </step>
                <step id="manualscan">
                        <text value="What do you want to scan?" />
                        <config screen="ScanSimple" module="ScanSetup" type="ConfigList" />
                </step>
                <step id="manualscan">

+                       <condition>
+self.condition = config.misc.startwizard.doservicescan.value
+                       </condition>

                        <text value="What do you want to scan?" />
                        <config screen="ScanSetup" module="ScanSetup" type="ConfigList" />
                </step>
                <step id="nextscan">
                        <text value="What do you want to scan?" />
                        <config screen="ScanSetup" module="ScanSetup" type="ConfigList" />
                </step>
                <step id="nextscan">

+                       <condition>
+self.condition = config.misc.startwizard.doservicescan.value
+                       </condition>

                        <text value="Do you want to do another manual service scan?" />
                        <list>
                                <listentry caption="Yes, do another manual scan now" step="manualscan" />
                        <text value="Do you want to do another manual service scan?" />
                        <list>
                                <listentry caption="Yes, do another manual scan now" step="manualscan" />

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index 23c3cd71a143b52f1c8f66a30790cf598755328b..d0ece2950ad47576ec0dcc00e6018978bfbd1914 100644 (file)
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -2,11 +2,14 @@ from Wizard import wizardManager
 from Screens.WizardLanguage import WizardLanguage
 
 from Components.Pixmap import Pixmap, MovingPixmap
 from Screens.WizardLanguage import WizardLanguage
 
 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
 
 config.misc.firstrun = ConfigBoolean(default = True)
 
 from LanguageSelection import LanguageSelection
 
 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):
 config.misc.languageselected = ConfigBoolean(default = True)
 
 class StartWizard(WizardLanguage):