X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/21ef24675a83e78934de665d2a5511141c8e6cf1..b0bdeff2a2042c42b6370b166de0474c3431570b:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 48c85c8e..3ff0b76e 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,15 +1,12 @@
 from Screen import Screen
-from MessageBox import MessageBox
 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.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!
@@ -57,28 +54,39 @@ 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)
+
+		# for the skin: first try a setup_<setupID>, 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.setup_title = myTitle
 		self["title"] = Label(_(self.setup_title))
 
 		self["oktext"] = Label(_("OK"))
@@ -92,7 +100,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()
 
@@ -105,7 +113,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
@@ -115,6 +123,19 @@ 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
+
+				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 == "":
@@ -123,29 +144,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 cancelConfirm(self, result):
-		if not result:
-			return
-
-		print "cancel requested"
-		
-		for x in self["config"].list:
-			x[1].cancel()
-		self.close()
-
-	def keyCancel(self):
-		self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
+				if not isinstance(item, ConfigNothing):
+					list.append( (item_text, item) )
 
 def getSetupTitle(id):
 	xmldata = setupdom.childNodes[0].childNodes
-	for x in elementsWithTag(xmldata, "setup"):
+	for x in XMLTools.elementsWithTag(xmldata, "setup"):
 		if x.getAttribute("key") == id:
 			return x.getAttribute("title").encode("UTF-8")
+	raise "unknown setup id '%s'!" % repr(id)