X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/78950dbe85f5eafb3adb817eef742654d1f84e5a..cffee89d7b3567ee92901f6963108c33ea3ac469:/lib/python/Screens/Setup.py diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py index c643c750..746c26d3 100644 --- a/lib/python/Screens/Setup.py +++ b/lib/python/Screens/Setup.py @@ -1,10 +1,10 @@ from Screen import Screen -from Components.ActionMap import ActionMap +from Components.ActionMap import NumberActionMap from Components.config import config #global config instance -from Components.config import configEntry -from Components.config import configBoolean +from Components.config import configSelection from Components.ConfigList import ConfigList from Components.Label import Label +from Components.Pixmap import Pixmap import xml.dom.minidom from xml.dom import EMPTY_NAMESPACE @@ -12,91 +12,167 @@ from skin import elementsWithTag from Tools import XMLTools +# FIXME: use resolveFile! # read the setupmenu try: # first we search in the current path - setupfile = file('data/menu.xml', 'r') + setupfile = file('data/setup.xml', 'r') except: # if not found in the current path, we use the global datadir-path setupfile = file('/usr/share/enigma2/setup.xml', 'r') setupdom = xml.dom.minidom.parseString(setupfile.read()) setupfile.close() +class SetupSummary(Screen): + skin = """ + + + + + """ -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 + def __init__(self, session, parent): + Screen.__init__(self, session) + self["SetupTitle"] = Label(_(parent.setup_title)) + self["SetupEntry"] = Label("") + self["SetupValue"] = Label("") + self.parent = parent + self.onShow.append(self.addWatcher) + self.onHide.append(self.removeWatcher) + + def addWatcher(self): + self.parent.onChangedEntry.append(self.selectionChanged) + self.parent["config"].onSelectionChanged.append(self.selectionChanged) + self.selectionChanged() - return "" - -class Setup(Screen): + def removeWatcher(self): + self.parent.onChangedEntry.remove(self.selectionChanged) + self.parent["config"].onSelectionChanged.remove(self.selectionChanged) - def addItems(self, list, childNode): - for x in childNode: - if x.nodeType != xml.dom.minidom.Element.nodeType: - continue - elif x.tagName == 'item': - ItemText = getValbyAttr(x, "text") - b = eval(XMLTools.mergeText(x.childNodes)); - print "item " + ItemText + " " + b.configPath - if b == "": - continue - #add to configlist - item = b.controlType(b) - - # the first b is the item itself, ignored by the configList. - # the second one is converted to string. - list.append( (ItemText, item) ) + def selectionChanged(self): + self["SetupEntry"].text = self.parent.getCurrentEntry() + self["SetupValue"].text = self.parent.getCurrentValue() - def keyOk(self): - self["config"].handleKey(0) - def keyLeft(self): - self["config"].handleKey(1) - def keyRight(self): - self["config"].handleKey(2) +class Setup(Screen): - def keySave(self): - print "save requested" - for x in self["config"]: - selection = self["config"].getCurrent() - selection.save() + ALLOW_SUSPEND = True def __init__(self, session, setup): Screen.__init__(self, session) - print "request setup for " + setup - xmldata = setupdom.childNodes[0] entries = xmldata.childNodes + self.onChangedEntry = [ ] list = [] for x in entries: #walk through the actual nodelist if x.nodeType != xml.dom.minidom.Element.nodeType: continue elif x.tagName == 'setup': - ItemText = getValbyAttr(x, "key") - if ItemText != setup: + if x.getAttribute("key") != setup: continue self.addItems(list, x.childNodes); - + myTitle = x.getAttribute("title").encode("UTF-8") + #check for list.entries > 0 else self.close self["config"] = ConfigList(list) - self["ok"] = Label("OK") - self["cancel"] = Label("Cancel") + self.setup_title = myTitle + self["title"] = Label(_(self.setup_title)) - self["actions"] = ActionMap(["SetupActions"], + self["oktext"] = Label(_("OK")) + self["canceltext"] = Label(_("Cancel")) + self["ok"] = Pixmap() + self["cancel"] = Pixmap() + + self["actions"] = NumberActionMap(["SetupActions"], { - "cancel": self.close, + "cancel": self.keyCancel, "ok": self.keyOk, "left": self.keyLeft, "right": self.keyRight, - "save": self.keySave - }) + "save": self.keySave, + "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, + "0": self.keyNumberGlobal + }, -1) + + self.changedEntry() + + # for summary: + def changedEntry(self): + for x in self.onChangedEntry: + x() + + def getCurrentEntry(self): + return self["config"].getCurrent()[0] + + def getCurrentValue(self): + return str(self["config"].getCurrent()[1].parent.value) + + def createSummary(self): + return SetupSummary + + def addItems(self, list, childNode): + for x in childNode: + if x.nodeType != xml.dom.minidom.Element.nodeType: + continue + elif x.tagName == 'item': + item_text = _(x.getAttribute("text").encode("UTF-8") or "??") + b = eval(XMLTools.mergeText(x.childNodes)); + print "item " + item_text + " " + b.configPath + if b == "": + continue + #add to configlist + item = b.controlType(b) + + # the first b is the item itself, ignored by the configList. + # the second one is converted to string. + list.append( (item_text, item) ) + + def handleKey(self, key): + # ignore keys when not enabled + if self["config"].getCurrent()[1].parent.enabled: + self["config"].handleKey(config.key[key]) + print self["config"].getCurrent() + self.changedEntry() + + def keyOk(self): + self.handleKey("choseElement") + + def keyLeft(self): + self.handleKey("prevElement") + + def keyRight(self): + self.handleKey("nextElement") + + def keySave(self): + print "save requested" + for x in self["config"].list: + x[1].save() + self.close() + + def keyCancel(self): + print "cancel requested" + for x in self["config"].list: + x[1].cancel() + self.close() + + def keyNumberGlobal(self, number): + self.handleKey(str(number)) + +def getSetupTitle(id): + xmldata = setupdom.childNodes[0].childNodes + for x in elementsWithTag(xmldata, "setup"): + if x.getAttribute("key") == id: + return x.getAttribute("title").encode("UTF-8")