X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1068f9bc04ef901d7031026b1a9b25e32dd0da8a..b17019f43527d615589ce2083fb3d2a9058f2c3c:/lib/python/Screens/Setup.py diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py index d6215afd..59f0ff57 100644 --- a/lib/python/Screens/Setup.py +++ b/lib/python/Screens/Setup.py @@ -1,8 +1,8 @@ from Screen import Screen +from MessageBox import MessageBox from Components.ActionMap import NumberActionMap -from Components.config import config #global config instance -from Components.config import configSelection -from Components.ConfigList import ConfigList +from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_OK +from Components.ConfigList import ConfigList, ConfigListScreen from Components.Label import Label from Components.Pixmap import Pixmap @@ -12,6 +12,7 @@ from skin import elementsWithTag from Tools import XMLTools +# FIXME: use resolveFile! # read the setupmenu try: # first we search in the current path @@ -22,89 +23,63 @@ except: setupdom = xml.dom.minidom.parseString(setupfile.read()) setupfile.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 Setup(Screen): +class SetupSummary(Screen): + skin = """ + + + + + """ - 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 keyOk(self): - if (self["config"].getCurrent()[1].parent.enabled == True): - self["config"].handleKey(config.key["choseElement"]) - def keyLeft(self): - if (self["config"].getCurrent()[1].parent.enabled == True): - self["config"].handleKey(config.key["prevElement"]) - def keyRight(self): - if (self["config"].getCurrent()[1].parent.enabled == True): - self["config"].handleKey(config.key["nextElement"]) + 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() + + def removeWatcher(self): + self.parent.onChangedEntry.remove(self.selectionChanged) + self.parent["config"].onSelectionChanged.remove(self.selectionChanged) - def keySave(self): - print "save requested" - for x in self["config"].list: - x[1].save() - self.close() + def selectionChanged(self): + self["SetupEntry"].text = self.parent.getCurrentEntry() + self["SetupValue"].text = self.parent.getCurrentValue() - def keyCancel(self): - print "cancel requested" - for x in self["config"].list: - x[1].cancel() - self.close() - - def keyNumberGlobal(self, number): - print "You pressed number " + str(number) - if (self["config"].getCurrent()[1].parent.enabled == True): - self["config"].handleKey(config.key[str(number)]) +class Setup(ConfigListScreen, Screen): + 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 = getValbyAttr(x, "title") - + myTitle = x.getAttribute("title").encode("UTF-8") + #check for list.entries > 0 else self.close - self["config"] = ConfigList(list) - - self["title"] = Label(_(myTitle)); + self.setup_title = myTitle + self["title"] = Label(_(self.setup_title)) self["oktext"] = Label(_("OK")) self["canceltext"] = Label(_("Cancel")) @@ -114,18 +89,70 @@ class Setup(Screen): self["actions"] = NumberActionMap(["SetupActions"], { "cancel": self.keyCancel, - "ok": self.keyOk, - "left": self.keyLeft, - "right": self.keyRight, "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) + }, -2) + + ConfigListScreen.__init__(self, list, session = session, on_change = self.changedEntry) + + 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].getText()) + + 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)); + if b == "": + continue + #add to configlist + item = 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 keySave(self): + print "save requested" + for x in self["config"].list: + x[1].save() + self.close() + + def cancelConfirm(self, result): + if not result: + return + + print "cancel requested" + + for x in self["config"].list: + x[1].cancel() + self.close() + + def keyCancel(self): + is_changed = False + for x in self["config"].list: + is_changed |= x[1].isChanged() + + if is_changed: + self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?")) + else: + self.close() + +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")