follow itemHeight changes

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

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index af53621a78f810ac384858a062505d9a3a6f0989..83cdcd5f37baa078a707b7f09d777d517f2daaf2 100644 (file)
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -43,12 +43,12 @@ class ServiceInfoList(HTMLComponent, GUIComponent):
                self.list = source
                self.l.setList(self.list)
                self.l.setFont(0, gFont("Regular", 23))
+               self.l.setItemHeight(25)
 
        GUI_WIDGET = eListbox
-       
+
        def postWidgetCreate(self, instance):
                self.instance.setContent(self.l)
-               self.instance.setItemHeight(25)
 
 TYPE_SERVICE_INFO = 1
 TYPE_TRANSPONDER_INFO = 2
@@ -174,42 +174,39 @@ class ServiceInfo(Screen):
                        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),
-                                               )
-               
+               if frontendData and len(frontendData):
+                       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))
+               return [ ]
+
        def fillList(self, Labels):
                tlist = [ ]