more changes for service groups (replacement for zapping alternatives

[enigma2.git] / lib / python / Screens / Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 9e692e63bb7bad1f0ce7bb20a4bbf842c7674789..226c3a825f72c7b1033acdb6aff01d1bc1a59517 100644 (file)
--- 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))
@@ -154,11 +153,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 +163,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 +187,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)
-