fill configlist with correct entries

[enigma2.git] / lib / python / Screens / Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 582314d546f614dc7fc237d20c094c9cf1f6f132..15cd7c66ddf2a1d625f7a64f9b602d7eed29137f 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,5 +1,9 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
+from Components.config import config                           #global config instance
+from Components.config import configEntry
+from Components.config import configBoolean
+from Components.ConfigList import ConfigList
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
@@ -27,8 +31,7 @@ def getValbyAttr(x, attr):
 
 class Setup(Screen):
 
-       def createDialog(self, childNode):
-               print "createDialog"
+       def addItems(self, list, childNode):
                for x in childNode:
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
@@ -37,6 +40,7 @@ class Setup(Screen):
                                b = XMLTools.mergeText(x.childNodes);
                                print "item " + ItemText + " " + b
                                #add to configlist
+                               list.append( (ItemText, config.getControlType(b) ) )
                                
        def __init__(self, session, setup):
                Screen.__init__(self, session)
@@ -44,7 +48,9 @@ class Setup(Screen):
                print "request setup for " + setup
                
                entries = setupdom.childNodes
-               
+
+               list = []
+                               
                for x in entries:             #walk through the actual nodelist
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
@@ -52,11 +58,13 @@ class Setup(Screen):
                                ItemText = getValbyAttr(x, "key")
                                if ItemText != setup:
                                        continue
-                               self.createDialog(x.childNodes);
-                               
+                               self.addItems(list, x.childNodes);
+               
+               #check for list.entries > 0 else self.close
+               self["config"] = ConfigList(list)
 
                self["actions"] = ActionMap(["OkCancelActions"], 
                        {
-                               #"ok": self.inc,
+                               "ok": self["config"].toggle,
                                "cancel": self.close
                        })