X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6d7673190e7fec573aed8e15e98d470cd4189d52..c5cc138663f02699a9f1479fb0f5e3c861c116c8:/lib/python/Screens/Satconfig.py diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 3930aaa3..d6d9904c 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,11 @@ 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] 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 +92,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)) @@ -169,7 +168,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]