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

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 3207c09c3a2fe4b3e49ed1bd8cd97644c07b65c9..7efd33e267198ec260f3fd47e8a836bc8cb89e82 100644 (file)
--- 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":
 
 def menu(menuid, **kwargs):
        if menuid == "mainmenu":

-               return [(_("Media player"), main)]
+               return [(_("Media player"), main, "media_player")]

        return []
 
 def filescan_open(list, session, **kwargs):
        return []
 
 def filescan_open(list, session, **kwargs):

diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index a2ee9fefad88f78a444b2f12180ac0972d4ddfe0..b3886723e90e7c530a65b49113dc2cddaac91fa7 100644 (file)
--- 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
        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)
        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 048722cff79ac81993d0212e9ec99a9c988b3489..457648104b95dca49ecd085d016f36a8ce1f850f 100644 (file)
--- 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":
 
 def PositionerSetupStart(menuid, **kwargs):
        if menuid == "scan":

-               return [(_("Positioner setup"), PositionerMain)]
+               return [(_("Positioner setup"), PositionerMain, "positioner_setup")]

        else:
                return []
 
        else:
                return []
 

diff --git a/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py b/lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
index 77c4d0a37010eca931f46cf8ac4d1d6a4b34892c..17f8fa2ebfeaad72f0643f5c656eba4ff4311eb7 100644 (file)
--- 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"):
        # 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 [ ]
 
 
        return [ ]
 

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 9ad113021640c2158731f5020ba17a6a059524cd..fc7855f8f3c57cde1e8dc082740a3615345c5d0c 100644 (file)
--- 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":
 
 def SatfinderStart(menuid, **kwargs):
        if menuid == "scan":

-               return [(_("Satfinder"), SatfinderMain)]
+               return [(_("Satfinder"), SatfinderMain, "satfinder")]

        else:
                return []
 
        else:
                return []
 

diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
index ecebe7647e1cd97470ccc26f0089865f65512c15..eeebf70498986f98699ff007d7d24364a9f0880c 100755 (executable)
--- 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":
 
 def SkinSelSetup(menuid, **kwargs):
        if menuid == "system":

-               return [("Skin...", SkinSelMain)]
+               return [("Skin...", SkinSelMain, "skin_selector")]

        else:
                return []
 
        else:
                return []
 

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 6ea0f647e1211ffc8bd56487c8f65993635e6f2f..2b8ac05d27a09884010262a66b56a5c29a2622de 100644 (file)
--- 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):
                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 = [ ]
 
                # for the skin: first try a menu_<menuID>, then Menu
                self.skinName = [ ]