some cleanups

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 2981e25a3819ebfe118476aa5b37c6017bb73370..746c26d304af5bf78ad7f50d87ac1d889230c3d7 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -23,16 +23,6 @@ except:
 setupdom = xml.dom.minidom.parseString(setupfile.read())
 setupfile.close()
 
-def getValbyAttr(x, attr):
-       for p in range(x.attributes.length):
-               a = x.attributes.item(p)
-               attrib = str(a.name)
-               value = str(a.value)
-               if attrib == attr:
-                       return value
-       
-       return ""
-
 class SetupSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
@@ -64,53 +54,8 @@ class SetupSummary(Screen):
                self["SetupValue"].text = self.parent.getCurrentValue()
 
 class Setup(Screen):
-       def addItems(self, list, childNode):
-               for x in childNode:
-                       if x.nodeType != xml.dom.minidom.Element.nodeType:
-                               continue
-                       elif x.tagName == 'item':
-                               ItemText = _(getValbyAttr(x, "text"))
-                               b = eval(XMLTools.mergeText(x.childNodes));
-                               print "item " + ItemText + " " + b.configPath
-                               if b == "":
-                                       continue
-                               #add to configlist
-                               item = b.controlType(b)
-                               
-                               # the first b is the item itself, ignored by the configList.
-                               # the second one is converted to string.
-                               list.append( (ItemText, item) )
-
-       def handleKey(self, key):
-               # ignore keys when not enabled
-               if self["config"].getCurrent()[1].parent.enabled:
-                       self["config"].handleKey(config.key[key])
-                       print self["config"].getCurrent()
-                       self.changedEntry()
 
-       def keyOk(self):
-               self.handleKey("choseElement")
-
-       def keyLeft(self):
-               self.handleKey("prevElement")
-
-       def keyRight(self):
-               self.handleKey("nextElement")
-
-       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 keyNumberGlobal(self, number):
-               self.handleKey(str(number))
+       ALLOW_SUSPEND = True
 
        def __init__(self, session, setup):
                Screen.__init__(self, session)
@@ -126,12 +71,11 @@ class Setup(Screen):
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
                        elif x.tagName == 'setup':
-                               ItemText = getValbyAttr(x, "key")
-                               if ItemText != setup:
+                               if x.getAttribute("key") != setup:
                                        continue
                                self.addItems(list, x.childNodes);
-                               myTitle = getValbyAttr(x, "title")
-               
+                               myTitle = x.getAttribute("title").encode("UTF-8")
+
                #check for list.entries > 0 else self.close
                
                self["config"] = ConfigList(list)
@@ -178,3 +122,57 @@ class Setup(Screen):
 
        def createSummary(self):
                return SetupSummary
+
+       def addItems(self, list, childNode):
+               for x in childNode:
+                       if x.nodeType != xml.dom.minidom.Element.nodeType:
+                               continue
+                       elif x.tagName == 'item':
+                               item_text = _(x.getAttribute("text").encode("UTF-8") or "??")
+                               b = eval(XMLTools.mergeText(x.childNodes));
+                               print "item " + item_text + " " + b.configPath
+                               if b == "":
+                                       continue
+                               #add to configlist
+                               item = b.controlType(b)
+                               
+                               # the first b is the item itself, ignored by the configList.
+                               # the second one is converted to string.
+                               list.append( (item_text, item) )
+
+       def handleKey(self, key):
+               # ignore keys when not enabled
+               if self["config"].getCurrent()[1].parent.enabled:
+                       self["config"].handleKey(config.key[key])
+                       print self["config"].getCurrent()
+                       self.changedEntry()
+
+       def keyOk(self):
+               self.handleKey("choseElement")
+
+       def keyLeft(self):
+               self.handleKey("prevElement")
+
+       def keyRight(self):
+               self.handleKey("nextElement")
+
+       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 keyNumberGlobal(self, number):
+               self.handleKey(str(number))
+
+def getSetupTitle(id):
+       xmldata = setupdom.childNodes[0].childNodes
+       for x in elementsWithTag(xmldata, "setup"):
+               if x.getAttribute("key") == id:
+                       return x.getAttribute("title").encode("UTF-8")