X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=data%2Fstartwizard.xml;h=5ed6413d0c8f680c66a8af51aef6cf2944cf97f5;hp=db0439293a8d696d79f0512701bb177f0e6c8255;hb=4911a0121954f6b6657ba28fab8d9dd9031d9a59;hpb=afa141eedd597d0468d33b97a79f738a9ebfd11f

diff --git a/data/startwizard.xml b/data/startwizard.xml
index db04392..5ed6413 100755
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -48,8 +48,8 @@ self.selectKey("RIGHT")
 		<step id="nimc">
 			<condition>
 from Components.NimManager import nimmanager
-from Screens.Satconfig import isFBCLink
-self.condition = len(nimmanager.nim_slots) > 2 and not nimmanager.nim_slots[2].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[2])
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 2 and not nimmanager.nim_slots[2].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[2].slot)
 			</condition>
 			<text value="Please set up tuner C" />
 			<config screen="NimSetup" module="Satconfig" args="2" type="ConfigList" />
@@ -62,8 +62,8 @@ self.selectKey("RIGHT")
 		<step id="nimd">
 			<condition>
 from Components.NimManager import nimmanager
-from Screens.Satconfig import isFBCLink
-self.condition = len(nimmanager.nim_slots) > 3 and not nimmanager.nim_slots[3].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[3])
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 3 and not nimmanager.nim_slots[3].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[3].slot)
 			</condition>
 			<text value="Please set up tuner D" />
 			<config screen="NimSetup" module="Satconfig" args="3" type="ConfigList" />
@@ -76,8 +76,8 @@ self.selectKey("RIGHT")
 		<step id="nime">
 			<condition>
 from Components.NimManager import nimmanager
-from Screens.Satconfig import isFBCLink
-self.condition = len(nimmanager.nim_slots) > 4 and not nimmanager.nim_slots[4].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[4])
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 4 and not nimmanager.nim_slots[4].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[4].slot)
 			</condition>
 			<text value="Please set up tuner E" />
 			<config screen="NimSetup" module="Satconfig" args="4" type="ConfigList" />
@@ -90,8 +90,8 @@ self.selectKey("RIGHT")
 		<step id="nimf">
 			<condition>
 from Components.NimManager import nimmanager
-from Screens.Satconfig import isFBCLink
-self.condition = len(nimmanager.nim_slots) > 5 and not nimmanager.nim_slots[5].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[5])
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 5 and not nimmanager.nim_slots[5].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[5].slot)
 			</condition>
 			<text value="Please set up tuner F" />
 			<config screen="NimSetup" module="Satconfig" args="5" type="ConfigList" />
@@ -104,8 +104,8 @@ self.selectKey("RIGHT")
 		<step id="nimg">
 			<condition>
 from Components.NimManager import nimmanager
-from Screens.Satconfig import isFBCLink
-self.condition = len(nimmanager.nim_slots) > 6 and not nimmanager.nim_slots[6].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[6])
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 6 and not nimmanager.nim_slots[6].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[6].slot)
 			</condition>
 			<text value="Please set up tuner G" />
 			<config screen="NimSetup" module="Satconfig" args="6" type="ConfigList" />
@@ -118,8 +118,8 @@ self.selectKey("RIGHT")
 		<step id="nimh">
 			<condition>
 from Components.NimManager import nimmanager
-from Screens.Satconfig import isFBCLink
-self.condition = len(nimmanager.nim_slots) > 7 and not nimmanager.nim_slots[7].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[7])
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 7 and not nimmanager.nim_slots[7].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[7].slot)
 			</condition>
 			<text value="Please set up tuner H" />
 			<config screen="NimSetup" module="Satconfig" args="7" type="ConfigList" />
@@ -132,8 +132,8 @@ self.selectKey("RIGHT")
 		<step id="nimi">
 			<condition>
 from Components.NimManager import nimmanager
-from Screens.Satconfig import isFBCLink
-self.condition = len(nimmanager.nim_slots) > 8 and not nimmanager.nim_slots[8].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[8])
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 8 and not nimmanager.nim_slots[8].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[8].slot)
 			</condition>
 			<text value="Please set up tuner I" />
 			<config screen="NimSetup" module="Satconfig" args="8" type="ConfigList" />
@@ -146,8 +146,8 @@ self.selectKey("RIGHT")
 		<step id="nimj">
 			<condition>
 from Components.NimManager import nimmanager
-from Screens.Satconfig import isFBCLink
-self.condition = len(nimmanager.nim_slots) > 9 and not nimmanager.nim_slots[9].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[9])
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 9 and not nimmanager.nim_slots[9].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[9].slot)
 			</condition>
 			<text value="Please set up tuner J" />
 			<config screen="NimSetup" module="Satconfig" args="9" type="ConfigList" />
@@ -157,6 +157,34 @@ self.selectKey("LEFT")
 self.selectKey("RIGHT")
 			</code>
 		</step>
+		<step id="nimq">
+			<condition>
+from Components.NimManager import nimmanager
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 16 and not nimmanager.nim_slots[16].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[16].slot)
+			</condition>
+			<text value="Please set up tuner Q" />
+			<config screen="NimSetup" module="Satconfig" args="16" type="ConfigList" />
+			<code>
+self.clearSelectedKeys()
+self.selectKey("LEFT")
+self.selectKey("RIGHT")
+			</code>
+		</step>
+		<step id="nimr">
+			<condition>
+from Components.NimManager import nimmanager
+from enigma import isFBCLink
+self.condition = len(nimmanager.nim_slots) > 17 and not nimmanager.nim_slots[17].empty and config.misc.startwizard.shownimconfig.value and not isFBCLink(nimmanager.nim_slots[17].slot)
+			</condition>
+			<text value="Please set up tuner R" />
+			<config screen="NimSetup" module="Satconfig" args="17" type="ConfigList" />
+			<code>
+self.clearSelectedKeys()
+self.selectKey("LEFT")
+self.selectKey("RIGHT")
+			</code>
+		</step>
 		<step id="satlistsquestion">
 			<text value="Do you want to install default sat lists?" />
 			<condition>