From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 9 Dec 2005 01:07:10 +0000 (+0000)
Subject: add tunersetup to the startwizard (just a proof of concept as of now)
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=1a1ed192c7d9009498b004f52334e3c705380a1c

add tunersetup to the startwizard (just a proof of concept as of now)
---

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 14bcd56..c38558d 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -22,6 +22,30 @@ self["arrowup"].startMoving()
 			</code>
 		</step>
 		<step number="3">
+			<text value="Please set up tuner A" />
+			<config screen="NimSetup" module="Satconfig" />
+			<code>
+self["arrowup"].moveTo(740, 355, 10)
+self["arrowup"].startMoving()
+self["arrowdown"].clearPath(True)
+self["arrowdown"].addMovePoint(510, 300, 10)
+self["arrowdown"].addMovePoint(610, 300, 10)
+self["arrowdown"].startMoving()
+			</code>
+		</step>
+		<step number="4">
+			<text value="Please set up tuner B" />
+			<config screen="NimSetup" module="Satconfig" />
+			<code>
+self["arrowup"].moveTo(740, 355, 10)
+self["arrowup"].startMoving()
+self["arrowdown"].clearPath(True)
+self["arrowdown"].addMovePoint(510, 300, 10)
+self["arrowdown"].addMovePoint(610, 300, 10)
+self["arrowdown"].startMoving()
+			</code>
+		</step>		
+		<step number="5">
 			<text value="Bla" />
 			<config screen="ScanSimple" module="ScanSetup" />
 			<code>
@@ -33,7 +57,7 @@ self["arrowdown"].addMovePoint(610, 300, 10)
 self["arrowdown"].startMoving()
 			</code>
 		</step>
-		<step number="4">
+		<step number="6">
 			<text value="Bla" />
 			<code>
 self["arrowdown"].moveTo(740, 200, 10)
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 2106394..e6033eb 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -98,9 +98,13 @@ class NimSetup(Screen):
 			x[1].cancel()
 		self.close()
 
-	def __init__(self, session, nim):
+	def __init__(self, session, nim = None):
 		Screen.__init__(self, session)
-		self.nim = nim
+		
+		if nim == None:
+			self.nim = nimmanager.nimList()[0][1]
+		else:
+			self.nim = nim
 		
 		self["actions"] = NumberActionMap(["SetupActions"],
 		{
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index c055f31..ac85b4c 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -106,6 +106,7 @@ class WelcomeWizard(Screen, HelpableScreen):
 		self["list"].l.setList(self.list)
 		
 		if (self.wizard[self.currStep]["config"] != None):
+			print self.wizard[self.currStep]["config"]
 			self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"])
 			self["config"].l.setList(self.configInstance["config"].list)
 		else: