git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
data
/
startwizard.xml
diff --git
a/data/startwizard.xml
b/data/startwizard.xml
index c004a5e6798ce3cb8d8f6fc72f76a1d664a482dc..a6b773e1b5ca2b2cb6c21f6dceab2ce502f828f3 100644
(file)
--- 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>
<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()
</condition>
<code>
self.hideRc()
@@
-87,7
+88,8
@@
self.hideRc()
<step id="scanquestion">
<text value="Do you want to do a service scan?" />
<condition>
<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()
</condition>
<code>
self.hideRc()
@@
-100,21
+102,24
@@
self.hideRc()
</step>
<step id="scan" nextstep="finisheddefaultsatlists">
<condition>
</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>
</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>
</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>
</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">
</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" />
<list>
<listentry caption="Yes" step="finishparentalsetup" />
- <listentry caption="No" step="
finishparentalsetup
" />
+ <listentry caption="No" step="
warnpin
" />
</list>
<code pos="after">
from ParentalControlSetup import ParentalControlChangePin
</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>
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>
<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()
config.ParentalControl.setuppinactive.save()
config.ParentalControl.servicepinactive.value = True
config.ParentalControl.servicepinactive.save()