diff options
| author | acid-burn <acidburn@opendreambox.org> | 2009-08-26 23:07:36 +0200 |
|---|---|---|
| committer | acid-burn <acidburn@opendreambox.org> | 2009-08-26 23:07:36 +0200 |
| commit | 2ea3c0f4cdde1978d6517e8f8fae16a8070cb792 (patch) | |
| tree | 0b09c11547d920cf1a7b2005cd35120daa2ce46d /lib/python/Screens | |
| parent | 256eda99abcf5486ed8433180a75da1e6afb86ac (diff) | |
| download | enigma2-2ea3c0f4cdde1978d6517e8f8fae16a8070cb792.tar.gz enigma2-2ea3c0f4cdde1978d6517e8f8fae16a8070cb792.zip | |
PluginBrowser.py: -dont show downloadable plugins twice
- properly reload list after download/remove of an plugin
Diffstat (limited to 'lib/python/Screens')
| -rwxr-xr-x | lib/python/Screens/PluginBrowser.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py index e3df4de9..3a7df9fb 100755 --- a/lib/python/Screens/PluginBrowser.py +++ b/lib/python/Screens/PluginBrowser.py @@ -23,7 +23,6 @@ class PluginBrowser(Screen): self.list = [] self["list"] = PluginList(self.list) - self.updateList() self["actions"] = ActionMap(["WizardActions", "ColorActions"], { @@ -32,7 +31,8 @@ class PluginBrowser(Screen): "red": self.delete, "green": self.download }) - self.onExecBegin.append(self.checkWarnings) + self.onFirstExecBegin.append(self.checkWarnings) + self.onShown.append(self.updateList) def checkWarnings(self): if len(plugins.warnings): @@ -48,20 +48,23 @@ class PluginBrowser(Screen): 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) 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() + class PluginDownloadBrowser(Screen): DOWNLOAD = 0 @@ -190,7 +193,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:]) |