X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f2a67250266080d05742d961e544e7b8fba2611a..8e60bdc64c73787b8e7955a6a99ad5afe4a071ef:/lib/python/Screens/Menu.py diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 5ff929c6..5f2032f1 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -1,20 +1,18 @@ from Screen import Screen from Components.Sources.List import List -from Components.ActionMap import ActionMap -from Components.Header import Header -from Components.Label import Label +from Components.ActionMap import NumberActionMap +from Components.Sources.StaticText import StaticText from Components.config import configfile -from Components.Sources.Clock import Clock from Components.PluginComponent import plugins +from Components.config import config +from Components.SystemInfo import SystemInfo from Tools.Directories import resolveFilename, SCOPE_SKIN -import xml.dom.minidom +import xml.etree.cElementTree from Screens.Setup import Setup, getSetupTitle -from Tools import XMLTools - # self.setModeTV() # self.setModeRadio() # self.setModeFile() @@ -22,9 +20,7 @@ from Tools import XMLTools # read the menu -menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r') -mdom = xml.dom.minidom.parseString(menufile.read()) -menufile.close() +mdom = xml.etree.cElementTree.parse(resolveFilename(SCOPE_SKIN, 'menu.xml')) class boundFunction: def __init__(self, fnc, *args): @@ -37,51 +33,34 @@ 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) def getUpdatedMenu(self, id): return self.updatedMenuItems[id] - + menuupdater = MenuUpdater() class MenuSummary(Screen): skin = """ - - - + + + + + WithSeconds """ - def __init__(self, session, parent): - Screen.__init__(self, session) - self["MenuTitle"] = Label(parent.menu_title) - self["MenuEntry"] = Label("") - self["CurrentTime"] = Clock() - self.parent = parent - self.onShow.append(self.addWatcher) - self.onHide.append(self.removeWatcher) - - def addWatcher(self): - self.parent["menu"].onSelectionChanged.append(self.selectionChanged) - self.selectionChanged() - - def removeWatcher(self): - self.parent["menu"].onSelectionChanged.remove(self.selectionChanged) - - def selectionChanged(self): - self["MenuEntry"].setText(self.parent["menu"].getCurrent()[0]) - class Menu(Screen): ALLOW_SUSPEND = True @@ -89,7 +68,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 @@ -116,31 +96,39 @@ class Menu(Screen): self.session.openWithCallback(self.menuClosed, Setup, dialog) def addMenu(self, destList, node): - MenuTitle = _(node.getAttribute("text").encode("UTF-8") or "??") - x = node.getAttribute("flushConfigOnClose") + requires = node.get("requires") + if requires and not SystemInfo.get(requires, False): + return + MenuTitle = _(node.get("text", "??").encode("UTF-8")) + entryID = node.get("entryID", "undefined") + weight = node.get("weight", 50) + x = node.get("flushConfigOnClose") if x: - a = boundFunction(self.session.openWithCallback, self.menuClosedWithConfigFlush, Menu, node, node.childNodes) + a = boundFunction(self.session.openWithCallback, self.menuClosedWithConfigFlush, Menu, node) else: - a = boundFunction(self.session.openWithCallback, self.menuClosed, Menu, node, node.childNodes) + a = boundFunction(self.session.openWithCallback, self.menuClosed, Menu, node) #TODO add check if !empty(node.childNodes) - destList.append((MenuTitle, a)) + destList.append((MenuTitle, a, entryID, weight)) def menuClosedWithConfigFlush(self, *res): configfile.save() self.menuClosed(*res) def menuClosed(self, *res): - if len(res) and res[0]: + if res and res[0]: self.close(True) def addItem(self, destList, node): - item_text = node.getAttribute("text").encode("UTF-8") - for x in node.childNodes: - if x.nodeType != xml.dom.minidom.Element.nodeType: - continue - elif x.tagName == 'screen': - module = x.getAttribute("module") or None - screen = x.getAttribute("screen") or None + requires = node.get("requires") + if requires and not SystemInfo.get(requires, False): + return + item_text = node.get("text", "").encode("UTF-8") + entryID = node.get("entryID", "undefined") + weight = node.get("weight", 50) + for x in node: + if x.tag == 'screen': + module = x.get("module") + screen = x.get("screen") if screen is None: screen = module @@ -150,46 +138,45 @@ class Menu(Screen): module = "Screens." + module else: module = "" - - # check for arguments. they will be appended to the + + # check for arguments. they will be appended to the # openDialog call - args = XMLTools.mergeText(x.childNodes) + args = x.text or "" screen += ", " + args - - destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen)))) + + 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)))) + elif x.tag == 'code': + destList.append((_(item_text or "??"), boundFunction(self.execText, x.text), entryID, weight)) return - elif x.tagName == 'setup': - id = x.getAttribute("id") + elif x.tag == 'setup': + id = x.get("id") if item_text == "": item_text = _(getSetupTitle(id)) + "..." else: item_text = _(item_text) - destList.append((item_text, boundFunction(self.openSetup, id))) + destList.append((item_text, boundFunction(self.openSetup, id), entryID, weight)) return - - destList.append((item_text,self.nothing)) + destList.append((item_text, self.nothing, entryID, weight)) - def __init__(self, session, parent, childNode): + def __init__(self, session, parent): Screen.__init__(self, session) list = [] menuID = None - for x in childNode: #walk through the actual nodelist - if x.nodeType != xml.dom.minidom.Element.nodeType: - continue - elif x.tagName == 'item': - self.addItem(list, x) - count += 1 - elif x.tagName == 'menu': + for x in parent: #walk through the actual nodelist + if x.tag == 'item': + item_level = int(x.get("level", 0)) + if item_level <= config.usage.setup_level.index: + self.addItem(list, x) + count += 1 + elif x.tag == 'menu': self.addMenu(list, x) count += 1 - elif x.tagName == "id": - menuID = x.getAttribute("val") + elif x.tag == "id": + menuID = x.get("val") count = 0 if menuID is not None: @@ -197,13 +184,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_, then Menu self.skinName = [ ] @@ -211,21 +204,43 @@ class Menu(Screen): self.skinName.append("menu_" + menuID) self.skinName.append("Menu") - self["menu"] = List(list) + # Sort by Weight + list.sort(key=lambda x: int(x[3])) - self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], + self["menu"] = List(list) + + 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 = parent.get("title", "").encode("UTF-8") or None + a = a and _(a) if a is None: - a = _(parent.getAttribute("text").encode("UTF-8")) - self["title"] = Header(a) + a = _(parent.get("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)