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 5313896b07aba8dc1c6b6a946557d6ead2bdf98b..db200ee1a1a318d7710a90d8e9a056cd135ec51f 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -9,44 +9,50 @@ from Components.config import getConfigListEntry
 
 class NimSetup(Screen):
        def createSimpleSetup(self, nim, list, mode):
-
                if mode == 0:                   #single Sat
-                       list.append(getConfigListEntry("Satellite", config.Nims[nim.slotid].diseqcA))
+                       list.append(getConfigListEntry(_("Satellite"), config.Nims[nim.slotid].diseqcA))
                else:                                                   # > 1 Sats
-                       list.append(getConfigListEntry("Port A", config.Nims[nim.slotid].diseqcA))
-               
+                       list.append(getConfigListEntry(_("Port A"), config.Nims[nim.slotid].diseqcA))
+
                if mode >= 1:                   # > 1 Sats
-                       list.append(getConfigListEntry("Port B", config.Nims[nim.slotid].diseqcB))
+                       list.append(getConfigListEntry(_("Port B"), config.Nims[nim.slotid].diseqcB))
                        if mode >= 3:           # > 2 Sats
-                               list.append(getConfigListEntry("Port C", config.Nims[nim.slotid].diseqcC))
-                               list.append(getConfigListEntry("Port D", config.Nims[nim.slotid].diseqcD))
+                               list.append(getConfigListEntry(_("Port C"), config.Nims[nim.slotid].diseqcC))
+                               list.append(getConfigListEntry(_("Port D"), config.Nims[nim.slotid].diseqcD))
        def createPositionerSetup(self, nim, list):
-               list.append(getConfigListEntry("Longitude", config.Nims[nim.slotid].longitude))
-               list.append(getConfigListEntry("Latitude", config.Nims[nim.slotid].latitude))
+               list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
+               list.append(getConfigListEntry(_("Latitude"), config.Nims[nim.slotid].latitude))
                pass
        
        def createSetup(self):
                self.list = [ ]
                
-               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 (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 (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)
                
        def newConfig(self):    
-               if self["config"].getCurrent()[0] == "Diseqcmode":
+               if self["config"].getCurrent()[0] == _("Diseqcmode"):
                        self.createSetup()
-               if self["config"].getCurrent()[0] == "Configmode":
+               if self["config"].getCurrent()[0] == _("Configmode"):
                        self.createSetup()
                
        def keyLeft(self):
@@ -55,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()
 
@@ -78,7 +84,7 @@ class NimSetup(Screen):
        def __init__(self, session, nim):
                Screen.__init__(self, session)
                self.nim = nim
-
+               
                self["actions"] = NumberActionMap(["SetupActions"],
                {
                        "ok": self.keySave,
@@ -86,15 +92,15 @@ class NimSetup(Screen):
                        "left": self.keyLeft,
                        "right": self.keyRight,
                        "1": self.keyNumberGlobal,
-            "2": self.keyNumberGlobal,
-            "3": self.keyNumberGlobal,
-            "4": self.keyNumberGlobal,
-            "5": self.keyNumberGlobal,
-            "6": self.keyNumberGlobal,
-            "7": self.keyNumberGlobal,
-            "8": self.keyNumberGlobal,
-            "9": self.keyNumberGlobal,
-            "0": self.keyNumberGlobal
+                       "2": self.keyNumberGlobal,
+                       "3": self.keyNumberGlobal,
+                       "4": self.keyNumberGlobal,
+                       "5": self.keyNumberGlobal,
+                       "6": self.keyNumberGlobal,
+                       "7": self.keyNumberGlobal,
+                       "8": self.keyNumberGlobal,
+                       "9": self.keyNumberGlobal,
+                       "0": self.keyNumberGlobal
                }, -1)
 
                self.list = [ ]