add entryid to WHERE_MENU, add entryids in local plugins (patch by Moritz Venn, 005_enigma2_add_entryid_support_to_where_menu.patch)

7 files changed, 7 insertions, 7 deletions

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 3207c09c..7efd33e2 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -707,7 +707,7 @@ def main(session, **kwargs):
 
 def menu(menuid, **kwargs):
 	if menuid == "mainmenu":
-		return [(_("Media player"), main)]
+		return [(_("Media player"), main, "media_player")]
 	return []
 
 def filescan_open(list, session, **kwargs):
diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index a2ee9fef..b3886723 100644
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@ -22,7 +22,7 @@ class PluginDescriptor:
 	WHERE_PLUGINMENU  = 2
 	# argument: session, serviceref (currently selected)
 	WHERE_MOVIELIST = 3
-	# argument: menuid. Fnc must return list with menuitems (2-tuple of name, fnc to call)
+	# argument: menuid. Fnc must return list with menuitems (3-tuple of name, fnc to call, entryid or None)
 	WHERE_MENU = 4
 	
 	# reason (0: start, 1: end)
diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 048722cf..45764810 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -569,7 +569,7 @@ def PositionerMain(session, **kwargs):
 
 def PositionerSetupStart(menuid, **kwargs):
 	if menuid == "scan":
-		return [(_("Positioner setup"), PositionerMain)]
+		return [(_("Positioner setup"), PositionerMain, "positioner_setup")]
 	else:
 		return []
 
diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
index 77c4d0a3..17f8fa2e 100644
--- a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
@@ -61,7 +61,7 @@ def SecSetupStart(menuid):
 	# 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 [(_("Satellite Equipment Setup"), SecSetupMain, "satellite_equipment_setup")]
 
 	return [ ]
 
diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 9ad11302..fc7855f8 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -272,7 +272,7 @@ def SatfinderMain(session, **kwargs):
 
 def SatfinderStart(menuid, **kwargs):
 	if menuid == "scan":
-		return [(_("Satfinder"), SatfinderMain)]
+		return [(_("Satfinder"), SatfinderMain, "satfinder")]
 	else:
 		return []
 
diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
index ecebe764..eeebf704 100755
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
@@ -131,7 +131,7 @@ def SkinSelMain(session, **kwargs):
 
 def SkinSelSetup(menuid, **kwargs):
 	if menuid == "system":
-		return [("Skin...", SkinSelMain)]
+		return [("Skin...", SkinSelMain, "skin_selector")]
 	else:
 		return []
 
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 6ea0f647..2b8ac05d 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -188,7 +188,7 @@ class Menu(Screen):
 		if menuID is not None:
 			# plugins
 			for l in plugins.getPluginsForMenu(menuID):
-				list.append((l[0], boundFunction(l[1], self.session)))
+				list.append((l[0], boundFunction(l[1], self.session), l[2]))
 
 		# for the skin: first try a menu_<menuID>, then Menu
 		self.skinName = [ ]