X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54ef04efc3501ce91db852139a820c2b219062f3..66795123ebff2381a76b60a3bc81ee55c51ff6fd:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 09acebdd..da6706b7 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -4,49 +4,34 @@ from Components.ConfigList import ConfigList
 from Components.config import *
 from Components.MenuList import MenuList
 from Components.NimManager import nimmanager
+from Components.config import getConfigListEntry
 
 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:
-			list.append( ("Satellite", item) )
-		else:
-			list.append( ("Port A", item) )
-		
-		if mode >= 1:
-			b = config.Nims[nim.slotid].diseqcB
-			item = b.controlType(b)
-			list.append( ("Port B", item) )
-			if mode >= 3:
-				b = config.Nims[nim.slotid].diseqcC
-				item = b.controlType(b)
-				list.append( ("Port C", item) )
 
-				b = config.Nims[nim.slotid].diseqcD
-				item = b.controlType(b)
-				list.append( ("Port D", item) )
+		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
+				list.append(getConfigListEntry("Port C", config.Nims[nim.slotid].diseqcC))
+				list.append(getConfigListEntry("Port D", config.Nims[nim.slotid].diseqcD))
 				
 	def createSetup(self):
-		print "createSetup"
 		self.list = [ ]
 		
-		b = config.Nims[self.nim.slotid].configMode
-		item = b.controlType(b)
-		self.list.append( ("Configmode", item) )
+		self.list.append(getConfigListEntry("Configmode", config.Nims[self.nim.slotid].configMode))
 		
-		if b.value == 0:			#simple setup
-			b = config.Nims[self.nim.slotid].diseqcMode
-			item = b.controlType(b)
-			self.list.append( ("Diseqcmode", item) )
+		if config.Nims[self.nim.slotid].configMode.value == 0:			#simple setup
+			self.list.append(getConfigListEntry("Diseqcmode", config.Nims[self.nim.slotid].diseqcMode))
 		
-			self.createSimpleSetup(self.nim, self.list, b.value)
+			self.createSimpleSetup(self.nim, self.list, config.Nims[self.nim.slotid].diseqcMode.value)
 		else:	
 			print "FIXME: implement advanced mode"
 
-		#???
 		self["config"].list = self.list
 		self["config"].l.setList(self.list)
 		
@@ -64,14 +49,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)