append, don't overwrite __init__.py files

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

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 86f4a6b97c9c23b8f75a7768c1d3c7377ff41394..a21dde8041f5b9dff088bf5e870c7c354f7bfcc9 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,16 +101,19 @@ class PluginDownloadBrowser(Screen):
                        elif self.type == self.REMOVE:
                                self.session.openWithCallback(self.installFinished, Console, ["ipkg remove " + self.pluginlist[self["list"].l.getCurrentSelectionIndex()][0]])
 
-       def startRun(self):
+       def setTitle(self):
                if self.type == self.DOWNLOAD:
-                       self.session.currentDialog.instance.setTitle(_("Downloadale new plugins"))
+                       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")
                
        def installFinished(self):
-               plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
+               plugins.reReadPluginList(resolveFilename(SCOPE_PLUGINS))
+               self.close()
                
        def runFinished(self, retval):
                if self.run == 0:
@@ -134,6 +138,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))