X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6d7673190e7fec573aed8e15e98d470cd4189d52..1c21fe13bb453d0f11c8a40461b3bfe7dba5cef1:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 09984bd8..3439954d 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,12 +1,11 @@
 from Screen import Screen
 from Components.ActionMap import NumberActionMap
-from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_OK
-from Components.ConfigList import ConfigList, ConfigListScreen
+from Components.config import config, ConfigNothing
+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
@@ -56,28 +55,36 @@ 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)
+
+	def levelChanged(self, configElement):
+		list = []
+		self.refill(list)
+		self["config"].setList(list)
 
+	def refill(self, list):
 		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':
-				if x.getAttribute("key") != setup:
+				if x.getAttribute("key") != self.setup:
 					continue
 				self.addItems(list, x.childNodes);
-				myTitle = x.getAttribute("title").encode("UTF-8")
+				self.setup_title = x.getAttribute("title").encode("UTF-8")
+
+	def __init__(self, session, setup):
+		Screen.__init__(self, session)
+
+		self.onChangedEntry = [ ]
+
+		self.setup = setup
+		list = []
+		self.refill(list)
 
 		#check for list.entries > 0 else self.close
-		
-		self.setup_title = myTitle
 		self["title"] = Label(_(self.setup_title))
 
 		self["oktext"] = Label(_("OK"))
@@ -91,7 +98,7 @@ class Setup(ConfigListScreen, Screen):
 				"save": self.keySave,
 			}, -2)
 
-		ConfigListScreen.__init__(self, list, session = session)
+		ConfigListScreen.__init__(self, list, session = session, on_change = self.changedEntry)
 
 		self.changedEntry()
 
@@ -104,7 +111,7 @@ class Setup(ConfigListScreen, Screen):
 		return self["config"].getCurrent()[0]
 
 	def getCurrentValue(self):
-		return str(self["config"].getCurrent()[1].value)
+		return str(self["config"].getCurrent()[1].getText())
 
 	def createSummary(self):
 		return SetupSummary
@@ -114,6 +121,15 @@ class Setup(ConfigListScreen, Screen):
 			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
+
 				item_text = _(x.getAttribute("text").encode("UTF-8") or "??")
 				b = eval(XMLTools.mergeText(x.childNodes));
 				if b == "":
@@ -122,22 +138,12 @@ class Setup(ConfigListScreen, Screen):
 				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 keyCancel(self):
-		print "cancel requested"
-		for x in self["config"].list:
-			x[1].cancel()
-		self.close()
-		
+				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)