fix

[vuplus_dvbapp] / lib / python / Screens / Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 5192858..535abbb 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -24,9 +24,9 @@ class NimSetup(Screen):
                list.append(getConfigListEntry(_("Positioner mode"), config.Nims[nim.slotid].positionerMode))
                if (currentConfigSelectionElement(config.Nims[nim.slotid].positionerMode) == "usals"): # USALS
                        list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
-                       list.append(getConfigListEntry("", config.Nims[nim.slotid].longitudeOrientation))
+                       list.append(getConfigListEntry(" ", config.Nims[nim.slotid].longitudeOrientation))
                        list.append(getConfigListEntry(_("Latitude"), config.Nims[nim.slotid].latitude))
-                       list.append(getConfigListEntry("", config.Nims[nim.slotid].latitudeOrientation))
+                       list.append(getConfigListEntry(" ", config.Nims[nim.slotid].latitudeOrientation))
                elif (currentConfigSelectionElement(config.Nims[nim.slotid].positionerMode) == "manual"): # manual
                        pass
        
@@ -55,10 +55,7 @@ class NimSetup(Screen):
                                        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)
-                       elif currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "nothing": # nothing
-                               #self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo))
-                               pass
-                       elif currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "loopthrough": # linked
+                       elif currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) in ["loopthrough", "satposdepends", "nothing", "equal"]:
                                pass
                        elif currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "advanced": # advanced
                                # SATs
@@ -82,6 +79,7 @@ class NimSetup(Screen):
                                        self.advancedDiseqcMode = getConfigListEntry(_("DiSEqC mode"), currLnb.diseqcMode)
                                        self.list.append(self.advancedDiseqcMode)
                                        if currentConfigSelectionElement(currLnb.diseqcMode) != "none":
+                                               self.list.append(getConfigListEntry(_("Toneburst"), currLnb.toneburst))
                                                self.list.append(getConfigListEntry(_("Committed DiSEqC command"), currLnb.commitedDiseqcCommand))
                                                self.list.append(getConfigListEntry(_("Fast DiSEqC"), currLnb.fastDiseqc))
                                                self.list.append(getConfigListEntry(_("Sequence repeat"), currLnb.sequenceRepeat))
@@ -93,9 +91,9 @@ class NimSetup(Screen):
                                                        self.list.append(getConfigListEntry(_("DiSEqC repeats"), currLnb.diseqcRepeats))
                                                if currentConfigSelectionElement(currLnb.diseqcMode) == "1_2":
                                                        self.list.append(getConfigListEntry(_("Longitude"), currLnb.longitude))
-                                                       self.list.append(getConfigListEntry("", currLnb.longitudeOrientation))
+                                                       self.list.append(getConfigListEntry(" ", currLnb.longitudeOrientation))
                                                        self.list.append(getConfigListEntry(_("Latitude"), currLnb.latitude))
-                                                       self.list.append(getConfigListEntry("", currLnb.latitudeOrientation))
+                                                       self.list.append(getConfigListEntry(" ", currLnb.latitudeOrientation))
                                                        self.advancedPowerMeasurement = getConfigListEntry("Use Power Measurement", currLnb.powerMeasurement)
                                                        self.list.append(self.advancedPowerMeasurement)
                                                        if currentConfigSelectionElement(currLnb.powerMeasurement) == "yes":
@@ -108,7 +106,6 @@ class NimSetup(Screen):
                                                self.list.append(getConfigListEntry(_("Threshold"), currLnb.threshold))
                                        self.list.append(getConfigListEntry(_("12V Output"), currLnb.output_12v))
                                        self.list.append(getConfigListEntry(_("Increased voltage"), currLnb.increased_voltage))
-                                       self.list.append(getConfigListEntry(_("Toneburst"), currLnb.toneburst))
                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"]):