ability to set color in multi content lists

[enigma2.git] / lib / python / Screens / PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index adec1b6b896a9481e67949e5f9fa4927e04c8be4..e9b009ae129fb97986a1deb6b52e3ae436639ffe 100644 (file)
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -68,6 +68,7 @@ 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)
@@ -100,24 +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):
-               #if self.type == self.DOWNLOAD:
-               #       self.session.currentDialog.instance.setTitle(_("Downloadale new plugins"))
-               #elif self.type == self.REMOVE:
-               #       self.session.currentDialog.instance.setTitle(_("Remove plugins"))
                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()
@@ -134,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))