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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 0886ddf1..6c2a9708 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,8 +1,7 @@
 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 configEntry
-from Components.config import configBoolean
+from Components.config import configSelection
 from Components.ConfigList import ConfigList
 from Components.Label import Label
 
@@ -52,17 +51,32 @@ class Setup(Screen):
 				list.append( (ItemText, item) )
 
 	def keyOk(self):
-		self["config"].handleKey(0)
+		if (self["config"].getCurrent()[1].parent.enabled == True):
+			self["config"].handleKey(config.key["choseElement"])
 	def keyLeft(self):
-		self["config"].handleKey(1)
+		if (self["config"].getCurrent()[1].parent.enabled == True):
+			self["config"].handleKey(config.key["prevElement"])
 	def keyRight(self):
-		self["config"].handleKey(2)
+		if (self["config"].getCurrent()[1].parent.enabled == True):
+			self["config"].handleKey(config.key["nextElement"])
 
 	def keySave(self):
 		print "save requested"
-		for x in self["config"]:
-			selection =	self["config"].getCurrent()
-			selection.save()
+		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 keyNumberGlobal(self, number):
+		print "You pressed number " + str(number)
+		if (self["config"].getCurrent()[1].parent.enabled == True):
+			self["config"].handleKey(config.key[str(number)])
+
 
 	def __init__(self, session, setup):
 		Screen.__init__(self, session)
@@ -83,19 +97,32 @@ 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["title"] = Label(myTitle);
+
 		self["ok"] = Label("OK")
 		self["cancel"] = Label("Cancel")
 
-		self["actions"] = ActionMap(["SetupActions"], 
+		self["actions"] = NumberActionMap(["SetupActions"], 
 			{
-				"cancel": self.close,
+				"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)