X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0379aa0cb4aab6c748b483de790de3b896611a0c..96e58d2b58fa6b5712857ed01dfbeb770fe6c6d3:/lib/python/Screens/Setup.py
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 4deedb92..f352e8cb 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,16 +1,17 @@
from Screen import Screen
-from Components.ActionMap import ActionMap
-from Components.config import config #global config instance
-from Components.config import configBoolean
-from Components.ConfigList import ConfigList
+from Components.ActionMap import NumberActionMap
+from Components.config import config, ConfigNothing
+from Components.SystemInfo import SystemInfo
+from Components.ConfigList import ConfigListScreen
from Components.Label import Label
+from Components.Pixmap import Pixmap
import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
from skin import elementsWithTag
from Tools import XMLTools
+# FIXME: use resolveFile!
# read the setupmenu
try:
# first we search in the current path
@@ -21,86 +22,136 @@ 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
+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
+ 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 ""
+ def removeWatcher(self):
+ self.parent.onChangedEntry.remove(self.selectionChanged)
+ self.parent["config"].onSelectionChanged.remove(self.selectionChanged)
-class Setup(Screen):
+ def selectionChanged(self):
+ self["SetupEntry"].text = self.parent.getCurrentEntry()
+ self["SetupValue"].text = self.parent.getCurrentValue()
- 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):
- self["config"].handleKey(0)
- def keyLeft(self):
- self["config"].handleKey(1)
- def keyRight(self):
- self["config"].handleKey(2)
-
- 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()
+class Setup(ConfigListScreen, Screen):
- def __init__(self, session, setup):
- Screen.__init__(self, session)
+ ALLOW_SUSPEND = True
- print "request setup for " + setup
-
- xmldata = setupdom.childNodes[0]
-
- entries = xmldata.childNodes
+ 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.childNodes[0]
+ entries = xmldata.childNodes
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") != self.setup:
continue
self.addItems(list, x.childNodes);
-
- #check for list.entries > 0 else self.close
-
- self["config"] = ConfigList(list)
+ self.setup_title = x.getAttribute("title").encode("UTF-8")
+
+ def __init__(self, session, setup):
+ Screen.__init__(self, session)
+
+ # for the skin: first try a setup_, then Setup
+ self.skinName = ["setup_" + setup, "Setup" ]
- self["ok"] = Label("OK")
- self["cancel"] = Label("Cancel")
+ self.onChangedEntry = [ ]
- self["actions"] = ActionMap(["SetupActions"],
+ self.setup = setup
+ list = []
+ self.refill(list)
+
+ #check for list.entries > 0 else self.close
+ 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)
+ "save": self.keySave,
+ }, -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_level = int(x.getAttribute("level") or "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.getAttribute("requires")
+ if requires and not SystemInfo.get(requires, False):
+ continue;
+
+ 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.
+ if not isinstance(item, ConfigNothing):
+ list.append( (item_text, item) )
+
+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")
+ raise "unknown setup id '%s'!" % repr(id)