Merge branch 'master' into experimental

[enigma2.git] / lib / python / Components / config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 876e3a34a7b56683960a98981088ef409eb1bf35..a1f3d2c376e66d437bc74bfc5ceedca10a784859 100755 (executable)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1184,12 +1184,25 @@ class ConfigSatlist(ConfigSelection):
        def __init__(self, list, default = None):
                if default is not None:
                        default = str(default)
-               ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default)
+               list.sort(key = lambda x: int(x[0]))
+               self._satList = list
+               choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]
+               
+               ConfigSelection.__init__(self, choices = choices, default = default)
 
+       # use this function to get the orbital position, don't rely on .index
        def getOrbitalPosition(self):
                if self.value == "":
                        return None
                return int(self.value)
+       
+       def getSatList(self):
+               return self._satList
+       
+       def getSat(self):
+               return self.satList[self.index]
+       
+       satList = property(getSatList)
 
        orbital_position = property(getOrbitalPosition)