changes for new config

[enigma2.git] / lib / python / Plugins / Plugin.py

diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index 183419c7fe90d357b83574963f3767ed78b73b6a..3a79e396325d7feb4de640ff722468a6da83f3fd 100644 (file)
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@ -11,8 +11,10 @@ class PluginDescriptor:
        #   servicereference
        #   reason
        
+       # you have to ignore unknown kwargs!
+       
        # argument: session
-       WHERE_BLUEMENU = 0
+       WHERE_EXTENSIONSMENU = 0
        WHERE_MAINMENU = 1
        WHERE_PLUGINMENU  = 2
        # argument: session, serviceref (currently selected)
@@ -26,6 +28,13 @@ class PluginDescriptor:
        # start as wizard. In that case, fnc must be a screen class!
        WHERE_WIZARD = 6
        
+       # like autostart, but for a session. currently, only session starts are 
+       # delivered, and only on pre-loaded plugins
+       WHERE_SESSIONSTART = 7
+       
+       # start as teletext plugin. arguments: session, serviceref
+       WHERE_TELETEXT = 8
+       
        def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None):
                self.name = name
                if type(where) is list:
@@ -34,12 +43,19 @@ class PluginDescriptor:
                        self.where = [ where ]
                self.description = description
 
-               self.iconstr = icon
+               if type(icon) is str or icon is None:
+                       self.iconstr = icon
+                       self.icon = None
+               else:
+                       self.icon = icon
 
                self.__call__ = fnc
 
        def updateIcon(self, path):
                if type(self.iconstr) is str:
-                       self.icon = loadPNG(path + self.iconstr)
+                       self.icon = loadPNG(path + "/" + self.iconstr)
                else:
-                       self.icon = None
\ No newline at end of file
+                       self.icon = None
+
+       def __eq__(self, other):
+               return self.__call__ == other.__call__