X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FSetup.py;h=f352e8cb0e026aaf227b6e665602cb1a8e37c9e6;hb=04f4636324ab06c5a3a4f618100048e159eaf6f9;hp=d6215afdad226e16c545cbe1691e9de5748d6b72;hpb=1068f9bc04ef901d7031026b1a9b25e32dd0da8a;p=vuplus_dvbapp
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index d6215af..f352e8c 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,17 +1,17 @@
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.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
@@ -22,89 +22,74 @@ 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):
- 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 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):
- 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)
+ def removeNotifier(self):
+ config.usage.setup_level.notifiers.remove(self.levelChanged)
- print "request setup for " + setup
-
+ def levelChanged(self, configElement):
+ list = []
+ self.refill(list)
+ self["config"].setList(list)
+
+ def refill(self, list):
xmldata = setupdom.childNodes[0]
-
entries = xmldata.childNodes
-
- 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") != self.setup:
continue
self.addItems(list, x.childNodes);
- myTitle = getValbyAttr(x, "title")
-
- #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)
- self["title"] = Label(_(myTitle));
+ # for the skin: first try a setup_, then Setup
+ self.skinName = ["setup_" + setup, "Setup" ]
+
+ self.onChangedEntry = [ ]
+
+ 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"))
@@ -114,18 +99,59 @@ 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_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)