add support for cyclic garbage collection to eTimer and eSocketNotifier

[vuplus_dvbapp] / lib / python / Screens / Wizard.py

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 8c49a89..c987ac6 100644 (file)
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -19,7 +19,7 @@ from xml.sax.handler import ContentHandler
 class WizardSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
-               <widget name="text" position="6,4" size="120,42" font="Regular;14" />
+               <widget name="text" position="6,4" size="120,42" font="Regular;14" transparent="1" />
                <widget source="parent.list" render="Label" position="6,25" size="120,21" font="Regular;16">
                        <convert type="StringListSelection" />
                </widget>
@@ -67,6 +67,7 @@ class Wizard(Screen, HelpableScreen):
                                        id = str(attrs.get('id'))
                                else:
                                        id = ""
+                               print "id:", id
                                if attrs.has_key('nextstep'):
                                        nextstep = str(attrs.get('nextstep'))
                                else:
@@ -79,16 +80,23 @@ class Wizard(Screen, HelpableScreen):
                                        timeoutaction = str(attrs.get('timeoutaction'))
                                else:
                                        timeoutaction = 'nextpage'
-                               self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "timeout": timeout, "timeoutaction": timeoutaction, "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "nextstep": nextstep}
+
+                               if attrs.has_key('timeoutstep'):
+                                       timeoutstep = str(attrs.get('timeoutstep'))
+                               else:
+                                       timeoutstep = ''
+                               self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "timeout": timeout, "timeoutaction": timeoutaction, "timeoutstep": timeoutstep, "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "nextstep": nextstep}
                        elif (name == "text"):
                                self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n")
                        elif (name == "displaytext"):
                                self.wizard[self.lastStep]["displaytext"] = string.replace(str(attrs.get('value')), "\\n", "\n")
                        elif (name == "list"):
                                if (attrs.has_key('type')):
-                                       self.wizard[self.lastStep]["dynamiclist"] = attrs.get("source")
+                                       if attrs["type"] == "dynamic":
+                                               self.wizard[self.lastStep]["dynamiclist"] = attrs.get("source")
                                        #self.wizard[self.lastStep]["list"].append(("Hallo", "test"))
                                if (attrs.has_key("evaluation")):
+                                       print "evaluation"
                                        self.wizard[self.lastStep]["listevaluation"] = attrs.get("evaluation")
                                if (attrs.has_key("onselect")):
                                        self.wizard[self.lastStep]["onselect"] = attrs.get("onselect")                  
@@ -117,6 +125,8 @@ class Wizard(Screen, HelpableScreen):
                                        self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"].strip()
                        elif name == 'condition':
                                self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"].strip()
+                       elif name == 'step':
+                               print "Step number", self.lastStep, ":", self.wizard[self.lastStep]
                                                                
                def characters(self, ch):
                        if self.currContent == "code":
@@ -152,7 +162,7 @@ class Wizard(Screen, HelpableScreen):
                self.currStep = 1
                
                self.timeoutTimer = eTimer()
-               self.timeoutTimer.timeout.get().append(self.timeoutCounterFired)
+               self.timeoutTimer.callback.append(self.timeoutCounterFired)
 
                self["text"] = Label()
 
@@ -212,14 +222,17 @@ class Wizard(Screen, HelpableScreen):
                pass
        
        def getStepWithID(self, id):
+               print "getStepWithID:", id
                count = 0
                for x in self.wizard:
                        if self.wizard[x]["id"] == id:
+                               print "result:", count
                                return count
                        count += 1
+               print "result: nothing"
                return 0
 
-       def finished(self, *args, **kwargs):
+       def finished(self, gotoStep = None, *args, **kwargs):
                print "finished"
                currStep = self.currStep
 
@@ -242,6 +255,8 @@ class Wizard(Screen, HelpableScreen):
                        self.runCode(self.wizard[currStep]["codeafter"])
                        if self.wizard[currStep]["nextstep"] is not None:
                                self.currStep = self.getStepWithID(self.wizard[currStep]["nextstep"])
+                       if gotoStep is not None:
+                               self.currStep = self.getStepWithID(gotoStep)
                        self.currStep += 1
                        self.updateValues()
 
@@ -343,8 +358,6 @@ class Wizard(Screen, HelpableScreen):
                print "Updating values in step " + str(self.currStep)
                self.timeoutTimer.stop()
                
-               self.stepHistory.append(self.currStep)
-               
                if self.configInstance is not None:
                        del self.configInstance["config"]
                        self.configInstance.doClose()
@@ -353,6 +366,7 @@ class Wizard(Screen, HelpableScreen):
                self.condition = True
                exec (self.wizard[self.currStep]["condition"])
                if self.condition:
+                       self.stepHistory.append(self.currStep)
                        print "wizard step:", self.wizard[self.currStep]
                        
                        if self.showSteps:
@@ -436,20 +450,23 @@ class Wizard(Screen, HelpableScreen):
                        if self.wizard[self.currStep]["timeoutaction"] == "selectnext":
                                print "selection next item"
                                self.down()
+                       else:
+                               if self.wizard[self.currStep]["timeoutaction"] == "changestep":
+                                       self.finished(gotoStep = self.wizard[self.currStep]["timeoutstep"])
                self.updateText()
 
 class WizardManager:
        def __init__(self):
                self.wizards = []
        
-       def registerWizard(self, wizard, precondition):
-               self.wizards.append((wizard, precondition))
+       def registerWizard(self, wizard, precondition, priority = 0):
+               self.wizards.append((wizard, precondition, priority))
        
        def getWizards(self):
                list = []
                for x in self.wizards:
                        if x[1] == 1: # precondition
-                               list.append(x[0])
+                               list.append((x[2], x[0]))
                return list
 
 wizardManager = WizardManager()