the epgcache can now handle more then one channel(transponder),

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

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index ce73a954be9dda87595c70f2d02397186752246d..3b54577ee468077cdc4aa5a637f4e48675aae49a 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -11,12 +11,16 @@ from Components.Label import Label
 from Components.ProgressBar import ProgressBar
 from ConfigMenu import *
 
+from TimerEdit import *
+
 from enigma import quitMainloop
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 from skin import elementsWithTag
 
+from Tools import XMLTools
+
 # some screens
 def doGlobal(screen):
        screen["clock"] = Clock()
@@ -32,7 +36,7 @@ mdom = xml.dom.minidom.parseString(
                <item text="Radio-Mode">self.setModeRadio()</item>
                <item text="File-Mode">self.setModeFile()</item>
                <item text="Scart">self.openDialog(ScartLoopThrough)</item>
-               <item text="Timer"></item>
+               <item text="Timer">self.openDialog(TimerEditList)</item>
                <menu text="Setup">
                        <menu text="Service Organising">
                                <item text="New Bouquets"></item>
@@ -72,13 +76,6 @@ mdom = xml.dom.minidom.parseString(
                </menu>
        </menu>""")
 
-def getText(nodelist):
-       rc = ""
-       for node in nodelist:
-               if node.nodeType == node.TEXT_NODE:
-                       rc = rc + node.data
-       return rc
-
 def getValbyAttr(x, attr):
        for p in range(x.attributes.length):
                a = x.attributes.item(p)
@@ -157,6 +154,7 @@ class Menu(Screen):
                self.session.open(clockDisplay, Clock())
 
        def okbuttonClick(self):
+               print "okbuttonClick"
                selection = self["menu"].getCurrent()
                selection[1]()
 
@@ -176,7 +174,7 @@ class Menu(Screen):
        def addItem(self, destList, node):
                ItemText = getValbyAttr(node, "text")
                if ItemText != "":                                                                                                                                      #check for name
-                       b = getText(node.childNodes)
+                       b = XMLTools.mergeText(node.childNodes)
                        if b != "":                                                                                                                                                             #check for function
                                destList.append((ItemText,boundFunction(self.evalText,b)))
                        else: