Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
[enigma2.git] / lib / python / Screens / Menu.py
index 6ea0f647e1211ffc8bd56487c8f65993635e6f2f..92039b429fa4679d860137f8760dbbde14cc2bf8 100644 (file)
@@ -1,9 +1,11 @@
 from Screen import Screen
 from Components.Sources.List import List
-from Components.ActionMap import ActionMap
+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 Components.SystemInfo import SystemInfo
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
@@ -35,13 +37,13 @@ class MenuUpdater:
        def __init__(self):
                self.updatedMenuItems = {}
        
-       def addMenuItem(self, id, pos, text, module, screen):
+       def addMenuItem(self, id, pos, text, module, screen, weight):
                if not self.updatedMenuAvailable(id):
                        self.updatedMenuItems[id] = []
-               self.updatedMenuItems[id].append([text, pos, module, screen])
+               self.updatedMenuItems[id].append([text, pos, module, screen, weight])
        
-       def delMenuItem(self, id, pos, text, module, screen):
-               self.updatedMenuItems[id].remove([text, pos, module, screen])
+       def delMenuItem(self, id, pos, text, module, screen, weight):
+               self.updatedMenuItems[id].remove([text, pos, module, screen, weight])
        
        def updatedMenuAvailable(self, id):
                return self.updatedMenuItems.has_key(id)
@@ -73,7 +75,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
@@ -100,15 +103,19 @@ class Menu(Screen):
                self.session.openWithCallback(self.menuClosed, Setup, dialog)
 
        def addMenu(self, destList, node):
+               requires = node.getAttribute("requires")
+               if requires and not SystemInfo.get(requires, False):
+                       return
                MenuTitle = _(node.getAttribute("text").encode("UTF-8") or "??")
                entryID = node.getAttribute("entryID") or "undefined"
+               weight = node.getAttribute("weight") or 50
                x = node.getAttribute("flushConfigOnClose")
                if x:
                        a = boundFunction(self.session.openWithCallback, self.menuClosedWithConfigFlush, Menu, node, node.childNodes)
                else:
                        a = boundFunction(self.session.openWithCallback, self.menuClosed, Menu, node, node.childNodes)
                #TODO add check if !empty(node.childNodes)
-               destList.append((MenuTitle, a, entryID))
+               destList.append((MenuTitle, a, entryID, weight))
 
        def menuClosedWithConfigFlush(self, *res):
                configfile.save()
@@ -119,8 +126,12 @@ class Menu(Screen):
                        self.close(True)
 
        def addItem(self, destList, node):
+               requires = node.getAttribute("requires")
+               if requires and not SystemInfo.get(requires, False):
+                       return
                item_text = node.getAttribute("text").encode("UTF-8")
                entryID = node.getAttribute("entryID") or "undefined"
+               weight = node.getAttribute("weight") or 50
                for x in node.childNodes:
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
@@ -142,10 +153,10 @@ class Menu(Screen):
                                args = XMLTools.mergeText(x.childNodes)
                                screen += ", " + args
 
-                               destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen)), entryID))
+                               destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen)), entryID, weight))
                                return
                        elif x.tagName == 'code':
-                               destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes)), entryID))
+                               destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes)), entryID, weight))
                                return
                        elif x.tagName == 'setup':
                                id = x.getAttribute("id")
@@ -153,9 +164,9 @@ class Menu(Screen):
                                        item_text = _(getSetupTitle(id)) + "..."
                                else:
                                        item_text = _(item_text)
-                               destList.append((item_text, boundFunction(self.openSetup, id), entryID))
+                               destList.append((item_text, boundFunction(self.openSetup, id), entryID, weight))
                                return
-               destList.append((item_text, self.nothing, entryID))
+               destList.append((item_text, self.nothing, entryID, weight))
 
 
        def __init__(self, session, parent, childNode):
@@ -168,8 +179,11 @@ 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
@@ -182,13 +196,19 @@ class Menu(Screen):
                                if menuupdater.updatedMenuAvailable(menuID):
                                        for x in menuupdater.getUpdatedMenu(menuID):
                                                if x[1] == count:
-                                                       list.append((x[0], boundFunction(self.runScreen, (x[2], x[3] + ", "))))
+                                                       list.append((x[0], boundFunction(self.runScreen, (x[2], x[3] + ", ")), x[4]))
                                                        count += 1
 
                if menuID is not None:
                        # plugins
                        for l in plugins.getPluginsForMenu(menuID):
-                               list.append((l[0], boundFunction(l[1], self.session)))
+                               # check if a plugin overrides an existing menu
+                               plugin_menuid = l[2]
+                               for x in list:
+                                       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 = [ ]
@@ -196,21 +216,43 @@ class Menu(Screen):
                        self.skinName.append("menu_" + menuID)
                self.skinName.append("Menu")
 
+               # Sort by Weight
+               list.sort(key=lambda x: int(x[3]))
+
                self["menu"] = List(list)
 
-               self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
+               self["actions"] = NumberActionMap(["OkCancelActions", "MenuActions", "NumberActions"],
                        {
                                "ok": self.okbuttonClick,
                                "cancel": self.closeNonRecursive,
-                               "menu": self.closeRecursive
+                               "menu": self.closeRecursive,
+                               "1": self.keyNumberGlobal,
+                               "2": self.keyNumberGlobal,
+                               "3": self.keyNumberGlobal,
+                               "4": self.keyNumberGlobal,
+                               "5": self.keyNumberGlobal,
+                               "6": self.keyNumberGlobal,
+                               "7": self.keyNumberGlobal,
+                               "8": self.keyNumberGlobal,
+                               "9": self.keyNumberGlobal
                        })
-               
+
                a = parent.getAttribute("title").encode("UTF-8") or None
+               a = a and _(a)
                if a is None:
                        a = _(parent.getAttribute("text").encode("UTF-8"))
                self["title"] = StaticText(a)
                self.menu_title = a
 
+       def keyNumberGlobal(self, number):
+               print "menu keyNumber:", number
+               # Calculate index
+               number -= 1
+
+               if len(self["menu"].list) > number:
+                       self["menu"].setIndex(number)
+                       self.okbuttonClick()
+
        def closeNonRecursive(self):
                self.close(False)