X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e10fc0cdba4f3bb57d088d831efb593c330324d0..b17019f43527d615589ce2083fb3d2a9058f2c3c:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 41a9cf51..59f0ff57 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,8 +1,8 @@
 from Screen import Screen
+from MessageBox import MessageBox
 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, KEY_LEFT, KEY_RIGHT, KEY_OK
+from Components.ConfigList import ConfigList, ConfigListScreen
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 
@@ -23,22 +23,12 @@ 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
-	
-	return ""
-
 class SetupSummary(Screen):
 	skin = """
-	<screen position="0,0" size="132,64">
-		<widget name="SetupTitle" position="0,0" size="132,16" font="Regular;12" />
-		<widget name="SetupEntry" position="0,16" size="132,32" font="Regular;12" />
-		<widget name="SetupValue" position="0,48" size="132,16" font="Regular;12" />
+	<screen position="6,0" size="120,64">
+		<widget name="SetupTitle" position="6,0" size="120,16" font="Regular;12" />
+		<widget name="SetupEntry" position="6,16" size="120,32" font="Regular;12" />
+		<widget name="SetupValue" position="6,48" size="120,16" font="Regular;12" />
 	</screen>"""
 
 	def __init__(self, session, parent):
@@ -63,7 +53,10 @@ class SetupSummary(Screen):
 		self["SetupEntry"].text = self.parent.getCurrentEntry()
 		self["SetupValue"].text = self.parent.getCurrentValue()
 
-class Setup(Screen):
+class Setup(ConfigListScreen, Screen):
+
+	ALLOW_SUSPEND = True
+
 	def __init__(self, session, setup):
 		Screen.__init__(self, session)
 
@@ -78,16 +71,13 @@ class Setup(Screen):
 			if x.nodeType != xml.dom.minidom.Element.nodeType:
 				continue
 			elif x.tagName == 'setup':
-				ItemText = getValbyAttr(x, "key")
-				if ItemText != setup:
+				if x.getAttribute("key") != setup:
 					continue
 				self.addItems(list, x.childNodes);
-				myTitle = getValbyAttr(x, "title")
-		
+				myTitle = x.getAttribute("title").encode("UTF-8")
+
 		#check for list.entries > 0 else self.close
 		
-		self["config"] = ConfigList(list)
-
 		self.setup_title = myTitle
 		self["title"] = Label(_(self.setup_title))
 
@@ -99,21 +89,10 @@ 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()
 
@@ -126,7 +105,7 @@ class Setup(Screen):
 		return self["config"].getCurrent()[0]
 
 	def getCurrentValue(self):
-		return str(self["config"].getCurrent()[1].parent.value)
+		return str(self["config"].getCurrent()[1].getText())
 
 	def createSummary(self):
 		return SetupSummary
@@ -136,45 +115,44 @@ class Setup(Screen):
 			if x.nodeType != xml.dom.minidom.Element.nodeType:
 				continue
 			elif x.tagName == 'item':
-				ItemText = _(getValbyAttr(x, "text"))
+				item_text = _(x.getAttribute("text").encode("UTF-8") or "??")
 				b = eval(XMLTools.mergeText(x.childNodes));
-				print "item " + ItemText + " " + b.configPath
 				if b == "":
 					continue
 				#add to configlist
-				item = b.controlType(b)
-				
+				item = b
 				# the first b is the item itself, ignored by the configList.
 				# the second one is converted to string.
-				list.append( (ItemText, item) )
-
-	def handleKey(self, key):
-		# ignore keys when not enabled
-		if self["config"].getCurrent()[1].parent.enabled:
-			self["config"].handleKey(config.key[key])
-			print self["config"].getCurrent()
-			self.changedEntry()
-
-	def keyOk(self):
-		self.handleKey("choseElement")
-
-	def keyLeft(self):
-		self.handleKey("prevElement")
-
-	def keyRight(self):
-		self.handleKey("nextElement")
+				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
 
-	def keyCancel(self):
 		print "cancel requested"
+		
 		for x in self["config"].list:
 			x[1].cancel()
 		self.close()
+
+	def keyCancel(self):
+		is_changed = False
+		for x in self["config"].list:
+			is_changed |= x[1].isChanged()
 		
-	def keyNumberGlobal(self, number):
-		self.handleKey(str(number))
+		if is_changed:
+			self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
+		else:
+			self.close()
+
+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")