push down initial 'changed' event

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index b36a6b4541480b4503c1f5e62a76d6bf590f262b..9c5c1e7dd72275df00d03f312b2b7ae10bd9e382 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,12 +1,11 @@
 from Screen import Screen
 from Components.ActionMap import NumberActionMap
-from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_OK
-from Components.ConfigList import ConfigList, ConfigListScreen
+from Components.config import config
+from Components.ConfigList import ConfigListScreen
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 
 import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
 from skin import elementsWithTag
 
 from Tools import XMLTools
@@ -89,9 +88,9 @@ class Setup(ConfigListScreen, Screen):
                        {
                                "cancel": self.keyCancel,
                                "save": self.keySave,
-                       }, -1)
+                       }, -2)
 
-               ConfigListScreen.__init__(self, list, session = session)
+               ConfigListScreen.__init__(self, list, session = session, on_change = self.changedEntry)
 
                self.changedEntry()
 
@@ -104,7 +103,7 @@ class Setup(ConfigListScreen, Screen):
                return self["config"].getCurrent()[0]
 
        def getCurrentValue(self):
-               return str(self["config"].getCurrent()[1].value)
+               return str(self["config"].getCurrent()[1].getText())
 
        def createSummary(self):
                return SetupSummary
@@ -114,6 +113,11 @@ class Setup(ConfigListScreen, Screen):
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
                        elif x.tagName == 'item':
+                               item_level = int(x.getAttribute("level") or "0")
+
+                               if item_level > config.usage.setup_level.index:
+                                       continue
+
                                item_text = _(x.getAttribute("text").encode("UTF-8") or "??")
                                b = eval(XMLTools.mergeText(x.childNodes));
                                if b == "":
@@ -124,18 +128,6 @@ class Setup(ConfigListScreen, Screen):
                                # the second one is converted to string.
                                list.append( (item_text, item) )
 
-       def keySave(self):
-               print "save requested"
-               for x in self["config"].list:
-                       x[1].save()
-               self.close()
-
-       def keyCancel(self):
-               print "cancel requested"
-               for x in self["config"].list:
-                       x[1].cancel()
-               self.close()
-               
 def getSetupTitle(id):
        xmldata = setupdom.childNodes[0].childNodes
        for x in elementsWithTag(xmldata, "setup"):