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

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 14bcd56dab401cfd966a08933d45cbaeb85f894c..c38558d01de924e853072897ea3ce5d2b0d01c3a 100644 (file)
--- 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 21063942c5f5119f6b0a6a150eac40e50af373d3..e6033ebc15885a1b4f154bc9470205ff090b3c24 100644 (file)
--- 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 c055f3125f6b8cc284c60c7b0ddb08408457e341..ac85b4c6872ee18ef16f50d9eda2dc3d4603dc62 100644 (file)
--- 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: