X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3e76780009c5934db28c37aae9c32d0bc5a495e2..5c27251fa08566a00d124aaf2c02249995dac9cf:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 1e788707..1e3cbd51 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -1,4 +1,5 @@
 from Screen import Screen
+from Components.ActionMap import NumberActionMap
 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigList
 from Components.config import *
@@ -8,12 +9,11 @@ from Components.config import getConfigListEntry
 
 class NimSetup(Screen):
 	def createSimpleSetup(self, nim, list, mode):
-
 		if mode == 0:			#single Sat
 			list.append(getConfigListEntry("Satellite", config.Nims[nim.slotid].diseqcA))
 		else:							# > 1 Sats
 			list.append(getConfigListEntry("Port A", config.Nims[nim.slotid].diseqcA))
-		
+
 		if mode >= 1:			# > 1 Sats
 			list.append(getConfigListEntry("Port B", config.Nims[nim.slotid].diseqcB))
 			if mode >= 3:		# > 2 Sats
@@ -53,12 +53,20 @@ class NimSetup(Screen):
 		self.newConfig()
 
 	def keyRight(self):
-		self["config"].handleKey(config.key["nextElement"])
+		#forbid to enable advanced mode until its ready
+		if self["config"].getCurrent()[0] != "Configmode":
+			self["config"].handleKey(config.key["nextElement"])
 		self.newConfig()
 
+	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 keySave(self):
 		for x in self["config"].list:
 			x[1].save()
+		nimmanager.sec.update()	
 		self.close()
 
 	def keyCancel(self):
@@ -69,13 +77,23 @@ class NimSetup(Screen):
 	def __init__(self, session, nim):
 		Screen.__init__(self, session)
 		self.nim = nim
-
-		self["actions"] = ActionMap(["SetupActions"],
+		
+		self["actions"] = NumberActionMap(["SetupActions"],
 		{
 			"ok": self.keySave,
 			"cancel": self.keyCancel,
 			"left": self.keyLeft,
-			"right": self.keyRight
+			"right": self.keyRight,
+			"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.list = [ ]