X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b4f98a4602ab1b51bf03f989ece928214cafd46b..50d5aff4b1e51eb3b0e014b0b0d519fbdb63c844:/data/startwizard.xml

diff --git a/data/startwizard.xml b/data/startwizard.xml
index c5afe700..a6b773e1 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -73,7 +73,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 +88,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 +102,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>
@@ -137,10 +142,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 +153,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()
@@ -160,7 +171,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>