X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FSetup.py;h=7e4f03a31bfb4c31fc3b8b73148a8a26379bdf1e;hp=0d4764acfb214e0a8a2ad605181665ecf9643348;hb=HEAD;hpb=3c91232d1ade05d5b7bd393ec41c1673c80b8f45 diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py old mode 100644 new mode 100755 index 0d4764a..7e4f03a --- a/lib/python/Screens/Setup.py +++ b/lib/python/Screens/Setup.py @@ -1,16 +1,12 @@ from Screen import Screen 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.Label import Label -from Components.Pixmap import Pixmap +from Components.config import config, ConfigNothing +from Components.SystemInfo import SystemInfo +from Components.ConfigList import ConfigListScreen +from Components.Sources.StaticText import StaticText +from enigma import eEnv -import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE -from skin import elementsWithTag - -from Tools import XMLTools +import xml.etree.cElementTree # FIXME: use resolveFile! # read the setupmenu @@ -19,32 +15,39 @@ try: 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 = file(eEnv.resolve('${datadir}/enigma2/setup.xml'), 'r') +setupdom = xml.etree.cElementTree.parse(setupfile) setupfile.close() +def getConfigMenuItem(configElement): + for item in setupdom.getroot().findall('./setup/item/.'): + if item.text == configElement: + return _(item.attrib["text"]), eval(configElement) + return "", None + +class SetupError(Exception): + def __init__(self, message): + self.msg = message + + def __str__(self): + return self.msg + class SetupSummary(Screen): - skin = """ - - - - - """ def __init__(self, session, parent): - Screen.__init__(self, session) - self["SetupTitle"] = Label(_(parent.setup_title)) - self["SetupEntry"] = Label("") - self["SetupValue"] = Label("") - self.parent = parent + + Screen.__init__(self, session, parent = parent) + self["SetupTitle"] = StaticText(_(parent.setup_title)) + self["SetupEntry"] = StaticText("") + self["SetupValue"] = StaticText("") 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) @@ -53,58 +56,67 @@ class SetupSummary(Screen): self["SetupEntry"].text = self.parent.getCurrentEntry() self["SetupValue"].text = self.parent.getCurrentValue() -class Setup(Screen): +class Setup(ConfigListScreen, Screen): + + ALLOW_SUSPEND = True + + def removeNotifier(self): + config.usage.setup_level.notifiers.remove(self.levelChanged) + + def levelChanged(self, configElement): + list = [] + self.refill(list) + self["config"].setList(list) + + def removeEntryNotifier(self): + if self.needEntryChange: + for item in self.needEntryChange: + if self.entryChanged in item.notifiers: + item.notifiers.remove(self.entryChanged) + + def entryChanged(self, configElement): + list = [] + self.refill(list) + self["config"].setList(list) + + def refill(self, list): + xmldata = setupdom.getroot() + for x in xmldata.findall("setup"): + if x.get("key") != self.setup: + continue + self.addItems(list, x); + self.setup_title = x.get("title", "").encode("UTF-8") + def __init__(self, session, setup): Screen.__init__(self, session) - - xmldata = setupdom.childNodes[0] - - entries = xmldata.childNodes + # for the skin: first try a setup_, then Setup + self.skinName = ["setup_" + setup, "Setup" ] self.onChangedEntry = [ ] + + self.needEntryChange = [ ] + + self.setup = setup list = [] - - for x in entries: #walk through the actual nodelist - if x.nodeType != xml.dom.minidom.Element.nodeType: - continue - elif x.tagName == 'setup': - if x.getAttribute("key") != setup: - continue - self.addItems(list, x.childNodes); - myTitle = x.getAttribute("title").encode("UTF-8") + self.refill(list) #check for list.entries > 0 else self.close - - self["config"] = ConfigList(list) + self["key_red"] = StaticText(_("Cancel")) + self["key_green"] = StaticText(_("OK")) - self.setup_title = myTitle - self["title"] = Label(_(self.setup_title)) - - self["oktext"] = Label(_("OK")) - self["canceltext"] = Label(_("Cancel")) - self["ok"] = Pixmap() - self["cancel"] = Pixmap() - 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() + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(_(self.setup_title)) # for summary: def changedEntry(self): @@ -115,61 +127,50 @@ class Setup(Screen): return self["config"].getCurrent()[0] def getCurrentValue(self): - return str(self["config"].getCurrent()[1].parent.value) + 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)); - print "item " + item_text + " " + b.configPath + def addItems(self, list, parentNode): + self.needEntryChange = [ ] + for x in parentNode: + if x.tag == 'item': + item_level = int(x.get("level", 0)) + + if not self.levelChanged in config.usage.setup_level.notifiers: + config.usage.setup_level.notifiers.append(self.levelChanged) + self.onClose.append(self.removeNotifier) + + if item_level > config.usage.setup_level.index: + continue + + requires = x.get("requires") + if requires and not SystemInfo.get(requires, False): + continue; + + item_text = _(x.get("text", "??").encode("UTF-8")) + b = eval(x.text or ""); if b == "": continue #add to configlist - item = b.controlType(b) - + 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 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)) + if not isinstance(item, ConfigNothing): + list.append( (item_text, item) ) + + needentrychange = x.get("entrychange") + if needentrychange == "yes": + self.needEntryChange.append(item) + if not self.entryChanged in item.notifiers: + item.notifiers.append(self.entryChanged) + if not self.removeEntryNotifier in self.onClose: + self.onClose.append(self.removeEntryNotifier) 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") + xmldata = setupdom.getroot() + for x in xmldata.findall("setup"): + if x.get("key") == id: + return x.get("title", "").encode("UTF-8") + raise SetupError("unknown setup id '%s'!" % repr(id))