X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FSatconfig.py;h=8748438af344d7a10b821ef8a9c36b6137f298e6;hp=30e2d5d50f9a9307f19455275739e277c6e5955c;hb=a4332bd8d55eb4b54972f64c91aefd42f388de52;hpb=c88b15f091165037ee7f2bcca55c9949e62a00f1

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 30e2d5d..8748438 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -19,10 +19,16 @@ class NimSetup(Screen):
 			if mode >= 3:		# > 2 Sats
 				list.append(getConfigListEntry(_("Port C"), config.Nims[nim.slotid].diseqcC))
 				list.append(getConfigListEntry(_("Port D"), config.Nims[nim.slotid].diseqcD))
+	
 	def createPositionerSetup(self, nim, list):
-		list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
-		list.append(getConfigListEntry(_("Latitude"), config.Nims[nim.slotid].latitude))
-		pass
+		list.append(getConfigListEntry(_("Positioner mode"), config.Nims[nim.slotid].positionerMode))
+		if (config.Nims[nim.slotid].positionerMode.value == 0): # USALS
+			list.append(getConfigListEntry(_("Longitude"), config.Nims[nim.slotid].longitude))
+			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))
+		elif (config.Nims[nim.slotid].positionerMode.value == 1): # manual
+			pass
 	
 	def createSetup(self):
 		self.list = [ ]
@@ -38,7 +44,8 @@ class NimSetup(Screen):
 				if (config.Nims[self.nim.slotid].diseqcMode.value == 4):
 					self.createPositionerSetup(self.nim, self.list)
 			elif config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner
-				self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo))
+				#self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo))
+				pass
 			elif config.Nims[self.nim.slotid].configMode.value == 2: # advanced mode
 				print "FIXME: implement advanced mode"
 		
@@ -58,12 +65,20 @@ class NimSetup(Screen):
 			self.createSetup()
 		
 	def keyLeft(self):
+		if self["config"].getCurrent()[0] == _("Configmode"):
+			if self.nim.slotid == 0:
+				return
 		self["config"].handleKey(config.key["prevElement"])
 		self.newConfig()
 
 	def keyRight(self):
 		#forbid to enable advanced mode until its ready
-		#if self["config"].getCurrent()[0] != _("Configmode"):
+		#perhaps its better to use an own element here
+		#this suckz .. how enable advanced config?
+		if self["config"].getCurrent()[0] == _("Configmode"):
+			if self.nim.slotid == 0:
+				return
+
 		self["config"].handleKey(config.key["nextElement"])
 		self.newConfig()
 
@@ -83,9 +98,10 @@ class NimSetup(Screen):
 			x[1].cancel()
 		self.close()
 
-	def __init__(self, session, nim):
+	def __init__(self, session, slotid):
 		Screen.__init__(self, session)
-		self.nim = nim
+		
+		self.nim = nimmanager.nimList()[slotid][1]
 		
 		self["actions"] = NumberActionMap(["SetupActions"],
 		{
@@ -125,5 +141,5 @@ class NimSelection(Screen):
 	def okbuttonClick(self):
 		selection = self["nimlist"].getCurrent()
 		if selection[1].nimType != -1:	#unknown/empty
-			self.session.open(NimSetup, selection[1])
+			self.session.open(NimSetup, selection[1].slotid)
 	
\ No newline at end of file