X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eeefece35e4269e02fdb7abab4f79d8e7b8f98b..32027c3eaa6b04ce081640ef89a73a93081aea85:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 9e692e63..1c2f1519 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -3,7 +3,7 @@ from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigList, ConfigListScreen
 from Components.MenuList import MenuList
 from Components.NimManager import nimmanager
-from Components.config import getConfigListEntry, config, ConfigDummy
+from Components.config import getConfigListEntry, config, ConfigNothing
 
 class NimSetup(Screen, ConfigListScreen):
 	def createSimpleSetup(self, list, mode):
@@ -60,12 +60,15 @@ class NimSetup(Screen, ConfigListScreen):
 				# SATs
 				self.advancedSatsEntry = getConfigListEntry(_("Satellite"), self.nimConfig.advanced.sats)
 				self.list.append(self.advancedSatsEntry)
-				print "blub", self.nimConfig.advanced.sat
-				currSat = self.nimConfig.advanced.sat[self.nimConfig.advanced.sats.orbital_position]
+				cur_orb_pos = self.nimConfig.advanced.sats.orbital_position
+				satlist = self.nimConfig.advanced.sat.keys()
+				if cur_orb_pos not in satlist:
+					cur_orb_pos = satlist[0]
+				currSat = self.nimConfig.advanced.sat[cur_orb_pos]
 				self.fillListWithAdvancedSatEntrys(currSat)
 			self.have_advanced = True
 		elif self.nim_type == nimmanager.nimType["DVB-C"]:
-			self.list.append(getConfigListEntry(_("Cable provider"), self.nimConfig.cable))
+			self.list.append(getConfigListEntry(_("Service scan type needed"), self.nimConfig.cabletype))
 			self.have_advanced = False
 		elif self.nim_type == nimmanager.nimType["DVB-T"]:
 			self.have_advanced = False
@@ -93,7 +96,7 @@ class NimSetup(Screen, ConfigListScreen):
 	def fillListWithAdvancedSatEntrys(self, Sat):
 		currLnb = self.nimConfig.advanced.lnb[int(Sat.lnb.value)]
 		
-		if isinstance(currLnb, ConfigDummy):
+		if isinstance(currLnb, ConfigNothing):
 			currLnb = None
 
 		self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage))
@@ -136,7 +139,7 @@ class NimSetup(Screen, ConfigListScreen):
 				self.list.append(getConfigListEntry(_("LOF/L"), currLnb.lofl))
 				self.list.append(getConfigListEntry(_("LOF/H"), currLnb.lofh))
 				self.list.append(getConfigListEntry(_("Threshold"), currLnb.threshold))
-			self.list.append(getConfigListEntry(_("12V Output"), currLnb.output_12v))
+#			self.list.append(getConfigListEntry(_("12V Output"), currLnb.output_12v))
 			self.list.append(getConfigListEntry(_("Increased voltage"), currLnb.increased_voltage))
 
 	def fillAdvancedList(self):
@@ -154,11 +157,6 @@ class NimSetup(Screen, ConfigListScreen):
 		self.run()
 		self.close()
 
-	def keyCancel(self):
-		for x in self["config"].list:
-			x[1].cancel()
-		self.close()
-
 	def __init__(self, session, slotid):
 		Screen.__init__(self, session)
 		self.list = [ ]
@@ -169,7 +167,7 @@ class NimSetup(Screen, ConfigListScreen):
 		{
 			"ok": self.keySave,
 			"cancel": self.keyCancel,
-		}, -1)
+		}, -2)
 
 		self.nim = nimmanager.nimList()[slotid][1]
 		self.nimConfig = config.Nims[self.nim.slotid]
@@ -193,10 +191,9 @@ class NimSelection(Screen):
 		{
 			"ok": self.okbuttonClick ,
 			"cancel": self.close
-		}, -1)
+		}, -2)
 
 	def okbuttonClick(self):
 		selection = self["nimlist"].getCurrent()
 		if selection[1].nimType != -1:	#unknown/empty
 			self.session.open(NimSetup, selection[1].slotid)
-