X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/521be41ccb6d99069edb9211e81333141d71d326..3f66fa4d17ba703871da304d005a1945ba7ed97d:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 3aabc0e1..49fc2b7b 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -4,7 +4,7 @@ from Components.SystemInfo import SystemInfo
 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigListScreen
 from Components.MenuList import MenuList
-from Components.NimManager import nimmanager, InitNimManager
+from Components.NimManager import nimmanager
 from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement
 from Screens.MessageBox import MessageBox
 
@@ -60,8 +60,8 @@ class NimSetup(Screen, ConfigListScreen):
 			choices["satposdepends"] = _("second cable of motorized LNB")
 		if len(nimmanager.canConnectTo(self.slotid)) > 0:
 			choices["loopthrough"] = _("loopthrough to")
-		self.nimConfig.configMode = updateConfigElement(self.nimConfig.configMode, ConfigSelection(choices = choices, default = "simple"))
-					
+		self.nim.config.configMode.setChoices(choices)
+							
 	def createSetup(self):
 		print "Creating setup"
 		self.list = [ ]
@@ -98,7 +98,8 @@ class NimSetup(Screen, ConfigListScreen):
 				for id in nimlist:
 					#choices.append((str(id), str(chr(65 + id))))
 					choices.append((str(id), nimmanager.getNimDescription(id)))
-				self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices))
+				self.nimConfig.connectedTo.setChoices(choices)
+				#self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices))
 				self.list.append(getConfigListEntry(_("Tuner"), self.nimConfig.connectedTo))
 			elif self.nimConfig.configMode.value == "satposdepends":
 				choices = []
@@ -106,7 +107,8 @@ class NimSetup(Screen, ConfigListScreen):
 				for id in nimlist:
 					#choices.append((str(id), str(chr(65 + id))))
 					choices.append((str(id), nimmanager.getNimDescription(id)))
-				self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices))
+				self.nimConfig.connectedTo.setChoices(choices)
+				#self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices))
 				self.list.append(getConfigListEntry(_("Tuner"), self.nimConfig.connectedTo))
 			elif self.nimConfig.configMode.value == "loopthrough":
 				choices = []
@@ -114,7 +116,8 @@ class NimSetup(Screen, ConfigListScreen):
 				connectable = nimmanager.canConnectTo(self.slotid) 
 				for id in connectable:
 					choices.append((str(id), nimmanager.getNimDescription(id)))
-				self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices))
+				self.nimConfig.connectedTo.setChoices(choices)
+				#self.nimConfig.connectedTo = updateConfigElement(self.nimConfig.connectedTo, ConfigSelection(choices = choices))
 				self.list.append(getConfigListEntry(_("Connected to"), self.nimConfig.connectedTo))
 			elif self.nimConfig.configMode.value == "nothing":
 				pass