allow overriding menus from plugins

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

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 22aee7d926de6108022868c5c468281acbaaa8ec..9f0db4254d9318698df21a78e07c7fb3a822b568 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -4,6 +4,7 @@ from Components.ActionMap import NumberActionMap
 from Components.Sources.StaticText import StaticText
 from Components.config import configfile
 from Components.PluginComponent import plugins
+from Components.config import config
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
@@ -73,7 +74,8 @@ class Menu(Screen):
        def okbuttonClick(self):
                print "okbuttonClick"
                selection = self["menu"].getCurrent()
-               selection[1]()
+               if selection is not None:
+                       selection[1]()
 
        def execText(self, text):
                exec text
@@ -170,8 +172,10 @@ class Menu(Screen):
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                            continue
                        elif x.tagName == 'item':
-                               self.addItem(list, x)
-                               count += 1
+                               item_level = int(x.getAttribute("level") or "0")
+                               if item_level <= config.usage.setup_level.index:
+                                       self.addItem(list, x)
+                                       count += 1
                        elif x.tagName == 'menu':
                                self.addMenu(list, x)
                                count += 1
@@ -190,8 +194,14 @@ class Menu(Screen):
                if menuID is not None:
                        # plugins
                        for l in plugins.getPluginsForMenu(menuID):
+                               # check if a plugin overrides an existing menu
+                               plugin_menuid = l[2]
+                               for x in list:
+                                       print x[2], plugin_menuid
+                                       if x[2] == plugin_menuid:
+                                               list.remove(x)
+                                               break
                                list.append((l[0], boundFunction(l[1], self.session), l[2], l[3] or 50))
-                                       
 
                # for the skin: first try a menu_<menuID>, then Menu
                self.skinName = [ ]