X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1837e66b4c16260152cc9e98d7331dea368ea565..2622fe6c295525637d23e65e54e5a506d728ff7d:/lib/python/Screens/Menu.py diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 4d112abb..19b36045 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -1,34 +1,22 @@ -from Screen import * -from Components.Sources.MenuList import MenuList -from Components.ActionMap import ActionMap -from Components.Header import Header -from Components.Button import Button -from Components.Label import Label -from Components.ProgressBar import ProgressBar +from Screen import Screen +from Components.Sources.List import List +from Components.ActionMap import NumberActionMap +from Components.Sources.StaticText import StaticText from Components.config import configfile -from Components.Clock import Clock +from Components.PluginComponent import plugins +from Components.config import config from Tools.Directories import resolveFilename, SCOPE_SKIN -from enigma import quitMainloop - import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE -from skin import elementsWithTag -from Screens.Setup import * +from Screens.Setup import Setup, getSetupTitle from Tools import XMLTools -# some screens -def doGlobal(screen): - screen["clock"] = Clock() - - # self.setModeTV() # self.setModeRadio() # self.setModeFile() -# self.openDialog(ScartLoopThrough) # @@ -37,17 +25,6 @@ menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r') mdom = xml.dom.minidom.parseString(menufile.read()) menufile.close() - -def getValbyAttr(x, attr): - for p in range(x.attributes.length): - a = x.attributes.item(p) - attrib = str(a.name) - value = str(a.value) - if attrib == attr: - return value - - return "" - class boundFunction: def __init__(self, fnc, *args): self.fnc = fnc @@ -59,54 +36,46 @@ 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["Clock"] = 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): + + ALLOW_SUSPEND = True + def okbuttonClick(self): print "okbuttonClick" selection = self["menu"].getCurrent() - selection[1]() + if selection is not None: + selection[1]() def execText(self, text): exec text @@ -120,28 +89,29 @@ class Menu(Screen): # FIXME. somehow if arg[0] != "": exec "from " + arg[0] + " import *" - + self.openDialog(*eval(arg[1])) - def nothing(self): #dummy + def nothing(self): #dummy pass def openDialog(self, *dialog): # in every layer needed - self.session.open(*dialog) + self.session.openWithCallback(self.menuClosed, *dialog) def openSetup(self, dialog): self.session.openWithCallback(self.menuClosed, Setup, dialog) def addMenu(self, destList, node): - MenuTitle = _(getValbyAttr(node, "text")) - if MenuTitle != "": #check for title - x = getValbyAttr(node, "flushConfigOnClose") - if x == "1": - 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)) + 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, weight)) def menuClosedWithConfigFlush(self, *res): configfile.save() @@ -152,81 +122,123 @@ class Menu(Screen): self.close(True) def addItem(self, destList, node): - ItemText = _(getValbyAttr(node, "text")) - if ItemText != "": #check for name - for x in node.childNodes: - if x.nodeType != xml.dom.minidom.Element.nodeType: - continue - elif x.tagName == 'screen': - module = getValbyAttr(x, "module") - screen = getValbyAttr(x, "screen") - - if len(screen) == 0: - screen = module - - if module != "": - module = "Screens." + module - - # check for arguments. they will be appended to the - # openDialog call - args = XMLTools.mergeText(x.childNodes) - screen += ", " + args - - destList.append((ItemText, boundFunction(self.runScreen, (module, screen)))) - return - elif x.tagName == 'code': - destList.append((ItemText, boundFunction(self.execText, XMLTools.mergeText(x.childNodes)))) - return - elif x.tagName == 'setup': - id = getValbyAttr(x, "id") - destList.append((ItemText, boundFunction(self.openSetup, id))) - return - - destList.append((ItemText,self.nothing)) + 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 + elif x.tagName == 'screen': + module = x.getAttribute("module") or None + screen = x.getAttribute("screen") or None + + if screen is None: + screen = module + + print module, screen + if module: + module = "Screens." + module + else: + module = "" + + # check for arguments. they will be appended to the + # openDialog call + args = XMLTools.mergeText(x.childNodes) + screen += ", " + args + + 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, weight)) + return + elif x.tagName == 'setup': + id = x.getAttribute("id") + if item_text == "": + item_text = _(getSetupTitle(id)) + "..." + else: + item_text = _(item_text) + destList.append((item_text, boundFunction(self.openSetup, id), entryID, weight)) + return + destList.append((item_text, self.nothing, entryID, weight)) def __init__(self, session, parent, childNode): Screen.__init__(self, session) list = [] - menuID = "" - - menuID = -1 + + 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 + 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 elif x.tagName == "id": - menuID = getValbyAttr(x, "val") + menuID = x.getAttribute("val") count = 0 - if menuID != -1: + + if menuID is not None: + # menuupdater? 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), l[2], l[3] or 50)) + + + # for the skin: first try a menu_, then Menu + self.skinName = [ ] + if menuID is not None: + 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["menu"] = MenuList(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 = getValbyAttr(parent, "title") - if a == "": #if empty use name - a = _(getValbyAttr(parent, "text")) - self["title"] = Header(a) + + a = parent.getAttribute("title").encode("UTF-8") or None + 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) @@ -240,23 +252,5 @@ class MainMenu(Menu): #add file load functions for the xml-file def __init__(self, *x): - Menu.__init__(self, *x) self.skinName = "Menu" - - def openDialog(self, dialog): - self.session.open(dialog) - - def openSetup(self, dialog): - self.session.open(Setup, dialog) - - def setModeTV(self): - print "set Mode to TV" - pass - - def setModeRadio(self): - print "set Mode to Radio" - pass - - def setModeFile(self): - print "set Mode to File" - pass + Menu.__init__(self, *x)