Fri, 29 Nov 2013 18:55:25 +0100
Another refinement of the plug-in manager update check.
--- a/APIs/Python3/eric5.api Fri Nov 29 18:49:39 2013 +0100 +++ b/APIs/Python3/eric5.api Fri Nov 29 18:55:25 2013 +0100 @@ -8049,6 +8049,7 @@ eric5.UI.UserInterface.UserInterface.showLogTab?4(tabname) eric5.UI.UserInterface.UserInterface.showMenu?7 eric5.UI.UserInterface.UserInterface.showNotification?4(icon, heading, text) +eric5.UI.UserInterface.UserInterface.showPluginsAvailable?4() eric5.UI.UserInterface.UserInterface.showPreferences?4(pageName=None) eric5.UI.UserInterface.UserInterface.showReplaceFilesDialog?4(txt="", searchDir="", openFiles=False) eric5.UI.UserInterface.UserInterface.unregisterToolbar?4(name)
--- a/Documentation/Help/source.qhp Fri Nov 29 18:49:39 2013 +0100 +++ b/Documentation/Help/source.qhp Fri Nov 29 18:55:25 2013 +0100 @@ -11951,7 +11951,6 @@ <keyword name="UserInterface.__showNext" id="UserInterface.__showNext" ref="eric5.UI.UserInterface.html#UserInterface.__showNext" /> <keyword name="UserInterface.__showPixmap" id="UserInterface.__showPixmap" ref="eric5.UI.UserInterface.html#UserInterface.__showPixmap" /> <keyword name="UserInterface.__showPluginInfo" id="UserInterface.__showPluginInfo" ref="eric5.UI.UserInterface.html#UserInterface.__showPluginInfo" /> - <keyword name="UserInterface.__showPluginsAvailable" id="UserInterface.__showPluginsAvailable" ref="eric5.UI.UserInterface.html#UserInterface.__showPluginsAvailable" /> <keyword name="UserInterface.__showPrevious" id="UserInterface.__showPrevious" ref="eric5.UI.UserInterface.html#UserInterface.__showPrevious" /> <keyword name="UserInterface.__showPyQt4Doc" id="UserInterface.__showPyQt4Doc" ref="eric5.UI.UserInterface.html#UserInterface.__showPyQt4Doc" /> <keyword name="UserInterface.__showPyQt5Doc" id="UserInterface.__showPyQt5Doc" ref="eric5.UI.UserInterface.html#UserInterface.__showPyQt5Doc" /> @@ -12046,6 +12045,7 @@ <keyword name="UserInterface.showFindFilesDialog" id="UserInterface.showFindFilesDialog" ref="eric5.UI.UserInterface.html#UserInterface.showFindFilesDialog" /> <keyword name="UserInterface.showLogTab" id="UserInterface.showLogTab" ref="eric5.UI.UserInterface.html#UserInterface.showLogTab" /> <keyword name="UserInterface.showNotification" id="UserInterface.showNotification" ref="eric5.UI.UserInterface.html#UserInterface.showNotification" /> + <keyword name="UserInterface.showPluginsAvailable" id="UserInterface.showPluginsAvailable" ref="eric5.UI.UserInterface.html#UserInterface.showPluginsAvailable" /> <keyword name="UserInterface.showPreferences" id="UserInterface.showPreferences" ref="eric5.UI.UserInterface.html#UserInterface.showPreferences" /> <keyword name="UserInterface.showReplaceFilesDialog" id="UserInterface.showReplaceFilesDialog" ref="eric5.UI.UserInterface.html#UserInterface.showReplaceFilesDialog" /> <keyword name="UserInterface.unregisterToolbar" id="UserInterface.unregisterToolbar" ref="eric5.UI.UserInterface.html#UserInterface.unregisterToolbar" />
--- a/Documentation/Source/eric5.UI.UserInterface.html Fri Nov 29 18:49:39 2013 +0100 +++ b/Documentation/Source/eric5.UI.UserInterface.html Fri Nov 29 18:55:25 2013 +0100 @@ -470,9 +470,6 @@ <td><a href="#UserInterface.__showPluginInfo">__showPluginInfo</a></td> <td>Private slot to show the plugin info dialog.</td> </tr><tr> -<td><a href="#UserInterface.__showPluginsAvailable">__showPluginsAvailable</a></td> -<td>Private slot to show the plugins available for download.</td> -</tr><tr> <td><a href="#UserInterface.__showPrevious">__showPrevious</a></td> <td>Private slot used to show the previous tab or file.</td> </tr><tr> @@ -755,6 +752,9 @@ <td><a href="#UserInterface.showNotification">showNotification</a></td> <td>Public method to show a desktop notification.</td> </tr><tr> +<td><a href="#UserInterface.showPluginsAvailable">showPluginsAvailable</a></td> +<td>Public slot to show the plugins available for download.</td> +</tr><tr> <td><a href="#UserInterface.showPreferences">showPreferences</a></td> <td>Public slot to set the preferences.</td> </tr><tr> @@ -1484,11 +1484,6 @@ <b>__showPluginInfo</b>(<i></i>) <p> Private slot to show the plugin info dialog. -</p><a NAME="UserInterface.__showPluginsAvailable" ID="UserInterface.__showPluginsAvailable"></a> -<h4>UserInterface.__showPluginsAvailable</h4> -<b>__showPluginsAvailable</b>(<i></i>) -<p> - Private slot to show the plugins available for download. </p><a NAME="UserInterface.__showPrevious" ID="UserInterface.__showPrevious"></a> <h4>UserInterface.__showPrevious</h4> <b>__showPrevious</b>(<i></i>) @@ -2335,7 +2330,12 @@ <dd> text of the notification (string) </dd> -</dl><a NAME="UserInterface.showPreferences" ID="UserInterface.showPreferences"></a> +</dl><a NAME="UserInterface.showPluginsAvailable" ID="UserInterface.showPluginsAvailable"></a> +<h4>UserInterface.showPluginsAvailable</h4> +<b>showPluginsAvailable</b>(<i></i>) +<p> + Public slot to show the plugins available for download. +</p><a NAME="UserInterface.showPreferences" ID="UserInterface.showPreferences"></a> <h4>UserInterface.showPreferences</h4> <b>showPreferences</b>(<i>pageName=None</i>) <p>
--- a/PluginManager/PluginManager.py Fri Nov 29 18:49:39 2013 +0100 +++ b/PluginManager/PluginManager.py Fri Nov 29 18:55:25 2013 +0100 @@ -1118,13 +1118,18 @@ return if self.__updateAvailable: - E5MessageBox.information( + res = E5MessageBox.information( None, self.trUtf8("New plugin versions available"), self.trUtf8("<p>There are new plug-ins or plug-in" " updates available. Use the plug-in" - " repository dialog to get them.</p>") - ) + " repository dialog to get them.</p>"), + E5MessageBox.StandardButtons( + E5MessageBox.Ignore | \ + E5MessageBox.Open), + E5MessageBox.Open) + if res == E5MessageBox.Open: + self.__ui.showPluginsAvailable() def checkPluginEntry(self, name, short, description, url, author, version, filename, status):
--- a/UI/UserInterface.py Fri Nov 29 18:49:39 2013 +0100 +++ b/UI/UserInterface.py Fri Nov 29 18:55:25 2013 +0100 @@ -2179,7 +2179,7 @@ """<p>This opens a dialog, that shows a list of plugins """ """available on the Internet.</p>""" )) - self.pluginRepoAct.triggered[()].connect(self.__showPluginsAvailable) + self.pluginRepoAct.triggered[()].connect(self.showPluginsAvailable) self.actions.append(self.pluginRepoAct) # initialize viewmanager actions @@ -5601,9 +5601,9 @@ dlg = PluginUninstallDialog(self.pluginManager, self) dlg.exec_() - def __showPluginsAvailable(self): - """ - Private slot to show the plugins available for download. + def showPluginsAvailable(self): + """ + Public slot to show the plugins available for download. """ from PluginManager.PluginRepositoryDialog import PluginRepositoryDialog dlg = PluginRepositoryDialog(self)