X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eabcf8e80696baf83ecfac2aa44cf5a4853c4679..6eeefece35e4269e02fdb7abab4f79d8e7b8f98b:/lib/python/Screens/Menu.py diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index fd2f2761..6ef4cc4e 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -1,18 +1,14 @@ -from Screen import * -from Components.MenuList import MenuList +from Screen import Screen +from Components.Sources.MenuList import MenuList from Components.ActionMap import ActionMap from Components.Header import Header - -# hack ... must be made dynamic -from Screens.Setup import Setup -from ServiceScan import ServiceScan -from ScartLoopThrough import ScartLoopThrough from Components.Button import Button from Components.Label import Label from Components.ProgressBar import ProgressBar -from ConfigMenu import * +from Components.config import configfile +from Components.Sources.Clock import Clock -from TimerEdit import * +from Tools.Directories import resolveFilename, SCOPE_SKIN from enigma import quitMainloop @@ -20,75 +16,21 @@ import xml.dom.minidom from xml.dom import EMPTY_NAMESPACE from skin import elementsWithTag +from Screens.Setup import Setup, getSetupTitle + from Tools import XMLTools -# some screens -def doGlobal(screen): - screen["clock"] = Clock() - - -mdom = xml.dom.minidom.parseString( - """ - - quitMainloop() - self.openDialog(ServiceScan) - - self.openSetup("rc") - self.openSetup("blasel") - - self.setModeTV() - self.setModeRadio() - self.setModeFile() - self.openDialog(ScartLoopThrough) - self.openDialog(TimerEditList) - - - - - - - - - - - - self.openDialog(ServiceScan) - - - - - - - - - - self.openDialog(configOSD) - - - - - - - - - - - - - - self.goSetup() - - """) - -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 "" +# self.setModeTV() +# self.setModeRadio() +# self.setModeFile() +# self.openDialog(ScartLoopThrough) +# + + +# read the menu +menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r') +mdom = xml.dom.minidom.parseString(menufile.read()) +menufile.close() class boundFunction: def __init__(self, fnc, *args): @@ -96,118 +38,200 @@ class boundFunction: self.args = args def __call__(self): self.fnc(*self.args) - -class configOSD(Screen): - #this needs focus handling - so not useable - - def okbuttonClick(self): - self.close - - def __init__(self, session): + +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) + 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) - 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) + def selectionChanged(self): + self["MenuEntry"].setText(self.parent["menu"].getCurrent()[0]) - 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 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.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") - 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 "??") + 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)) + + 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") + 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)))) + return + elif x.tagName == 'code': + destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes)))) + 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))) + return + + destList.append((item_text,self.nothing)) + def __init__(self, session, parent, childNode): 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 = x.getAttribute("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 = parent.getAttribute("title").encode("UTF-8") or None + if a is None: + a = _(parent.getAttribute("text").encode("UTF-8")) self["title"] = Header(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) @@ -219,9 +243,6 @@ class MainMenu(Menu): 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 @@ -233,9 +254,3 @@ class MainMenu(Menu): def setModeFile(self): print "set Mode to File" pass - - def goScan(self): - self.session.open(ServiceScan) - - def goClock(self): - self.session.open(clockDisplay, Clock())