X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7581b23a6bc4823981e973c2cfcc33fbed171122..6eeefece35e4269e02fdb7abab4f79d8e7b8f98b:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 0886ddf1..b36a6b45 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,10 +1,9 @@
 from Screen import Screen
-from Components.ActionMap import ActionMap
-from Components.config import config				#global config instance
-from Components.config import configEntry
-from Components.config import configBoolean
-from Components.ConfigList import ConfigList
+from Components.ActionMap import NumberActionMap
+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
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
@@ -12,6 +11,7 @@ from skin import elementsWithTag
 
 from Tools import XMLTools
 
+# FIXME: use resolveFile!
 # read the setupmenu
 try:
 	# first we search in the current path
@@ -22,80 +22,122 @@ 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 = """
+	<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):
+		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) )
+class Setup(ConfigListScreen, Screen):
 
-	def keyOk(self):
-		self["config"].handleKey(0)
-	def keyLeft(self):
-		self["config"].handleKey(1)
-	def keyRight(self):
-		self["config"].handleKey(2)
-
-	def keySave(self):
-		print "save requested"
-		for x in self["config"]:
-			selection =	self["config"].getCurrent()
-			selection.save()
+	ALLOW_SUSPEND = True
 
 	def __init__(self, session, setup):
 		Screen.__init__(self, session)
 
-		print "request setup for " + setup
-		
 		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':
-				ItemText = getValbyAttr(x, "key")
-				if ItemText != setup:
+				if x.getAttribute("key") != setup:
 					continue
 				self.addItems(list, x.childNodes);
-		
+				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))
 
-		self["ok"] = Label("OK")
-		self["cancel"] = Label("Cancel")
-
-		self["actions"] = ActionMap(["SetupActions"], 
+		self["oktext"] = Label(_("OK"))
+		self["canceltext"] = Label(_("Cancel"))
+		self["ok"] = Pixmap()
+		self["cancel"] = Pixmap()
+		
+		self["actions"] = NumberActionMap(["SetupActions"], 
 			{
-				"cancel": self.close,
-				"ok": self.keyOk,
-				"left": self.keyLeft,
-				"right": self.keyRight,
-				"save": self.keySave
-			})
+				"cancel": self.keyCancel,
+				"save": self.keySave,
+			}, -1)
+
+		ConfigListScreen.__init__(self, list, session = session)
+
+		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].value)
+
+	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_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.
+				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()
+		
+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")