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

diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index c792446a..583c9ad8 100644
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@ -1,5 +1,5 @@
-from enigma import loadPNG
 from Components.config import ConfigSubsection, config
+from Tools.LoadPixmap import LoadPixmap
 
 config.plugins = ConfigSubsection()
 
@@ -22,8 +22,8 @@ class PluginDescriptor:
 	WHERE_PLUGINMENU  = 2
 	# argument: session, serviceref (currently selected)
 	WHERE_MOVIELIST = 3
-	# ...
-	WHERE_SETUP    = 4
+	# argument: menuid. Fnc must return list with menuitems (4-tuple of name, fnc to call, entryid or None, weight or None)
+	WHERE_MENU = 4
 	
 	# reason (0: start, 1: end)
 	WHERE_AUTOSTART = 5
@@ -41,7 +41,11 @@ class PluginDescriptor:
 	# file-scanner, fnc must return a list of Scanners
 	WHERE_FILESCAN = 9
 	
-	def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None):
+	# fnc must take an interface name as parameter and return None if the plugin supports an extended setup
+	# or return a function which is called with session and the interface name for extended setup of this interface
+	WHERE_NETWORKSETUP = 10
+	
+	def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None):
 		self.name = name
 		if type(where) is list:
 			self.where = where
@@ -55,13 +59,18 @@ class PluginDescriptor:
 		else:
 			self.icon = icon
 
+		self.wakeupfnc = wakeupfnc
+
 		self.__call__ = fnc
 
 	def updateIcon(self, path):
 		if type(self.iconstr) is str:
-			self.icon = loadPNG(path + "/" + self.iconstr)
+			self.icon = LoadPixmap(path + "/" + self.iconstr)
 		else:
 			self.icon = None
 
+	def getWakeupTime(self):
+		return self.wakeupfnc and self.wakeupfnc() or -1
+
 	def __eq__(self, other):
 		return self.__call__ == other.__call__