X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eeefece35e4269e02fdb7abab4f79d8e7b8f98b..17784edbd0427870d890675059827f8cfbf12a9d:/lib/python/Screens/Menu.py diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 6ef4cc4e..9f0db425 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -1,20 +1,14 @@ from Screen import Screen -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 Components.Sources.List import List +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 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 Setup, getSetupTitle @@ -23,7 +17,6 @@ from Tools import XMLTools # self.setModeTV() # self.setModeRadio() # self.setModeFile() -# self.openDialog(ScartLoopThrough) # @@ -43,50 +36,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): @@ -95,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 @@ -109,27 +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 = _(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)) + destList.append((MenuTitle, a, entryID, weight)) def menuClosedWithConfigFlush(self, *res): configfile.save() @@ -141,6 +123,8 @@ 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 @@ -156,16 +140,16 @@ 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) 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)))) + destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes)), entryID, weight)) return elif x.tagName == 'setup': id = x.getAttribute("id") @@ -173,54 +157,94 @@ class Menu(Screen): 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): 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 = 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 - - self["menu"] = MenuList(list) - - self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], + 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_, 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["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) @@ -234,23 +258,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)