X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4929343a3b3110582330ba471c8ece9f844f3816..c767434380ce3dc9fed8c55e69cda5c4e1544005:/lib/python/Screens/Satconfig.py

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 1e3cbd51..074033fa 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -10,42 +10,58 @@ from Components.config import getConfigListEntry
 class NimSetup(Screen):
 	def createSimpleSetup(self, nim, list, mode):
 		if mode == 0:			#single Sat
-			list.append(getConfigListEntry("Satellite", config.Nims[nim.slotid].diseqcA))
+			list.append(getConfigListEntry(_("Satellite"), config.Nims[nim.slotid].diseqcA))
 		else:							# > 1 Sats
-			list.append(getConfigListEntry("Port A", config.Nims[nim.slotid].diseqcA))
+			list.append(getConfigListEntry(_("Port A"), config.Nims[nim.slotid].diseqcA))
 
 		if mode >= 1:			# > 1 Sats
-			list.append(getConfigListEntry("Port B", config.Nims[nim.slotid].diseqcB))
+			list.append(getConfigListEntry(_("Port B"), config.Nims[nim.slotid].diseqcB))
 			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))
+				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 = [ ]
 		
-		self.list.append(getConfigListEntry("Configmode", config.Nims[self.nim.slotid].configMode))
-		
-		if config.Nims[self.nim.slotid].configMode.value == 0:			#simple setup
-			self.list.append(getConfigListEntry("Diseqcmode", config.Nims[self.nim.slotid].diseqcMode))
+		if (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-S"]):
+			self.list.append(getConfigListEntry(_("Configmode"), config.Nims[self.nim.slotid].configMode))
+			
+			if config.Nims[self.nim.slotid].configMode.value == 0:			#simple setup
+				self.list.append(getConfigListEntry(_("Diseqcmode"), config.Nims[self.nim.slotid].diseqcMode))
+			
+				if (0 <= config.Nims[self.nim.slotid].diseqcMode.value < 4):
+					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 config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner
+				#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"
 		
-			if (0 <= config.Nims[self.nim.slotid].diseqcMode.value < 4):
-				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)
-		else:	
-			print "FIXME: implement advanced mode"
+		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"]):
+			self.list.append(getConfigListEntry(_("Terrestrial provider"), config.Nims[self.nim.slotid].terrestrial))
+
 
 		self["config"].list = self.list
 		self["config"].l.setList(self.list)
 		
 	def newConfig(self):	
-		if self["config"].getCurrent()[0] == "Diseqcmode":
+		if self["config"].getCurrent()[0] == _("Diseqcmode"):
 			self.createSetup()
-		if self["config"].getCurrent()[0] == "Configmode":
+		if self["config"].getCurrent()[0] == _("Configmode"):
 			self.createSetup()
 		
 	def keyLeft(self):
@@ -54,8 +70,13 @@ class NimSetup(Screen):
 
 	def keyRight(self):
 		#forbid to enable advanced mode until its ready
-		if self["config"].getCurrent()[0] != "Configmode":
-			self["config"].handleKey(config.key["nextElement"])
+		#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()
 
 	def keyNumberGlobal(self, number):