X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FNimManager.py;h=78e17bb7233505e5e5c77f1674cdbbe56b25ae05;hp=5154e2b05654ace4ad423c51da067fe5908434a0;hb=ec24491e3d4fa41b316d3399e4af56a6a9f9f67f;hpb=f488e1db5b364c4df7135008a3b073a1d0ba06ca

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 5154e2b..78e17bb 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -554,6 +554,13 @@ class NimManager:
 	def getSatDescription(self, pos):
 		return self.satellites[pos]
 
+	def sortFunc(self, x):
+		orbpos = x[0]
+		if orbpos > 1800:
+			return orbpos - 3600
+		else:
+			return orbpos + 1800
+
 	def readTransponders(self):
 		# read initial networks from file. we only read files which we are interested in,
 		# which means only these where a compatible tuner exists.
@@ -565,9 +572,10 @@ class NimManager:
 		if self.hasNimType("DVB-S"):
 			print "Reading satellites.xml"
 			db.readSatellites(self.satList, self.satellites, self.transponders)
-#			print "SATLIST", self.satList
-#			print "SATS", self.satellites
-#			print "TRANSPONDERS", self.transponders
+			self.satList.sort(key = self.sortFunc) # sort by orbpos
+			#print "SATLIST", self.satList
+			#print "SATS", self.satellites
+			#print "TRANSPONDERS", self.transponders
 
 		if self.hasNimType("DVB-C"):
 			print "Reading cables.xml"
@@ -939,7 +947,7 @@ def InitNimManager(nimmgr):
 
 	lnb_choices = {
 		"universal_lnb": _("Universal LNB"),
-#		"unicable": _("Unicable"),
+		"unicable": _("Unicable"),
 		"c_band": _("C-Band"),
 		"user_defined": _("User defined")}