X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d9d6fde89ffbca9f094e369124d64353916a1e72..7cdca2a2cfb44ad34a3b36fb589f02b861c411c3:/lib/python/Screens/Menu.py diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 71d5123f..6ea0f647 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -1,219 +1,228 @@ -#from Screen import * -from Components.MenuList import MenuList +from Screen import Screen +from Components.Sources.List import List from Components.ActionMap import ActionMap -from Components.Header import Header +from Components.Sources.StaticText import StaticText +from Components.config import configfile +from Components.PluginComponent import plugins -# hack ... must be made dynamic -#from Screens.Setup import Setup -#from ServiceScan import ServiceScan -#from ScartLoopThrough import ScartLoopThrough -#from HarddiskSetup import HarddiskSelection -#from Components.Button import Button -#from Components.Label import Label -#from Components.ProgressBar import ProgressBar -#from ConfigMenu import * - -#from About import * - -#from Network import * - -#from TimerEdit import * - -# hack.... dynamically importing all screens -from __init__ import __all__ -for i in __all__: - print "import " + i - if (i is not "Menu" ): - exec "from " + i + " import *" - -from enigma import quitMainloop +from Tools.Directories import resolveFilename, SCOPE_SKIN import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE -from skin import elementsWithTag - -from Tools import XMLTools -# some screens -def doGlobal(screen): - screen["clock"] = Clock() +from Screens.Setup import Setup, getSetupTitle +from Tools import XMLTools # self.setModeTV() # self.setModeRadio() # self.setModeFile() -# self.openDialog(ScartLoopThrough) # # read the menu -try: - # first we search in the current path - menufile = file('data/menu.xml', 'r') -except: - # 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() - - -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 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 = """ + + + + + + + WithSeconds + + """ + + def __init__(self, session, parent): + Screen.__init__(self, session, parent) -class configOSD(Screen): - #this needs focus handling - so not useable - - def okbuttonClick(self): - self.close - - def __init__(self, session): - Screen.__init__(self, session) - - self["actions"] = ActionMap(["OkCancelActions"], - { - "ok": self.okbuttonClick, - "cancel": self.close - }) - - self["okbutton"] = Button("Save") - - self["txt_alpha"] = Label("Alpha:") - self["sld_alpha"] = ProgressBar() - self["sld_alpha"].setValue(50) - - self["txt_brightness"] = Label("Brightness:") - self["sld_brightness"] = ProgressBar() - self["sld_brightness"].setValue(50) +class Menu(Screen): - self["txt_gamma"] = Label("Contrast:") - self["sld_gamma"] = ProgressBar() - self["sld_gamma"].setValue(50) + ALLOW_SUSPEND = True -class Menu(Screen): def okbuttonClick(self): print "okbuttonClick" selection = self["menu"].getCurrent() selection[1]() - def evalText(self, text): - eval(text) - - def nothing(self): #dummy + 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 + if arg[0] != "": + exec "from " + arg[0] + " import *" + + self.openDialog(*eval(arg[1])) + + def nothing(self): #dummy pass - def openDialog(self, dialog): # in every layer needed - self.session.open(dialog) + def openDialog(self, *dialog): # in every layer needed + self.session.openWithCallback(self.menuClosed, *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") - if MenuTitle != "": #check for title - a = boundFunction(self.session.open, 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" + 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)) + + 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") - if ItemText != "": #check for name - b = XMLTools.mergeText(node.childNodes) - if b != "": #check for function - destList.append((ItemText,boundFunction(self.evalText,b))) - else: - destList.append((ItemText,self.nothing)) #use dummy as function + item_text = node.getAttribute("text").encode("UTF-8") + entryID = node.getAttribute("entryID") or "undefined" + 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)) + return + elif x.tagName == 'code': + destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes)), entryID)) + 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)) + return + destList.append((item_text, self.nothing, entryID)) + def __init__(self, session, parent, childNode): Screen.__init__(self, session) list = [] - - for x in childNode: #walk through the actual nodelist + + 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': self.addMenu(list, x) - - self["menu"] = MenuList(list) - - self["actions"] = ActionMap(["OkCancelActions"], + count += 1 + elif x.tagName == "id": + menuID = x.getAttribute("val") + count = 0 + + 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] + ", ")))) + count += 1 + + if menuID is not None: + # plugins + for l in plugins.getPluginsForMenu(menuID): + list.append((l[0], boundFunction(l[1], self.session))) + + # 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") + + self["menu"] = List(list) + + 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") - 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 -class FixedMenu(Screen): - def okbuttonClick(self): - selection = self["menu"].getCurrent() - selection[1]() + def closeNonRecursive(self): + self.close(False) - def __init__(self, session, title, list): - Screen.__init__(self, session) - - self["menu"] = MenuList(list) - - self["actions"] = ActionMap(["OkCancelActions"], - { - "ok": self.okbuttonClick, - "cancel": self.close - }) - - self["title"] = Header(title) + def closeRecursive(self): + self.close(True) + def createSummary(self): + return MenuSummary class MainMenu(Menu): #add file load functions for the xml-file - #remove old code (i.e. goScan / goClock...) 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 goSetup(self): - self.session.open(configTest) - - 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 - - def goScan(self): - self.session.open(ServiceScan) - - def goClock(self): - self.session.open(clockDisplay, Clock()) + Menu.__init__(self, *x)