git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo
[enigma2.git]
/
data
/
startwizard.xml
diff --git
a/data/startwizard.xml
b/data/startwizard.xml
index de041193cb36f6233af6ca99eb861bdfe78ac91f..3dedafc9d5c4e24f6287cf804456fc01d259638c 100644
(file)
--- a/
data/startwizard.xml
+++ b/
data/startwizard.xml
@@
-30,7
+30,7
@@
self["rc"].startMoving()
<step id="nima">
<condition>
from Components.NimManager import nimmanager
<step id="nima">
<condition>
from Components.NimManager import nimmanager
-self.condition =
nimmanager.getNimType(0) != nimmanager.nimType["empty/unknown"]
+self.condition =
len(nimmanager.nim_slots) > 0 and not nimmanager.nim_slots[0].empty and config.misc.startwizard.shownimconfig.value
</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" />
</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" />
@@
-48,7
+48,7
@@
self["arrowdown"].startMoving()
<step id="nimb">
<condition>
from Components.NimManager import nimmanager
<step id="nimb">
<condition>
from Components.NimManager import nimmanager
-self.condition =
nimmanager.getNimType(1) != nimmanager.nimType["empty/unknown"]
+self.condition =
len(nimmanager.nim_slots) > 1 and not nimmanager.nim_slots[1].empty and config.misc.startwizard.shownimconfig.value
</condition>
<text value="Please set up tuner B" />
<config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
</condition>
<text value="Please set up tuner B" />
<config screen="NimSetup" module="Satconfig" args="1" type="ConfigList" />
@@
-66,10
+66,10
@@
self["arrowdown"].startMoving()
<step id="nimc">
<condition>
from Components.NimManager import nimmanager
<step id="nimc">
<condition>
from Components.NimManager import nimmanager
-self.condition =
nimmanager.getNimType(2) != nimmanager.nimType["empty/unknown"]
+self.condition =
len(nimmanager.nim_slots) > 2 and not nimmanager.nim_slots[2].empty and config.misc.startwizard.shownimconfig.value
</condition>
</condition>
- <text value="Please set up tuner
B
" />
- <config screen="NimSetup" module="Satconfig" args="
1
" type="ConfigList" />
+ <text value="Please set up tuner
C
" />
+ <config screen="NimSetup" module="Satconfig" args="
2
" type="ConfigList" />
<code>
self["rc"].moveTo(500, 50, 1)
self["rc"].startMoving()
<code>
self["rc"].moveTo(500, 50, 1)
self["rc"].startMoving()
@@
-84,10
+84,10
@@
self["arrowdown"].startMoving()
<step id="nimd">
<condition>
from Components.NimManager import nimmanager
<step id="nimd">
<condition>
from Components.NimManager import nimmanager
-self.condition =
nimmanager.getNimType(3) != nimmanager.nimType["empty/unknown"]
+self.condition =
len(nimmanager.nim_slots) > 3 and not nimmanager.nim_slots[3].empty and config.misc.startwizard.shownimconfig.value
</condition>
</condition>
- <text value="Please set up tuner
B
" />
- <config screen="NimSetup" module="Satconfig" args="
1
" type="ConfigList" />
+ <text value="Please set up tuner
D
" />
+ <config screen="NimSetup" module="Satconfig" args="
3
" type="ConfigList" />
<code>
self["rc"].moveTo(500, 50, 1)
self["rc"].startMoving()
<code>
self["rc"].moveTo(500, 50, 1)
self["rc"].startMoving()
@@
-101,6
+101,9
@@
self["arrowdown"].startMoving()
</step>
<step id="scanquestion">
<text value="Do you want to do a service scan?" />
</step>
<step id="scanquestion">
<text value="Do you want to do a service scan?" />
+ <condition>
+self.condition = config.misc.startwizard.doservicescan.value
+ </condition>
<code>
self["rc"].moveTo(800, 50, 1)
self["rc"].startMoving()
<code>
self["rc"].moveTo(800, 50, 1)
self["rc"].startMoving()
@@
-112,18
+115,34
@@
self["arrowup2"].startMoving()
<list>
<listentry caption="Yes, do an automatic scan now" step="scan" />
<listentry caption="Yes, do a manual scan now" step="manualscan" />
<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" />
</list>
<listentry caption="No, scan later manually" step="parentalcontrol" />
</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>
<step id="scan" nextstep="parentalcontrol">
+ <condition>
+self.condition = config.misc.startwizard.doservicescan.value
+ </condition>
<text value="What do you want to scan?" />
<config screen="ScanSimple" module="ScanSetup" type="ConfigList" />
</step>
<step id="manualscan">
<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
+ </condition>
<text value="What do you want to scan?" />
<config screen="ScanSetup" module="ScanSetup" type="ConfigList" />
</step>
<step id="nextscan">
<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
+ </condition>
<text value="Do you want to do another manual service scan?" />
<list>
<listentry caption="Yes, do another manual scan now" step="manualscan" />
<text value="Do you want to do another manual service scan?" />
<list>
<listentry caption="Yes, do another manual scan now" step="manualscan" />
@@
-137,7
+156,7
@@
self["arrowup2"].startMoving()
<listentry caption="No" step="end" />
</list>
<code pos="after">
<listentry caption="No" step="end" />
</list>
<code pos="after">
-if self["list"].
getSelectedIndex()
== 0:
+if self["list"].
index
== 0:
config.ParentalControl.configured.value = True
else:
config.ParentalControl.configured.value = False
config.ParentalControl.configured.value = True
else:
config.ParentalControl.configured.value = False
@@
-152,7
+171,7
@@
config.ParentalControl.configured.save()
</list>
<code pos="after">
from ParentalControlSetup import ParentalControlChangePin
</list>
<code pos="after">
from ParentalControlSetup import ParentalControlChangePin
-if self["list"].
getSelectedIndex()
== 0:
+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>