don't display tuner setup for empty tuner slots

[enigma2.git] / data / startwizard.xml

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 4b735f8459c0ed086fe838efd95aa5233bea6372..9dbf030d9d68518ffcd41d6776131c6039fd7e6c 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
-self.condition = nimmanager.nimCount > 0
+self.condition = nimmanager.getNimType(0) != nimmanager.nimType["empty/unknown"]
                        </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
-self.condition = nimmanager.nimCount > 1
+self.condition = nimmanager.getNimType(1) != nimmanager.nimType["empty/unknown"]
                        </condition>
                        <text value="Please set up tuner B" />
                        <config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
@@ -74,14 +74,26 @@ self["arrowup2"].moveTo(800, 310, 1)
 self["arrowup2"].startMoving()
                        </code>
                        <list>
-                               <listentry caption="Yes, scan now" step="scan" />
+                               <listentry caption="Yes, do an automatic scan now" step="scan" />
+                               <listentry caption="Yes, do a manual scan now" step="manualscan" />
                                <listentry caption="No, scan later manually" step="end" />
                        </list>
                </step>
-               <step id="scan">
+               <step id="scan" nextstep="end">
                        <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="ScanSetup" module="ScanSetup" type="ConfigList" />
+               </step>
+               <step id="nextscan">
+                       <text value="Do you want to do another manual service scan?" />
+                       <list>
+                               <listentry caption="Yes, do another manual scan now" step="manualscan" />
+                               <listentry caption="No, scan later manually" step="end" />
+                       </list>
+               </step>
                <step id="end">
                        <text value="Thank you for using the wizard. Your box is now ready to use.\nPlease press OK to start using you Dreambox." />
                </step>