Merge commit 'origin/bug_112_enable_extensions_manager' into experimental

1 files changed, 16 insertions, 2 deletions

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index acb9dafb..cce08aed 100755
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -9,7 +9,7 @@ from Components.Label import Label
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Plugins.Plugin import PluginDescriptor
-from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
+from Tools.Directories import resolveFilename, fileExists, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 from Tools.LoadPixmap import LoadPixmap
 
 from time import time
@@ -33,6 +33,12 @@ class PluginBrowser(Screen):
 			"ok": self.save,
 			"back": self.close,
 		})
+		self["PluginDownloadActions"] = ActionMap(["ColorActions"],
+		{
+			"red": self.delete,
+			"green": self.download
+		})
+		self["PluginDownloadActions"].setEnabled(False)
 		self.onFirstExecBegin.append(self.checkWarnings)
 		self.onShown.append(self.updateList)
 	
@@ -55,7 +61,15 @@ class PluginBrowser(Screen):
 		self.pluginlist = plugins.getPlugins(PluginDescriptor.WHERE_PLUGINMENU)
 		self.list = [PluginEntryComponent(plugin) for plugin in self.pluginlist]
 		self["list"].l.setList(self.list)
-
+		if fileExists(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/SoftwareManager/plugin.py")):
+			self["red"].setText("")
+			self["green"].setText("")
+			self["PluginDownloadActions"].setEnabled(False)
+		else:
+			self["red"].setText(_("Remove Plugins"))
+			self["green"].setText(_("Download Plugins"))
+			self["PluginDownloadActions"].setEnabled(True)
+			
 	def delete(self):
 		self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)