use translations in ServiceInfo

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

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index b063a8a78fe59207f88666264518babc89eed602..639b970a41fd32493b71110c90cfe5711369e1ae 100644 (file)
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -20,7 +20,7 @@ def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4):
 
        #PyObject *type, *px, *py, *pwidth, *pheight, *pfnt, *pstring, *pflags;
        res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 30, 0, RT_HALIGN_LEFT, ""))
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 150, 25, 0, RT_HALIGN_LEFT, a))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 25, 0, RT_HALIGN_LEFT, a))
        print "b:", b
        if type(b) is not str:
                if valueType == TYPE_VALUE_HEX:
@@ -33,7 +33,7 @@ def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4):
                        b = str(b)              
        
        
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 170, 0, 350, 25, 0, RT_HALIGN_LEFT, b))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 220, 0, 350, 25, 0, RT_HALIGN_LEFT, b))
 
        return res
 
@@ -45,15 +45,12 @@ class ServiceInfoList(HTMLComponent, GUIComponent):
                self.l.setList(self.list)
                self.l.setFont(0, gFont("Regular", 23))
 
-       def GUIcreate(self, parent):
-               self.instance = eListbox(parent)
+       GUI_WIDGET = eListbox
+       
+       def postWidgetCreate(self, instance):
                self.instance.setContent(self.l)
                self.instance.setItemHeight(25)
 
-       def GUIdelete(self):
-               self.instance.setContent(None)
-               self.instance = None
-
 class ServiceInfo(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
@@ -64,22 +61,24 @@ class ServiceInfo(Screen):
                        "cancel": self.close,
                        "red": self.information,
                        "green": self.pids,
-                       "yellow": self.transponder
+                       "yellow": self.transponder,
+                       "blue": self.tuner
                }, -1)
                
                service = session.nav.getCurrentService()
                if service is not None:
                        self.info = service.info()
-                       self.feinfo = service.frontendStatusInfo()
-                       if self.feinfo:
-                               print self.feinfo.getFrontendData(False)
+                       self.feinfo = service.frontendInfo()
+                       print self.info.getInfoObject(iServiceInformation.sCAIDs);
                else:
                        self.info = None
+                       self.feinfo = None
 
-               self["red"] = Label("Serviceinfo")
-               self["green"] = Label("PIDs")
-               self["yellow"] = Label("Transponder")
-               self["blue"] = Label("")
+
+               self["red"] = Label(_("Serviceinfo"))
+               self["green"] = Label(_("PIDs"))
+               self["yellow"] = Label(_("Transponder"))
+               self["blue"] = Label(_("Tuner status"))
        
                tlist = [ ]
 
@@ -108,16 +107,58 @@ class ServiceInfo(Screen):
                                   ("SID", self.getServiceInfoValue(iServiceInformation.sSID), TYPE_VALUE_HEX_DEC, 4))
                self.fillList(Labels)
        
-       def transponder(self):
-               Labels = ( ("Frequency", "11823", TYPE_TEXT),
-                                  ("Polarity", "H", TYPE_TEXT))
+       def showFrontendData(self, real):
+               frontendData = self.feinfo and self.feinfo.getFrontendData(real)
+               Labels = self.getFEData(frontendData)
                self.fillList(Labels)
        
+       def transponder(self):
+               self.showFrontendData(True)
+               
+       def tuner(self):
+               self.showFrontendData(False)
+               
+       def getFEData(self, frontendData):
+               if frontendData is None:
+                       return []
+               if frontendData["tuner_type"] == "DVB-S":
+                       return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+                                          ("Type", frontendData["system"], TYPE_TEXT),
+                                          ("Modulation", frontendData["modulation"], TYPE_TEXT),
+                                          ("Orbital position", frontendData["orbital_position"], TYPE_VALUE_DEC),
+                                          ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+                                          ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
+                                          ("Polarization", frontendData["polarization"], TYPE_TEXT),
+                                          ("Inversion", frontendData["inversion"], TYPE_TEXT),
+                                          ("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
+                                               )
+               elif frontendData["tuner_type"] == "DVB-C":
+                       return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+                                          ("Type", frontendData["tuner_type"], TYPE_TEXT),
+                                          ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+                                          ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
+                                          ("Modulation", frontendData["modulation"], TYPE_TEXT),
+                                          ("Inversion", frontendData["inversion"], TYPE_TEXT),
+                                          ("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
+                                               )
+               elif frontendData["tuner_type"] == "DVB-T":
+                       return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+                                          ("Type", frontendData["tuner_type"], TYPE_TEXT),
+                                          ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+                                          ("Inversion", frontendData["inversion"], TYPE_TEXT),
+                                          ("Bandwidth", frontendData["bandwidth"], TYPE_VALUE_DEC),
+                                          ("CodeRateLP", frontendData["code_rate_lp"], TYPE_TEXT),
+                                          ("CodeRateHP", frontendData["code_rate_hp"], TYPE_TEXT),
+                                          ("Constellation", frontendData["constellation"], TYPE_TEXT),
+                                          ("Transmission Mode", frontendData["transmission_mode"], TYPE_TEXT),
+                                          ("Guard Interval", frontendData["guard_interval"], TYPE_TEXT),
+                                          ("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT),
+                                               )
+               
        def fillList(self, Labels):
                tlist = [ ]
 
                for item in Labels:
-                       print item
                        value = item[1]
                        if len(item) < 4:
                                tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2]))