X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0f0da788f1bac851100f06d4292cb6cbb7d11327..34be902fbb3d1809348ef3b88b2d6617d34e524b:/lib/python/Screens/Menu.py diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 00f16722..22aee7d9 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -1,10 +1,8 @@ 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 Tools.Directories import resolveFilename, SCOPE_SKIN @@ -37,50 +35,36 @@ 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]) + Screen.__init__(self, session, parent) class Menu(Screen): @@ -118,13 +102,14 @@ class Menu(Screen): def addMenu(self, destList, node): 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() @@ -137,6 +122,7 @@ class Menu(Screen): def addItem(self, destList, node): 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 @@ -158,10 +144,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") @@ -169,9 +155,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): @@ -198,13 +184,14 @@ 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))) + 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 = [ ] @@ -212,21 +199,42 @@ 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 if a is None: a = _(parent.getAttribute("text").encode("UTF-8")) - self["title"] = Header(a) + 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)