X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/75e693309d8fdab98121ad83a16738a856e97b1c..6b1ae459c6ccb5dd30342b7160df16891b35132a:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 02473aff..99b04401 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -7,20 +7,19 @@ from Components.NimManager import nimmanager
 
 class NimSetup(Screen):
 	def createSimpleSetup(self, nim, list, mode):
-		print "request for diseqcmode:" + str(mode)
-		
+
 		b = config.Nims[nim.slotid].diseqcA
 		item = b.controlType(b)
-		if mode == 0:
+		if mode == 0:			#single Sat
 			list.append( ("Satellite", item) )
-		else:
+		else:							# > 1 Sats
 			list.append( ("Port A", item) )
 		
-		if mode >= 1:
+		if mode >= 1:			# > 1 Sats
 			b = config.Nims[nim.slotid].diseqcB
 			item = b.controlType(b)
 			list.append( ("Port B", item) )
-			if mode >= 3:
+			if mode >= 3:		# > 2 Sats
 				b = config.Nims[nim.slotid].diseqcC
 				item = b.controlType(b)
 				list.append( ("Port C", item) )
@@ -30,7 +29,6 @@ class NimSetup(Screen):
 				list.append( ("Port D", item) )
 				
 	def createSetup(self):
-		print "createSetup"
 		self.list = [ ]
 		
 		b = config.Nims[self.nim.slotid].configMode
@@ -46,7 +44,6 @@ class NimSetup(Screen):
 		else:	
 			print "FIXME: implement advanced mode"
 
-		#???
 		self["config"].list = self.list
 		self["config"].l.setList(self.list)
 		
@@ -64,14 +61,24 @@ class NimSetup(Screen):
 		self["config"].handleKey(config.key["nextElement"])
 		self.newConfig()
 
+	def keySave(self):
+		for x in self["config"].list:
+			x[1].save()
+		self.close()
+
+	def keyCancel(self):
+		for x in self["config"].list:
+			x[1].cancel()
+		self.close()
+
 	def __init__(self, session, nim):
 		Screen.__init__(self, session)
 		self.nim = nim
 
 		self["actions"] = ActionMap(["SetupActions"],
 		{
-			"ok": self.close,
-			"cancel": self.close,
+			"ok": self.keySave,
+			"cancel": self.keyCancel,
 			"left": self.keyLeft,
 			"right": self.keyRight
 		}, -1)
@@ -95,5 +102,6 @@ class NimSelection(Screen):
 
 	def okbuttonClick(self):
 		selection = self["nimlist"].getCurrent()
-		self.session.open(NimSetup, selection[1])
-		pass
+		if selection[1].nimType != -1:	#unknown/empty
+			self.session.open(NimSetup, selection[1])
+	
\ No newline at end of file