X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a86a756a1f185095b3ae3e39026eb76c16e07c1d..9df197b0346cdea53967bf9ed578ff30e2424100:/data/startwizard.xml

diff --git a/data/startwizard.xml b/data/startwizard.xml
index d4c7efab..54533ebe 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -1,78 +1,100 @@
 <wizard>
-		<step number="1">
-			<text value="Hello User.\n\nThis start-wizard will guide you through the basic setup of your Dreambox.\n\nPress the OK button on your remote control to move to the next step." />
+		<step id="welcome">
+			<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, 10)
-self["rc"].moveTo(500, 50, 10)		
+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()
 			</code>
 		</step>
-		<step number="2">
+		<step>
 			<text value="Use the up/down keys on your remote control to select an option. After that, press OK." />
 			<list>
-				<listentry caption="Use wizard to set up basic features" step="next" />
+				<listentry caption="Use wizard to set up basic features" step="nima" />
 				<listentry caption="Exit wizard" step="end" />
 			</list>
 			<code>
-self["arrowdown"].moveTo(557, 200, 10)
-self["arrowup"].moveTo(557, 355, 10)
+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()
 			</code>
 		</step>
-		<step number="3">
-			<text value="Please set up tuner A" />
+		<step id="nima">
+			<condition>
+from Components.NimManager import nimmanager
+self.condition = nimmanager.nimCount > 0
+			</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" />
 			<code>
-self["arrowup"].moveTo(740, 355, 10)
+self["rc"].moveTo(500, 50, 1)
+self["rc"].startMoving()
+self["arrowup"].moveTo(525, 320, 1)
 self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
+self["arrowup2"].moveTo(590, 320, 1)
+self["arrowup2"].startMoving()
+self["arrowdown"].moveTo(740, 355, 1)
 self["arrowdown"].startMoving()
 			</code>
 		</step>
-		<step number="4">
+		<step id="nimb">
+			<condition>
+from Components.NimManager import nimmanager
+self.condition = nimmanager.nimCount > 1
+			</condition>
 			<text value="Please set up tuner B" />
 			<config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
 			<code>
-self["arrowup"].moveTo(740, 355, 10)
+self["rc"].moveTo(500, 50, 1)
+self["rc"].startMoving()
+self["arrowup"].moveTo(525, 320, 1)
 self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
+self["arrowup2"].moveTo(590, 320, 1)
+self["arrowup2"].startMoving()
+self["arrowdown"].moveTo(740, 355, 1)
 self["arrowdown"].startMoving()
 			</code>
 		</step>
-		<step number="5">
+		<step id="scanquestion">
 			<text value="Do you want to do a service scan?" />
+			<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()
+			</code>
 			<list>
-				<listentry caption="Yes, scan now" step="next" />
-				<listentry caption="No, scan later manually" step="7" />
+				<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 number="6">
+		<step id="scan" nextstep="end">
 			<text value="What do you want to scan?" />
 			<config screen="ScanSimple" module="ScanSetup" type="ConfigList" />
-			<code>
-self["arrowup"].moveTo(740, 355, 10)
-self["arrowup"].startMoving()
-self["arrowdown"].clearPath(True)
-self["arrowdown"].addMovePoint(510, 300, 10)
-self["arrowdown"].addMovePoint(610, 300, 10)
-self["arrowdown"].startMoving()
-			</code>
 		</step>
-		<step number="7">
-			<text value="Thanx for using the wizard. Your box is now ready to use." />
-			<code>
-self["arrowdown"].moveTo(740, 200, 10)
-self["arrowup"].moveTo(740, 355, 10)
-self["arrowdown"].startMoving()
-self["arrowup"].startMoving()
-self["rc"].moveTo(500, 600, 5)
-self["rc"].startMoving()
-			</code>
-		</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>
 </wizard>