X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/82e78679568c43d341e4eb288b9a91385f5a6ed8..9bca94aa8cb237f134d4dc5707ce9df229fdbfd3:/lib/python/Screens/Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index cb268580..2981e25a 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,9 +1,10 @@
 from Screen import Screen
-from Components.ActionMap import ActionMap
+from Components.ActionMap import NumberActionMap
 from Components.config import config				#global config instance
-from Components.config import configBoolean
+from Components.config import configSelection
 from Components.ConfigList import ConfigList
 from Components.Label import Label
+from Components.Pixmap import Pixmap
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
@@ -11,6 +12,7 @@ from skin import elementsWithTag
 
 from Tools import XMLTools
 
+# FIXME: use resolveFile!
 # read the setupmenu
 try:
 	# first we search in the current path
@@ -31,14 +33,43 @@ def getValbyAttr(x, attr):
 	
 	return ""
 
-class Setup(Screen):
+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>"""
+
+	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()
+	
+	def removeWatcher(self):
+		self.parent.onChangedEntry.remove(self.selectionChanged)
+		self.parent["config"].onSelectionChanged.remove(self.selectionChanged)
 
+	def selectionChanged(self):
+		self["SetupEntry"].text = self.parent.getCurrentEntry()
+		self["SetupValue"].text = self.parent.getCurrentValue()
+
+class Setup(Screen):
 	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")
+				ItemText = _(getValbyAttr(x, "text"))
 				b = eval(XMLTools.mergeText(x.childNodes));
 				print "item " + ItemText + " " + b.configPath
 				if b == "":
@@ -50,12 +81,21 @@ class Setup(Screen):
 				# 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["config"].handleKey(0)
+		self.handleKey("choseElement")
+
 	def keyLeft(self):
-		self["config"].handleKey(1)
+		self.handleKey("prevElement")
+
 	def keyRight(self):
-		self["config"].handleKey(2)
+		self.handleKey("nextElement")
 
 	def keySave(self):
 		print "save requested"
@@ -68,16 +108,18 @@ class Setup(Screen):
 		for x in self["config"].list:
 			x[1].cancel()
 		self.close()
+		
+	def keyNumberGlobal(self, number):
+		self.handleKey(str(number))
 
 	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
@@ -88,19 +130,51 @@ class Setup(Screen):
 				if ItemText != setup:
 					continue
 				self.addItems(list, x.childNodes);
+				myTitle = getValbyAttr(x, "title")
 		
 		#check for list.entries > 0 else self.close
 		
 		self["config"] = ConfigList(list)
 
-		self["ok"] = Label("OK")
-		self["cancel"] = Label("Cancel")
+		self.setup_title = myTitle
+		self["title"] = Label(_(self.setup_title))
 
-		self["actions"] = ActionMap(["SetupActions"], 
+		self["oktext"] = Label(_("OK"))
+		self["canceltext"] = Label(_("Cancel"))
+		self["ok"] = Pixmap()
+		self["cancel"] = Pixmap()
+		
+		self["actions"] = NumberActionMap(["SetupActions"], 
 			{
 				"cancel": self.keyCancel,
 				"ok": self.keyOk,
 				"left": self.keyLeft,
 				"right": self.keyRight,
-				"save": self.keySave
+				"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)
+
+		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].parent.value)
+
+	def createSummary(self):
+		return SetupSummary