X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/363fdc8a15f569e878fd7f65cd0f771e0261c66c..15b64dc4fbead7b5c15cb309a82914f79ae78b0a:/lib/python/Screens/Setup.py
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
old mode 100644
new mode 100755
index 2981e25a..e9c3c680
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,16 +1,11 @@
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
-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
@@ -20,41 +15,32 @@ try:
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())
+setupdom = xml.etree.cElementTree.parse(setupfile)
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 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)
@@ -63,107 +49,54 @@ class SetupSummary(Screen):
self["SetupEntry"].text = self.parent.getCurrentEntry()
self["SetupValue"].text = self.parent.getCurrentValue()
-class Setup(Screen):
- def addItems(self, list, childNode):
- for x in childNode:
- if x.nodeType != xml.dom.minidom.Element.nodeType:
+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 refill(self, list):
+ xmldata = setupdom.getroot()
+ for x in xmldata.findall("setup"):
+ if x.get("key") != self.setup:
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 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))
+ 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.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':
- ItemText = getValbyAttr(x, "key")
- if ItemText != setup:
- continue
- self.addItems(list, x.childNodes);
- myTitle = getValbyAttr(x, "title")
-
- #check for list.entries > 0 else self.close
-
- self["config"] = ConfigList(list)
+ self.refill(list)
- self.setup_title = myTitle
- self["title"] = Label(_(self.setup_title))
+ #check for list.entries > 0 else self.close
+ self["key_red"] = StaticText(_("Cancel"))
+ self["key_green"] = StaticText(_("OK"))
- 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):
@@ -174,7 +107,41 @@ 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, parentNode):
+ 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
+ # the first b is the item itself, ignored by the configList.
+ # the second one is converted to string.
+ if not isinstance(item, ConfigNothing):
+ list.append( (item_text, item) )
+
+def getSetupTitle(id):
+ 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))