X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FPluginBrowser.py;h=69bf80f70272c7d975d1b927b9bda2c72b4a4fb8;hb=3c14624fb6631feb91ac28c102027fb9bbc79b7a;hp=e3df4de976956b6840fc49fa8828488524b1c18e;hpb=256eda99abcf5486ed8433180a75da1e6afb86ac;p=vuplus_dvbapp

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index e3df4de..69bf80f 100755
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -1,5 +1,5 @@
 from Screen import Screen
-
+from Components.Language import language
 from enigma import eConsoleAppContainer
 
 from Components.ActionMap import ActionMap
@@ -9,30 +9,43 @@ 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
 
+def languageChanged():
+	plugins.clearPluginList()
+	plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
+
 class PluginBrowser(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		
-		self["red"] = Label(_("Remove Plugins"))
-		self["green"] = Label(_("Download Plugins"))
+		self["red"] = Label()
+		self["green"] = Label()
 		
 		self.list = []
 		self["list"] = PluginList(self.list)
-		self.updateList()
 		
-		self["actions"] = ActionMap(["WizardActions", "ColorActions"],
+		self["actions"] = ActionMap(["WizardActions"],
 		{
 			"ok": self.save,
 			"back": self.close,
+		})
+		self["PluginDownloadActions"] = ActionMap(["ColorActions"],
+		{
 			"red": self.delete,
 			"green": self.download
 		})
-		self.onExecBegin.append(self.checkWarnings)
+		self["SoftwareActions"] = ActionMap(["ColorActions"],
+		{
+			"red": self.openExtensionmanager
+		})
+		self["PluginDownloadActions"].setEnabled(False)
+		self["SoftwareActions"].setEnabled(False)
+		self.onFirstExecBegin.append(self.checkWarnings)
+		self.onShown.append(self.updateList)
 	
 	def checkWarnings(self):
 		if len(plugins.warnings):
@@ -43,25 +56,45 @@ class PluginBrowser(Screen):
 			self.session.open(MessageBox, text = text, type = MessageBox.TYPE_WARNING)
 
 	def save(self):
-		#self.close()
 		self.run()
 	
 	def run(self):
 		plugin = self["list"].l.getCurrentSelection()[0]
-		
 		plugin(session=self.session)
 		
 	def updateList(self):
 		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(_("Manage extensions"))
+			self["green"].setText("")
+			self["SoftwareActions"].setEnabled(True)
+			self["PluginDownloadActions"].setEnabled(False)
+		else:
+			self["red"].setText(_("Remove Plugins"))
+			self["green"].setText(_("Download Plugins"))
+			self["SoftwareActions"].setEnabled(False)
+			self["PluginDownloadActions"].setEnabled(True)
+			
 	def delete(self):
-		self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)
+		self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginDownloadBrowser, PluginDownloadBrowser.REMOVE)
 	
 	def download(self):
-		self.session.openWithCallback(self.updateList, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)
+		self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginDownloadBrowser, PluginDownloadBrowser.DOWNLOAD)
+
+	def PluginDownloadBrowserClosed(self):
+		self.updateList()
+		self.checkWarnings()
+
+	def openExtensionmanager(self):
+		if fileExists(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/SoftwareManager/plugin.py")):
+			try:
+				from Plugins.SystemPlugins.SoftwareManager.plugin import PluginManager
+			except ImportError:
+				self.session.open(MessageBox, _("The Softwaremanagement extension is not installed!\nPlease install it."), type = MessageBox.TYPE_INFO,timeout = 10 )
+			else:
+				self.session.openWithCallback(self.PluginDownloadBrowserClosed, PluginManager)
 
 class PluginDownloadBrowser(Screen):
 	DOWNLOAD = 0
@@ -190,7 +223,8 @@ class PluginDownloadBrowser(Screen):
 			plugin = x.split(" - ", 2)
 			if len(plugin) == 3:
 				if self.run == 1 and self.type == self.DOWNLOAD:
-					self.installedplugins.append(plugin[0])
+					if plugin[0] not in self.installedplugins:
+						self.installedplugins.append(plugin[0])
 				else:
 					if plugin[0] not in self.installedplugins:
 						plugin.append(plugin[0][15:])
@@ -222,3 +256,4 @@ class PluginDownloadBrowser(Screen):
 		self.list = list
 		self["list"].l.setList(list)
 
+language.addCallback(languageChanged)
\ No newline at end of file