fix -T

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

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index de04dc45adbb09b17a915e27ae43fb302397dee9..a6d84489ca4bf8bc820377c2965562287fa73b60 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -1,6 +1,6 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
-from Components.ConfigList import ConfigList, ConfigListScreen
+from Components.ConfigList import ConfigListScreen
 from Components.MenuList import MenuList
 from Components.NimManager import nimmanager
 from Components.config import getConfigListEntry, config, ConfigNothing
@@ -22,22 +22,23 @@ class NimSetup(Screen, ConfigListScreen):
                                list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD))
 
        def createPositionerSetup(self, list):
-#              list.append(getConfigListEntry(_("Positioner mode"), self.nimConfig.positionerMode))
-#              if self.nimConfig.positionerMode.value == "usals": # USALS
-               list.append(getConfigListEntry(_("Longitude"), self.nimConfig.longitude))
-               list.append(getConfigListEntry(" ", self.nimConfig.longitudeOrientation))
-               list.append(getConfigListEntry(_("Latitude"), self.nimConfig.latitude))
-               list.append(getConfigListEntry(" ", self.nimConfig.latitudeOrientation))
-               self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), self.nimConfig.turningSpeed)
-               self.list.append(self.turningSpeed)
-               if self.nimConfig.turningSpeed.value == "fast epoch":
-                       self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), self.nimConfig.fastTurningBegin)
-                       self.turnFastEpochEnd = getConfigListEntry(_("End time"), self.nimConfig.fastTurningEnd)
-                       self.list.append(self.turnFastEpochBegin)
-                       self.list.append(self.turnFastEpochEnd)
+               nim = self.nimConfig
+               list.append(getConfigListEntry(_("Longitude"), nim.longitude))
+               list.append(getConfigListEntry(" ", nim.longitudeOrientation))
+               list.append(getConfigListEntry(_("Latitude"), nim.latitude))
+               list.append(getConfigListEntry(" ", nim.latitudeOrientation))
 
-#              elif self.nimConfig.positionerMode.value == "manual": # manual
-#                      pass
+               self.advancedPowerMeasurement = getConfigListEntry(_("Use Power Measurement"), nim.powerMeasurement)
+               list.append(self.advancedPowerMeasurement)
+               if nim.powerMeasurement.value:
+                       list.append(getConfigListEntry(_("Power threshold in mA"), nim.powerThreshold))
+                       self.turningSpeed = getConfigListEntry(_("Rotor turning speed"), nim.turningSpeed)
+                       list.append(self.turningSpeed)
+                       if nim.turningSpeed.value == "fast epoch":
+                               self.turnFastEpochBegin = getConfigListEntry(_("Begin time"), nim.fastTurningBegin)
+                               self.turnFastEpochEnd = getConfigListEntry(_("End time"), nim.fastTurningEnd)
+                               list.append(self.turnFastEpochBegin)
+                               list.append(self.turnFastEpochEnd)
 
        def createSetup(self):
                print "Creating setup"
@@ -117,6 +118,7 @@ class NimSetup(Screen, ConfigListScreen):
                        self.have_advanced = False
                elif self.nim.isCompatible("DVB-T"):
                        self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
+                       self.list.append(self.configMode)
                        self.have_advanced = False
                        if self.nimConfig.configMode.value == "enabled":
                                self.list.append(getConfigListEntry(_("Terrestrial provider"), self.nimConfig.terrestrial))
@@ -183,7 +185,7 @@ class NimSetup(Screen, ConfigListScreen):
                                        self.list.append(getConfigListEntry(" ", currLnb.longitudeOrientation))
                                        self.list.append(getConfigListEntry(_("Latitude"), currLnb.latitude))
                                        self.list.append(getConfigListEntry(" ", currLnb.latitudeOrientation))
-                                       self.advancedPowerMeasurement = getConfigListEntry("Use Power Measurement", currLnb.powerMeasurement)
+                                       self.advancedPowerMeasurement = getConfigListEntry(_("Use Power Measurement"), currLnb.powerMeasurement)
                                        self.list.append(self.advancedPowerMeasurement)
                                        if currLnb.powerMeasurement.value:
                                                self.list.append(getConfigListEntry(_("Power threshold in mA"), currLnb.powerThreshold))