NIM cleanup, as described in https://lists.elitedvb.net/pipermail/enigma2-devel/2007-May/000016.html

3 files changed, 22 insertions, 19 deletions

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 40688df5..49a096fb 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:
@@ -574,4 +575,3 @@ def PositionerSetupStart(menuid):
 
 def Plugins(**kwargs):
 	return PluginDescriptor(name=_("Positioner setup"), description="Setup your positioner", where = PluginDescriptor.WHERE_SETUP, fnc=PositionerSetupStart)
-	
\ No newline at end of file
diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
index 5369ccf0..bb745920 100644
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
@@ -52,14 +52,17 @@ def SecSetupMain(Session, **kwargs):
 
 def SecSetupStart(menuid):
 	show = False
-	for slot in nimmgr.nimslots:
-		if slot.nimType == nimmgr.nimType["DVB-S"]:
-			show = True
-			break
-	if show and menuid == "scan":
-		return [(_("Satellite Equipment Setup"), SecSetupMain)]
-	else:
-		return []
+	
+	# other menu than "scan"?
+	if menuid != "scan": 
+		return [ ]
+
+	# only show if DVB-S frontends are available
+	for slot in nimmgr.nim_slots:
+		if slot.isCompatible("DVB-S"):
+			return [(_("Satellite Equipment Setup"), SecSetupMain)]
+
+	return [ ]
 
 def Plugins(**kwargs):
 	return PluginDescriptor(name=_("Satellite Equipment Setup"), description="Setup your satellite equipment", where = PluginDescriptor.WHERE_SETUP, fnc=SecSetupStart)
diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 6e4e27b5..1a520771 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -88,7 +88,7 @@ class Satfinder(ScanSetup):
 					del session.pip
 					if not self.openFrontend():
 						self.frontend = None # in normal case this should not happen
-		
+
 		ScanSetup.__init__(self, session)
 		self.tuner = Tuner(self.frontend)
 		
@@ -105,7 +105,7 @@ class Satfinder(ScanSetup):
 		self["lock_state"] = TunerInfo(TunerInfo.LOCK_STATE, statusDict = self.frontendStatus)
 		
 		self["introduction"].setText("")
-		
+
 		self.statusTimer = eTimer()
 		self.statusTimer.timeout.get().append(self.updateStatus)
 		self.statusTimer.start(50, False)
@@ -248,11 +248,11 @@ class NimSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
-		nimlist = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+		nimlist = nimmanager.getNimListOfType("DVB-S")
 		nimMenuList = []
 		for x in nimlist:
-			nimMenuList.append((_("NIM ") + (["A", "B", "C", "D"][x]) + ": " + nimmanager.getNimName(x) + " (" + nimmanager.getNimTypeName(x) + ")", x))
-		
+			nimMenuList.append((nimmanager.nim_slots[x].friendly_full_description, x))
+
 		self["nimlist"] = MenuList(nimMenuList)
 
 		self["actions"] = ActionMap(["OkCancelActions"],
@@ -262,11 +262,11 @@ class NimSelection(Screen):
 		}, -1)
 
 	def okbuttonClick(self):
-		selection = self["nimlist"].getCurrent()
-		self.session.open(Satfinder, selection[1])
+		selection = self["nimlist"].getCurrent()[1]
+		self.session.open(Satfinder, selection)
 
 def SatfinderMain(session, **kwargs):
-	nimList = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+	nimList = nimmanager.getNimListOfType("DVB-S")
 	if len(nimList) == 0:
 		session.open(MessageBox, _("No satellite frontend found!!"), MessageBox.TYPE_ERROR)
 	else: