X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=data%2Fstartwizard.xml;h=c13a50205d8b7cb105a782ba2e8aa51de6f76a8a;hp=c5afe70006c87cf2eab333b830ed141a8af1255e;hb=b5a5859ed517e70aaac405fa70e21e76f3fc72b7;hpb=b4f98a4602ab1b51bf03f989ece928214cafd46b

diff --git a/data/startwizard.xml b/data/startwizard.xml
old mode 100644
new mode 100755
index c5afe70..c13a502
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -1,6 +1,7 @@
 <wizard>
 		<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." />
+			<text value="Welcome.\n\nThis start wizard will guide you through the basic setup of your STB.\nPress the OK button on your remote control to move to the next step." />			
+
 			<code>
 self.clearSelectedKeys()
 self.selectKey("OK")
@@ -73,7 +74,8 @@ self.selectKey("RIGHT")
 		<step id="satlistsquestion">
 			<text value="Do you want to install default sat lists?" />
 			<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.hideRc()
@@ -87,7 +89,8 @@ self.hideRc()
 		<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.hideRc()
@@ -100,21 +103,24 @@ self.hideRc()
 		</step>
 		<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>
@@ -123,7 +129,8 @@ self.condition = config.misc.startwizard.doservicescan.value
 			</list>
 		</step>
 		<step id="finisheddefaultsatlists">
-			<text value="Do you want to enable the parental control feature on your dreambox?" />
+			<text value="Do you want to enable the parental control feature on your STB?" />			
+
 			<list>
 				<listentry caption="Yes" step="parentalsetup" />
 				<listentry caption="No" step="end" />
@@ -137,10 +144,10 @@ config.ParentalControl.configured.save()
 			</code>
 		</step>
 		<step id="parentalsetup">
-			<text value="You need to set a pin code and hide it from your children.\n\nDo you want to set the pin now?" />
+			<text value="You need to set a PIN code and hide it from your children.\n\nDo you want to set the pin now?" />
 			<list>
 				<listentry caption="Yes" step="finishparentalsetup" />
-				<listentry caption="No" step="finishparentalsetup" />
+				<listentry caption="No" step="warnpin" />
 			</list>
 			<code pos="after">
 from ParentalControlSetup import ParentalControlChangePin
@@ -148,9 +155,15 @@ if self["list"].index == 0:
 	self.session.open(ParentalControlChangePin, config.ParentalControl.servicepin[0], _("parental control pin"))
 			</code>
 		</step>
+		<step id="warnpin">
+			<text value="Please be aware, that anyone can disable the parental control, if you have not set a PIN." />
+		</step>
 		<step id="finishparentalsetup">
 			<code>
-config.ParentalControl.setuppinactive.value = True
+if config.ParentalControl.setuppin.value == "aaaa":
+	config.ParentalControl.setuppinactive.value = False
+else:
+	config.ParentalControl.setuppinactive.value = True
 config.ParentalControl.setuppinactive.save()
 config.ParentalControl.servicepinactive.value = True
 config.ParentalControl.servicepinactive.save()
@@ -158,9 +171,14 @@ config.ParentalControl.setuppin.value = config.ParentalControl.servicepin[0].val
 config.ParentalControl.setuppin.save()
 			</code>
 
-			<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." />
+			<text value="After the start wizard is completed, you need to protect single services. Refer to your STB'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 STB." />
+
 		</step>
 </wizard>