Merge commit 'origin/bug_590'

[enigma2.git] / data / startwizard.xml

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 3dedafc9d5c4e24f6287cf804456fc01d259638c..70a6e0dc368aa53b44478950527d2a6eef318a35 100644 (file)
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -1,13 +1,9 @@
 <wizard>
-               <step id="welcome" nextstep="introduction">
+               <step id="start" nextstep="introduction">
                        <text value="Welcome.\n\nThis start wizard will guide you through the basic setup of your Dreambox.\nPress the OK button on your remote control to move to the next step." />
                        <code>
-self["arrowdown"].moveTo(557, 232, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].moveTo(800, 232, 1)
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("OK")
                        </code>
                </step>
                <step id="introduction" >
@@ -17,14 +13,9 @@ self["rc"].startMoving()
                                <listentry caption="Exit wizard" step="end" />
                        </list>
                        <code>
-self["arrowup2"].moveTo(800, 320, 1)
-self["arrowup2"].startMoving()
-self["arrowdown"].moveTo(557, 200, 1)
-self["arrowup"].moveTo(557, 355, 1)
-self["arrowdown"].startMoving()
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("UP")
+self.selectKey("DOWN")
                        </code>
                </step>
                <step id="nima">
@@ -35,14 +26,9 @@ self.condition = len(nimmanager.nim_slots) > 0 and not nimmanager.nim_slots[0].e
                        <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" />
                        <code>
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
-self["arrowup"].moveTo(525, 320, 1)
-self["arrowup"].startMoving()
-self["arrowup2"].moveTo(590, 320, 1)
-self["arrowup2"].startMoving()
-self["arrowdown"].moveTo(740, 355, 1)
-self["arrowdown"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("LEFT")
+self.selectKey("RIGHT")
                        </code>
                </step>
                <step id="nimb">
@@ -53,14 +39,9 @@ self.condition = len(nimmanager.nim_slots) > 1 and not nimmanager.nim_slots[1].e
                        <text value="Please set up tuner B" />
                        <config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
                        <code>
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
-self["arrowup"].moveTo(525, 320, 1)
-self["arrowup"].startMoving()
-self["arrowup2"].moveTo(590, 320, 1)
-self["arrowup2"].startMoving()
-self["arrowdown"].moveTo(740, 355, 1)
-self["arrowdown"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("LEFT")
+self.selectKey("RIGHT")
                        </code>
                </step>
                <step id="nimc">
@@ -71,14 +52,9 @@ self.condition = len(nimmanager.nim_slots) > 2 and not nimmanager.nim_slots[2].e
                        <text value="Please set up tuner C" />
                        <config screen="NimSetup" module="Satconfig" args="2" type="ConfigList" />
                        <code>
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
-self["arrowup"].moveTo(525, 320, 1)
-self["arrowup"].startMoving()
-self["arrowup2"].moveTo(590, 320, 1)
-self["arrowup2"].startMoving()
-self["arrowdown"].moveTo(740, 355, 1)
-self["arrowdown"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("LEFT")
+self.selectKey("RIGHT")
                        </code>
                </step>
                <step id="nimd">
@@ -89,67 +65,69 @@ self.condition = len(nimmanager.nim_slots) > 3 and not nimmanager.nim_slots[3].e
                        <text value="Please set up tuner D" />
                        <config screen="NimSetup" module="Satconfig" args="3" type="ConfigList" />
                        <code>
-self["rc"].moveTo(500, 50, 1)
-self["rc"].startMoving()
-self["arrowup"].moveTo(525, 320, 1)
-self["arrowup"].startMoving()
-self["arrowup2"].moveTo(590, 320, 1)
-self["arrowup2"].startMoving()
-self["arrowdown"].moveTo(740, 355, 1)
-self["arrowdown"].startMoving()
+self.clearSelectedKeys()
+self.selectKey("LEFT")
+self.selectKey("RIGHT")
                        </code>
                </step>
+               <step id="satlistsquestion">
+                       <text value="Do you want to install default sat lists?" />
+                       <condition>
+from Components.NimManager import nimmanager
+self.condition = config.misc.startwizard.doservicescan.value and nimmanager.somethingConnected()
+                       </condition>
+                       <code>
+self.hideRc()
+                       </code>
+                       <list>
+                               <listentry caption="Yes" step="startdefaultlists" />
+                               <listentry caption="No" step="scanquestion" />
+                       </list>
+               </step>
+
                <step id="scanquestion">
                        <text value="Do you want to do a service scan?" />
                        <condition>
-self.condition = config.misc.startwizard.doservicescan.value
+from Components.NimManager import nimmanager
+self.condition = config.misc.startwizard.doservicescan.value and nimmanager.somethingConnected()
                        </condition>
                        <code>
-self["rc"].moveTo(800, 50, 1)
-self["rc"].startMoving()
-self["arrowup"].moveTo(800, 310, 1)
-self["arrowup"].startMoving()
-self["arrowup2"].moveTo(800, 310, 1)
-self["arrowup2"].startMoving()
+self.hideRc()
                        </code>
                        <list>
                                <listentry caption="Yes, do an automatic scan now" step="scan" />
                                <listentry caption="Yes, do a manual scan now" step="manualscan" />
-                               <listentry caption="No, let me choose default lists" step="parentalcontrol" />
-                               <listentry caption="No, scan later manually" step="parentalcontrol" />
+                               <listentry caption="No, scan later manually" step="finisheddefaultsatlists" />
                        </list>
-                       <code pos="after">
-if self["list"].index == 2:
-       #from Screens.ScanSetup import ScanSetup
-       from Screens.ScanSetup import DefaultSatLists
-       self.session.open(DefaultSatLists)
-                       </code>
                </step>
-               <step id="scan" nextstep="parentalcontrol">
+               <step id="scan" nextstep="finisheddefaultsatlists">
                        <condition>
-self.condition = config.misc.startwizard.doservicescan.value
+from Components.NimManager import nimmanager
+self.condition = config.misc.startwizard.doservicescan.value and nimmanager.somethingConnected()
                        </condition>                    
                        <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
+from Components.NimManager import nimmanager
+self.condition = config.misc.startwizard.doservicescan.value and nimmanager.somethingConnected()
                        </condition>
                        <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
+from Components.NimManager import nimmanager
+self.condition = config.misc.startwizard.doservicescan.value and nimmanager.somethingConnected()
                        </condition>
                        <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="parentalcontrol" />
+                               <listentry caption="No, scan later manually" step="finisheddefaultsatlists" />
                        </list>
                </step>
-               <step id="parentalcontrol">
+               <step id="finisheddefaultsatlists">
                        <text value="Do you want to enable the parental control feature on your dreambox?" />
                        <list>
                                <listentry caption="Yes" step="parentalsetup" />
@@ -187,7 +165,10 @@ config.ParentalControl.setuppin.save()
 
                        <text value="After the start wizard is completed, you need to protect single services. Refer to your dreambox's manual on how to do that." />
                </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 id="end" laststep="true">
+                       <condition>
+self.condition = self.isLastWizard
+                       </condition>
+                       <text value="Thank you for using the wizard. Your box is now ready to use.\nPlease press OK to start using your Dreambox." />
                </step>
 </wizard>