X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ed40f6f85c9c07c3c1224ae20601082c0309a631..7b0d371a7bbfb9e8d624eec9ed97e9a835f75ca7:/lib/python/Components/PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 9425e56d..590f428d 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -5,6 +5,7 @@ from sys import stdout
 from Tools.Directories import fileExists
 from Tools.Import import my_import
 from Plugins.Plugin import PluginDescriptor
+import keymapparser
 
 class PluginComponent:
 	def __init__(self):
@@ -32,11 +33,11 @@ class PluginComponent:
 
 	def readPluginList(self, directory):
 		"""enumerates plugins"""
-		
+
 		categories = os_listdir(directory)
-		
+
 		new_plugins = [ ]
-		
+
 		for c in categories:
 			directory_category = directory + c
 			if not os_path.isdir(directory_category):
@@ -69,6 +70,13 @@ class PluginComponent:
 							p.updateIcon(path)
 							new_plugins.append(p)
 
+						if fileExists(path + "/keymap.xml"):
+							try:
+								keymapparser.readKeymap(path + "/keymap.xml")
+							except Exception, exc:
+								print "keymap for plugin %s/%s failed to load: " % (c, pluginname), exc
+								self.warnings.append( (c + "/" + pluginname, str(exc)) )
+
 		# build a diff between the old list of plugins and the new one
 		# internally, the "fnc" argument will be compared with __eq__
 		plugins_added = [p for p in new_plugins if p not in self.pluginList]
@@ -93,7 +101,7 @@ class PluginComponent:
 
 	def getPluginsForMenu(self, menuid):
 		res = [ ]
-		for p in self.getPlugins(PluginDescriptor.WHERE_SETUP):
+		for p in self.getPlugins(PluginDescriptor.WHERE_MENU):
 			res += p(menuid)
 		return res