X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d27d90f79580afe6699bc3bd416c4ea2549ecbd1..19e1b120e85f3cf3906c640af47c5084b09dd3be:/lib/python/Screens/PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index c0e85c87..e9b009ae 100644
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -68,16 +68,15 @@ class PluginDownloadBrowser(Screen):
 		self.container.appClosed.get().append(self.runFinished)
 		self.container.dataAvail.get().append(self.dataAvail)
 		self.onLayoutFinish.append(self.startRun)
+		self.onShown.append(self.setTitle)
 		
 		self.list = []
 		self["list"] = PluginList(self.list)
 		self.pluginlist = []
 		
 		if self.type == self.DOWNLOAD:
-			self.session.currentDialog.instance.setTitle(_("Downloadale new plugins"))
 			self["text"] = Label(_("Downloading plugin information. Please wait..."))
 		elif self.type == self.REMOVE:
-			self.session.currentDialog.instance.setTitle(_("Remove plugins"))
 			self["text"] = Label(_("Getting plugin information. Please wait..."))
 		
 		self.run = 0
@@ -102,20 +101,29 @@ class PluginDownloadBrowser(Screen):
 			elif self.type == self.REMOVE:
 				self.session.openWithCallback(self.installFinished, Console, ["ipkg remove " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
 
+	def setTitle(self):
+		if self.type == self.DOWNLOAD:
+			self.session.currentDialog.instance.setTitle(_("Downloadable new plugins"))
+		elif self.type == self.REMOVE:
+			self.session.currentDialog.instance.setTitle(_("Remove plugins"))
+
 	def startRun(self):
 		self["list"].instance.hide()
-		self.container.execute("ipkg update")
+		if self.type == self.DOWNLOAD:
+			self.container.execute("ipkg update")
+		elif self.type == self.REMOVE:
+			self.run = 1
+			self.container.execute("ipkg list_installed enigma2-plugin-*")
 		
 	def installFinished(self):
 		plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
+		self.close()
 		
 	def runFinished(self, retval):
 		if self.run == 0:
 			self.run = 1
 			if self.type == self.DOWNLOAD:
 				self.container.execute("ipkg list enigma2-plugin-*")
-			elif self.type == self.REMOVE:
-				self.container.execute("ipkg list_installed enigma2-plugin-*")
 		else:
 			if len(self.pluginlist) > 0:
 				self.updateList()
@@ -132,6 +140,7 @@ class PluginDownloadBrowser(Screen):
 				self.pluginlist.append(plugin)
 	
 	def updateList(self):
+		self.list = []
 		for x in self.pluginlist:
 			plugin = PluginDescriptor(name = x[3], description = x[2])
 			self.list.append(PluginEntryComponent(plugin))