X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20..601d6f20152532574b5d60aed5ba862afa21ba1c:/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 40688df5..fccd2625 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -532,7 +532,8 @@ class NimSelection(Screen):
 		nimlist = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
 		nimMenuList = []
 		for x in nimlist:
-			nimMenuList.append((_("NIM ") + (["A", "B", "C", "D"][x]) + ": " + nimmanager.getNimName(x) + " (" + nimmanager.getNimTypeName(x) + ")", x))
+			n = nimmanager.nim_slots[x]
+			nimMenuList.append((n.friendly_full_name, x))
 		
 		self["nimlist"] = MenuList(nimMenuList)
 
@@ -547,7 +548,7 @@ class NimSelection(Screen):
 		self.session.open(PositionerSetup, selection[1])
 
 def PositionerMain(session, **kwargs):
-	nimList = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+	nimList = nimmanager.getNimListOfType("DVB-S")
 	if len(nimList) == 0:
 		session.open(MessageBox, _("No positioner capable frontend found."), MessageBox.TYPE_ERROR)
 	else:
@@ -566,12 +567,14 @@ def PositionerMain(session, **kwargs):
 			else:
 				session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)
 
-def PositionerSetupStart(menuid):
+def PositionerSetupStart(menuid, **kwargs):
 	if menuid == "scan":
-		return [(_("Positioner setup"), PositionerMain)]
+		return [(_("Positioner setup"), PositionerMain, "positioner_setup", None)]
 	else:
 		return []
 
 def Plugins(**kwargs):
-	return PluginDescriptor(name=_("Positioner setup"), description="Setup your positioner", where = PluginDescriptor.WHERE_SETUP, fnc=PositionerSetupStart)
-	
\ No newline at end of file
+	if (nimmanager.hasNimType("DVB-S")):
+		return PluginDescriptor(name=_("Positioner setup"), description="Setup your positioner", where = PluginDescriptor.WHERE_MENU, fnc=PositionerSetupStart)
+	else:
+		return []