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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 48c85c8e..9c5c1e7d 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,13 +1,11 @@
 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
+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
@@ -92,7 +90,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 +103,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 +113,11 @@ 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 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 == "":
@@ -125,25 +128,6 @@ class Setup(ConfigListScreen, Screen):
 				# 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?"))
-
 def getSetupTitle(id):
 	xmldata = setupdom.childNodes[0].childNodes
 	for x in elementsWithTag(xmldata, "setup"):