X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c8c839608b98cc3b37e90d049b66e646f8e46cd9..e5a909e610fcd24a0bb6d7b1a586a14cd9767512:/lib/python/Plugins/Plugin.py

diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index 4b5b7e2a..3a79e396 100644
--- 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,14 +43,17 @@ class PluginDescriptor:
 			self.where = [ where ]
 		self.description = description
 
-		self.iconstr = icon
-		self.icon = None
+		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