X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bc8ba2d89e7c71e95c1ee8e8e2da26a993e01997..8533d3d6b365662101f54abd7d915eba5009df94:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 1ad4c229..8af2763f 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -2,7 +2,6 @@ from config import config       #global config instance
 
 from config import configElement
 from config import ConfigSubsection
-from config import ConfigSlider
 from config import configSelection
 from config import currentConfigSelectionElement
 from config import getConfigSelectionElement
@@ -392,9 +391,9 @@ class NimManager:
 		def startElement(self, name, attrs):
 			if (name == "terrestrial"):
 				#print "found sat " + attrs.get('name',"") + " " + str(attrs.get('position',""))
-				tname = attrs.get('name',"")
+				tname = attrs.get('name',"").encode("UTF-8")
 				tflags = attrs.get('flags',"")
-				self.terrestrialsList.append((tname, tflags))
+				self.terrestrialsList.append((tname, tname, tflags))
 				self.parsedTer = str(tname)
 			elif (name == "transponder"):
 				# TODO finish this!
@@ -558,7 +557,10 @@ class NimManager:
 				nimText += ("DVB-S", "DVB-C", "DVB-T")[slot.nimType] + ")"
 			list.append((nimText, slot))
 		return list
-	
+
+	def getNimConfigMode(self, slotid):
+		return currentConfigSelectionElement(config.Nims[slotid].configMode)
+
 	def getSatListForNim(self, slotid):
 		list = []
 		if (self.getNimType(slotid) == self.nimType["DVB-S"]):
@@ -726,7 +728,7 @@ def InitNimManager(nimmgr):
 		elif slot.nimType == nimmgr.nimType["DVB-C"]:
 			nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList, False);
 		elif slot.nimType == nimmgr.nimType["DVB-T"]:
-			nim.cable = configElement(cname + "terrestrial", configSelection, 0, nimmgr.terrestrialsList, False);
+			nim.terrestrial = configElement(cname + "terrestrial", configSelection, 0, nimmgr.terrestrialsList, False);
 		else:
 			print "pls add support for this frontend type!"