- allow multiple xml control files for one wizard (to combine wizards, that should also be able to run standalone)

- separate question for default sat lists in start wizard

2 files changed, 35 insertions, 24 deletions

diff --git a/data/defaultsatlists.xml b/data/defaultsatlists.xml
index f6489676..132b427c 100644
--- a/data/defaultsatlists.xml
+++ b/data/defaultsatlists.xml
@@ -1,5 +1,5 @@
 <wizard>
-	<step id="welcome" nextstep="nothingtoinstall">
+	<step id="startdefaultlists" nextstep="nothingtoinstall">
 		<condition>
 packagelist = self.fillPackagesList()
 self.runWizard = (len(packagelist) > 0)
@@ -12,11 +12,11 @@ self.condition = self.runWizard
 self.disableKeys = True
 		</code>
 	</step>
-	<step id="nopackages" nextstep="install">
+	<step id="nopackages" nextstep="finisheddefaultsatlists">
 		<text value="There are no default services lists in your image." />
 	</step>
 	
-	<step id="nothingtoinstall" nextstep="install">
+	<step id="nothingtoinstall" nextstep="finisheddefaultsatlists">
 		<condition>
 if self.runWizard:
 	self.condition = True
@@ -32,12 +32,9 @@ else:
 		<code>
 self.disableKeys = False
 		</code>
-		<code pos="after">
-self.markDone()
-		</code>
 	</step>
 	
-	<step id="install">
+	<step id="install" nextstep="finisheddefaultsatlists">
 		<condition>
 self.condition = False
 if self.runWizard:
@@ -50,11 +47,13 @@ if self.runWizard:
 self.disableKeys = True			
 self.installPackages(self.indexList)
 		</code>
-		<code>
-#print "len of packageslist", len(self.packageslist)
-#if (len(self.packageslist) == 1):
-	#self.installPackage(0)
-		</code>
 		<text value="Installing default sat lists... Please wait..." />
 	</step>
+	
+	<step id="finisheddefaultsatlists">
+		<condition>
+self.markDone()
+self.condition = False
+		</condition>
+	</step>
 </wizard>
diff --git a/data/startwizard.xml b/data/startwizard.xml
index 3dedafc9..8e054fb6 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -1,5 +1,5 @@
 <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)
@@ -99,6 +99,25 @@ self["arrowdown"].moveTo(740, 355, 1)
 self["arrowdown"].startMoving()
 			</code>
 		</step>
+		<step id="satlistsquestion">
+			<text value="Do you want to install default sat lists?" />
+			<condition>
+self.condition = config.misc.startwizard.doservicescan.value
+			</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()
+			</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>
@@ -115,17 +134,10 @@ self["arrowup2"].startMoving()
 			<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
 			</condition>			
@@ -146,10 +158,10 @@ self.condition = config.misc.startwizard.doservicescan.value
 			<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" />