X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FPluginBrowser.py;h=d423f467fdd6693bdbc00995bd25fe7ec8395b9e;hp=cce08aed3340e7ee801a45a2b2f838458faaafcb;hb=36cca1d3f31265929ef3443999ab7fd242b4dae5;hpb=4ba60a7e801150afc2e18f1250febe5e49a46d7a

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index cce08ae..d423f46 100755
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -38,7 +38,12 @@ class PluginBrowser(Screen):
 			"red": self.delete,
 			"green": self.download
 		})
+		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)
 	
@@ -62,12 +67,14 @@ class PluginBrowser(Screen):
 		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["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):
@@ -80,6 +87,14 @@ class PluginBrowser(Screen):
 		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
@@ -140,9 +155,9 @@ class PluginDownloadBrowser(Screen):
 	def runInstall(self, val):
 		if val:
 			if self.type == self.DOWNLOAD:
-				self.session.openWithCallback(self.installFinished, Console, cmdlist = ["ipkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
+				self.session.openWithCallback(self.installFinished, Console, cmdlist = ["opkg install " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
 			elif self.type == self.REMOVE:
-				self.session.openWithCallback(self.installFinished, Console, cmdlist = ["ipkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
+				self.session.openWithCallback(self.installFinished, Console, cmdlist = ["opkg remove " + "enigma2-plugin-" + self["list"].l.getCurrentSelection()[0].name])
 
 	def setWindowTitle(self):
 		if self.type == self.DOWNLOAD:
@@ -151,17 +166,17 @@ class PluginDownloadBrowser(Screen):
 			self.setTitle(_("Remove plugins"))
 
 	def startIpkgListInstalled(self):
-		self.container.execute("ipkg list_installed enigma2-plugin-*")
+		self.container.execute("opkg list_installed enigma2-plugin-*")
 
 	def startIpkgListAvailable(self):
-		self.container.execute("ipkg list enigma2-plugin-*")
+		self.container.execute("opkg list enigma2-plugin-*")
 
 	def startRun(self):
 		self["list"].instance.hide()
 		if self.type == self.DOWNLOAD:
 			if not PluginDownloadBrowser.lastDownloadDate or (time() - PluginDownloadBrowser.lastDownloadDate) > 3600:
 				# Only update from internet once per hour
-				self.container.execute("ipkg update")
+				self.container.execute("opkg update")
 				PluginDownloadBrowser.lastDownloadDate = time()
 			else:
 				self.startIpkgListAvailable()
@@ -205,8 +220,8 @@ class PluginDownloadBrowser(Screen):
 			self.remainingdata = ""
 
 		for x in lines:
-			plugin = x.split(" - ", 2)
-			if len(plugin) == 3:
+			plugin = x.split(" - ")
+			if len(plugin) >= 2:
 				if self.run == 1 and self.type == self.DOWNLOAD:
 					if plugin[0] not in self.installedplugins:
 						self.installedplugins.append(plugin[0])
@@ -224,6 +239,13 @@ class PluginDownloadBrowser(Screen):
 		
 		self.plugins = {}
 		for x in self.pluginlist:
+			if len(x) < 4:
+				split = x[0].split('-',3)
+				if not self.plugins.has_key(split[2]):
+					self.plugins[split[2]] = []
+				self.plugins[split[2]].append((PluginDescriptor(name = x[2], description = " ", icon = verticallineIcon), split[3]))
+				continue
+
 			split = x[3].split('-', 1)
 			if len(split) < 2:
 				continue
@@ -241,4 +263,4 @@ class PluginDownloadBrowser(Screen):
 		self.list = list
 		self["list"].l.setList(list)
 
-language.addCallback(languageChanged)
\ No newline at end of file
+language.addCallback(languageChanged)