X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/55bd830d52a2961ec57a6dec5969e8e7c0294c35..d43e4676bd757d1de73b8dd669154ffd42192b10:/lib/python/Screens/Menu.py diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 9eefddf7..f1a01348 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -5,6 +5,10 @@ from Components.Header import Header from Components.Button import Button from Components.Label import Label from Components.ProgressBar import ProgressBar +from Components.config import configfile +from Components.Clock import Clock + +from Tools.Directories import resolveFilename, SCOPE_SKIN from enigma import quitMainloop @@ -29,12 +33,7 @@ def doGlobal(screen): # read the menu -try: - # first we search in the current path - menufile = file('data/menu.xml', 'r') -except IOError: - # if not found in the current path, we use the global datadir-path - menufile = file('/usr/share/enigma2/menu.xml', 'r') +menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r') mdom = xml.dom.minidom.parseString(menufile.read()) menufile.close() @@ -55,6 +54,53 @@ class boundFunction: self.args = args def __call__(self): self.fnc(*self.args) + +class MenuUpdater: + def __init__(self): + self.updatedMenuItems = {} + + def addMenuItem(self, id, pos, text, module, screen): + if not self.updatedMenuAvailable(id): + self.updatedMenuItems[id] = [] + self.updatedMenuItems[id].append([text, pos, module, screen]) + + def delMenuItem(self, id, pos, text, module, screen): + self.updatedMenuItems[id].remove([text, pos, module, screen]) + + def updatedMenuAvailable(self, id): + return self.updatedMenuItems.has_key(id) + + def getUpdatedMenu(self, id): + return self.updatedMenuItems[id] + +menuupdater = MenuUpdater() + +class MenuSummary(Screen): + skin = """ + + + + + """ + + 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]) class Menu(Screen): def okbuttonClick(self): @@ -64,17 +110,17 @@ class Menu(Screen): def execText(self, text): exec text - + def runScreen(self, arg): # arg[0] is the module (as string) # arg[1] is Screen inside this module # plus possible arguments, as # string (as we want to reference # stuff which is just imported) - # FIXME. somehow. + # FIXME. somehow if arg[0] != "": - exec "from Screens." + arg[0] + " import *" - + exec "from " + arg[0] + " import *" + self.openDialog(*eval(arg[1])) def nothing(self): #dummy @@ -84,17 +130,29 @@ class Menu(Screen): self.session.open(*dialog) def openSetup(self, dialog): - self.session.open(Setup, dialog) + self.session.openWithCallback(self.menuClosed, Setup, dialog) def addMenu(self, destList, node): - MenuTitle = getValbyAttr(node, "text") + MenuTitle = _(getValbyAttr(node, "text")) if MenuTitle != "": #check for title - a = boundFunction(self.session.open, Menu, node, node.childNodes) + 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)) - + + def menuClosedWithConfigFlush(self, *res): + configfile.save() + self.menuClosed(*res) + + def menuClosed(self, *res): + if len(res) and res[0]: + self.close(True) + def addItem(self, destList, node): - ItemText = getValbyAttr(node, "text") + ItemText = _(getValbyAttr(node, "text")) if ItemText != "": #check for name for x in node.childNodes: if x.nodeType != xml.dom.minidom.Element.nodeType: @@ -105,6 +163,9 @@ class Menu(Screen): if len(screen) == 0: screen = module + + if module != "": + module = "Screens." + module # check for arguments. they will be appended to the # openDialog call @@ -128,27 +189,52 @@ class Menu(Screen): Screen.__init__(self, session) list = [] + menuID = "" - for x in childNode: #walk through the actual nodelist + menuID = -1 + 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': self.addMenu(list, x) + count += 1 + elif x.tagName == "id": + menuID = getValbyAttr(x, "val") + count = 0 + if menuID != -1: + 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] + ", ")))) + count += 1 + self["menu"] = MenuList(list) - self["actions"] = ActionMap(["OkCancelActions"], + self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], { "ok": self.okbuttonClick, - "cancel": self.close + "cancel": self.closeNonRecursive, + "menu": self.closeRecursive }) a = getValbyAttr(parent, "title") if a == "": #if empty use name - a = getValbyAttr(parent, "text") + a = _(getValbyAttr(parent, "text")) self["title"] = Header(a) + self.menu_title = a + + def closeNonRecursive(self): + self.close(False) + + def closeRecursive(self): + self.close(True) + + def createSummary(self): + return MenuSummary class MainMenu(Menu): #add file load functions for the xml-file