X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c767434380ce3dc9fed8c55e69cda5c4e1544005..7fe653254eeb5ee1ba935321d0cff3095b39cc36:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 074033fa..c188540a 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -22,32 +22,35 @@ class NimSetup(Screen):
 	
 	def createPositionerSetup(self, nim, list):
 		list.append(getConfigListEntry(_("Positioner mode"), config.Nims[nim.slotid].positionerMode))
-		if (config.Nims[nim.slotid].positionerMode.value == 0): # USALS
+		if (currentConfigSelectionElement(config.Nims[nim.slotid].positionerMode) == "usals"): # USALS
 			list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
 			list.append(getConfigListEntry("", config.Nims[nim.slotid].longitudeOrientation))
 			list.append(getConfigListEntry(_("Latitude"), config.Nims[nim.slotid].latitude))
 			list.append(getConfigListEntry("", config.Nims[nim.slotid].latitudeOrientation))
-		elif (config.Nims[nim.slotid].positionerMode.value == 1): # manual
+		elif (currentConfigSelectionElement(config.Nims[nim.slotid].positionerMode) == "manual"): # manual
 			pass
 	
 	def createSetup(self):
 		self.list = [ ]
+		self.diseqcModeEntry = None
 		
 		if (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-S"]):
-			self.list.append(getConfigListEntry(_("Configmode"), config.Nims[self.nim.slotid].configMode))
+			self.configMode = getConfigListEntry(_("Configuration Mode"), config.Nims[self.nim.slotid].configMode)
+			self.list.append(self.configMode)
 			
-			if config.Nims[self.nim.slotid].configMode.value == 0:			#simple setup
-				self.list.append(getConfigListEntry(_("Diseqcmode"), config.Nims[self.nim.slotid].diseqcMode))
+			if currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "simple":			#simple setup
+				self.diseqcModeEntry = getConfigListEntry(_("DiSEqC Mode"), config.Nims[self.nim.slotid].diseqcMode)
+				self.list.append(self.diseqcModeEntry)
 			
 				if (0 <= config.Nims[self.nim.slotid].diseqcMode.value < 4):
 					self.createSimpleSetup(self.nim, self.list, config.Nims[self.nim.slotid].diseqcMode.value)
 				if (config.Nims[self.nim.slotid].diseqcMode.value == 4):
 					self.createPositionerSetup(self.nim, self.list)
-			elif config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner
+			elif currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "nothing": # nothing
 				#self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo))
 				pass
-			elif config.Nims[self.nim.slotid].configMode.value == 2: # advanced mode
-				print "FIXME: implement advanced mode"
+			elif currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "loopthrough": # linked
+				pass
 		
 		elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-C"]):
 			self.list.append(getConfigListEntry(_("Cable provider"), config.Nims[self.nim.slotid].cable))
@@ -59,9 +62,9 @@ class NimSetup(Screen):
 		self["config"].l.setList(self.list)
 		
 	def newConfig(self):	
-		if self["config"].getCurrent()[0] == _("Diseqcmode"):
+		if self["config"].getCurrent() == self.configMode:
 			self.createSetup()
-		if self["config"].getCurrent()[0] == _("Configmode"):
+		if self["config"].getCurrent() == self.diseqcModeEntry:
 			self.createSetup()
 		
 	def keyLeft(self):
@@ -69,13 +72,6 @@ class NimSetup(Screen):
 		self.newConfig()
 
 	def keyRight(self):
-		#forbid to enable advanced mode until its ready
-		#perhaps its better to use an own element here
-		#this suckz .. how enable advanced config?
-		if self["config"].getCurrent()[0] == _("Configmode"):
-			if self.nim.slotid == 0:
-				return
-
 		self["config"].handleKey(config.key["nextElement"])
 		self.newConfig()
 
@@ -84,10 +80,13 @@ class NimSetup(Screen):
 		if (self["config"].getCurrent()[1].parent.enabled == True):
 			self["config"].handleKey(config.key[str(number)])
 
-	def keySave(self):
+	def run(self):
 		for x in self["config"].list:
 			x[1].save()
 		nimmanager.sec.update()	
+
+	def keySave(self):
+		self.run()
 		self.close()
 
 	def keyCancel(self):
@@ -95,9 +94,10 @@ class NimSetup(Screen):
 			x[1].cancel()
 		self.close()
 
-	def __init__(self, session, nim):
+	def __init__(self, session, slotid):
 		Screen.__init__(self, session)
-		self.nim = nim
+		
+		self.nim = nimmanager.nimList()[slotid][1]
 		
 		self["actions"] = NumberActionMap(["SetupActions"],
 		{
@@ -137,5 +137,5 @@ class NimSelection(Screen):
 	def okbuttonClick(self):
 		selection = self["nimlist"].getCurrent()
 		if selection[1].nimType != -1:	#unknown/empty
-			self.session.open(NimSetup, selection[1])
-	
\ No newline at end of file
+			self.session.open(NimSetup, selection[1].slotid)
+