use Tools.Directories to get paths

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

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 9eefddf71e75f5d039b67a3ff39f1f17f9ad3d91..68a8ef98bfca4c31ac86551499efaa8c6d951914 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -6,6 +6,8 @@ from Components.Button import Button
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
 
+from Tools.Directories import resolveFilename, SCOPE_SKIN
+
 from enigma import quitMainloop
 
 import xml.dom.minidom
@@ -29,12 +31,7 @@ def doGlobal(screen):
 
 
 # read the menu
-try:
-       # first we search in the current path
-       menufile = file('data/menu.xml', 'r')
-except IOError:
-       # if not found in the current path, we use the global datadir-path
-       menufile = file('/usr/share/enigma2/menu.xml', 'r')
+menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r')
 mdom = xml.dom.minidom.parseString(menufile.read())
 menufile.close()
 
@@ -55,7 +52,27 @@ class boundFunction:
                self.args = args
        def __call__(self):
                self.fnc(*self.args)
-
+               
+class MenuUpdater:
+       def __init__(self):
+               self.updatedMenuItems = {}
+       
+       def addMenuItem(self, id, text, module, screen):
+               if not self.updatedMenuAvailable(id):
+                       self.updatedMenuItems[id] = []
+               self.updatedMenuItems[id].append([text, module, screen])
+       
+       def delMenuItem(self, id, text, module, screen):
+               self.updatedMenuItems[id].remove([text, module, screen])
+       
+       def updatedMenuAvailable(self, id):
+               return self.updatedMenuItems.has_key(id)
+       
+       def getUpdatedMenu(self, id):
+               return self.updatedMenuItems[id]
+       
+menuupdater = MenuUpdater()
+               
 class Menu(Screen):
        def okbuttonClick(self):
                print "okbuttonClick"
@@ -71,10 +88,11 @@ class Menu(Screen):
                #        plus possible arguments, as 
                #        string (as we want to reference 
                #        stuff which is just imported)
-               # FIXME. somehow.
+               # FIXME. somehow
+               print arg
                if arg[0] != "":
-                       exec "from Screens." + arg[0] + " import *"
-               
+                       exec "from " + arg[0] + " import *"
+                       
                self.openDialog(*eval(arg[1]))
 
        def nothing(self):                                                                                                                                      #dummy
@@ -87,14 +105,14 @@ class Menu(Screen):
                self.session.open(Setup, dialog)
 
        def addMenu(self, destList, node):
-               MenuTitle = getValbyAttr(node, "text")
+               MenuTitle = _(getValbyAttr(node, "text"))
                if MenuTitle != "":                                                                                                                                     #check for title
                        a = boundFunction(self.session.open, Menu, node, node.childNodes)
                        #TODO add check if !empty(node.childNodes)
                        destList.append((MenuTitle, a))
                
        def addItem(self, destList, node):
-               ItemText = getValbyAttr(node, "text")
+               ItemText = _(getValbyAttr(node, "text"))
                if ItemText != "":                                                                                                                                      #check for name
                        for x in node.childNodes:
                                if x.nodeType != xml.dom.minidom.Element.nodeType:
@@ -105,6 +123,9 @@ class Menu(Screen):
 
                                        if len(screen) == 0:
                                                screen = module
+
+                                       if module != "":
+                                               module = "Screens." + module
                                        
                                        # check for arguments. they will be appended to the 
                                        # openDialog call
@@ -128,6 +149,7 @@ class Menu(Screen):
                Screen.__init__(self, session)
                
                list = []
+               menuID = ""
 
                for x in childNode:                                                     #walk through the actual nodelist
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
@@ -136,18 +158,25 @@ class Menu(Screen):
                                self.addItem(list, x)
                        elif x.tagName == 'menu':
                                self.addMenu(list, x)
+                       elif x.tagName == "id":
+                               menuID = getValbyAttr(x, "val")
+
+               if menuupdater.updatedMenuAvailable(menuID):
+                       for x in menuupdater.getUpdatedMenu(menuID):
+                               list.append((x[0], boundFunction(self.runScreen, (x[1], x[2] + ", "))))
 
                self["menu"] = MenuList(list)   
                                                        
-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
                        {
                                "ok": self.okbuttonClick,
-                               "cancel": self.close
+                               "cancel": self.close,
+                               "menu": self.close
                        })
                
                a = getValbyAttr(parent, "title")
                if a == "":                                                                                                             #if empty use name
-                       a = getValbyAttr(parent, "text")
+                       a = _(getValbyAttr(parent, "text"))
                self["title"] = Header(a)
 
 class MainMenu(Menu):