provider-selection is now possible for cable and terrestrial

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

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 204c6a809aaf0ae65ddad215ee3ca01d3c3ab8eb..db200ee1a1a318d7710a90d8e9a056cd135ec51f 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -27,17 +27,24 @@ class NimSetup(Screen):
        def createSetup(self):
                self.list = [ ]
                
-               self.list.append(getConfigListEntry(_("Configmode"), config.Nims[self.nim.slotid].configMode))
+               if (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-S"]):
+                       self.list.append(getConfigListEntry(_("Configmode"), config.Nims[self.nim.slotid].configMode))
+                       
+                       if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup
+                               self.list.append(getConfigListEntry(_("Diseqcmode"), config.Nims[self.nim.slotid].diseqcMode))
+                       
+                               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)
+                       else:   
+                               print "FIXME: implement advanced mode"
                
-               if config.Nims[self.nim.slotid].configMode.value == 0:                  #simple setup
-                       self.list.append(getConfigListEntry(_("Diseqcmode"), config.Nims[self.nim.slotid].diseqcMode))
-               
-                       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)
-               else:   
-                       print "FIXME: implement advanced mode"
+               elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-C"]):
+                       self.list.append(getConfigListEntry(_("Cable provider"), config.Nims[self.nim.slotid].cable))
+               elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-T"]):
+                       self.list.append(getConfigListEntry(_("Terrestrial provider"), config.Nims[self.nim.slotid].terrestrial))
+
 
                self["config"].list = self.list
                self["config"].l.setList(self.list)
@@ -54,7 +61,7 @@ class NimSetup(Screen):
 
        def keyRight(self):
                #forbid to enable advanced mode until its ready
-               if self["config"].getCurrent()[0] != "Configmode":
+               if self["config"].getCurrent()[0] != _("Configmode"):
                        self["config"].handleKey(config.key["nextElement"])
                self.newConfig()