fix storing of advanced satconfig out of the start wizard

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

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index be32763a04919dba56b5576ce8bc0900c7bfa534..936e5d174f64f630d731ca212c2224c5f53aea63 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -21,14 +21,14 @@ class NimSetup(Screen):
                                list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD))
 
        def createPositionerSetup(self, list):
-               list.append(getConfigListEntry(_("Positioner mode"), self.nimConfig.positionerMode))
-               if (currentConfigSelectionElement(self.nimConfig.positionerMode) == "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))
-               elif (currentConfigSelectionElement(self.nimConfig.positionerMode) == "manual"): # manual
-                       pass
+#              list.append(getConfigListEntry(_("Positioner mode"), self.nimConfig.positionerMode))
+#              if (currentConfigSelectionElement(self.nimConfig.positionerMode) == "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))
+#              elif (currentConfigSelectionElement(self.nimConfig.positionerMode) == "manual"): # manual
+#                      pass
 
        def createSetup(self):
                print "Creating setup"
@@ -90,6 +90,8 @@ class NimSetup(Screen):
                        self["config"].handleKey(config.key[str(number)])
 
        def run(self):
+               if currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "advanced":
+                       self.fillAdvancedList()
                for x in self["config"].list:
                        x[1].save()
                nimmanager.sec.update()
@@ -142,6 +144,8 @@ class NimSetup(Screen):
 
        def fillAdvancedList(self):
                self.list = [ ]
+               self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
+               self.list.append(self.configMode)
                self.advancedSatsEntry = getConfigListEntry(_("Satellite"), self.nimConfig.advanced.sats)
                self.list.append(self.advancedSatsEntry)
                for x in nimmanager.satList:
@@ -150,8 +154,6 @@ class NimSetup(Screen):
                self["config"].list = self.list
 
        def keySave(self):
-               if currentConfigSelectionElement(config.Nims[self.nim.slotid].configMode) == "advanced":
-                       self.fillAdvancedList()
                self.run()
                self.close()