From: Mladen Horvat <acid-burn@opendreambox.org>
Date: Mon, 7 Dec 2009 13:22:39 +0000 (+0100)
Subject: Merge commit 'origin/bug_308_add_where_softwaremanager' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~164
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/28d283c49a8791cc84d70877275f232d5cb526ce

Merge commit 'origin/bug_308_add_where_softwaremanager' into experimental

Conflicts:
	lib/python/Plugins/Plugin.py
---

28d283c49a8791cc84d70877275f232d5cb526ce
diff --cc lib/python/Plugins/Plugin.py
index dc68ebf3,8d538ef0..7cf0c18b
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@@ -52,8 -52,12 +52,14 @@@ class PluginDescriptor
  	# reason (True: Networkconfig read finished, False: Networkconfig reload initiated )
  	WHERE_NETWORKCONFIG_READ = 12
  
 +	WHERE_AUDIOMENU = 13
 +
+ 	# fnc 'SoftwareSupported' or  'AdvancedSoftwareSupported' must take a parameter and return None
+ 	# if the plugin should not be displayed inside Softwaremanger or return a function which is called with session
+ 	# and 'None' as parameter to call the plugin from the Softwaremanager menus. "menuEntryName" and "menuEntryDescription"
+ 	# should be provided to name and describe the new menu entry.
+ 	WHERE_SOFTWAREMANAGER = 14
+ 
  	def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None, internal = False):
  		self.name = name
  		self.internal = internal