Tue, 07 Apr 2015 13:56:03 +0200
Merged remote changes.
diff -r 2a9316cb3fad -r 64027512bbf3 Documentation/Source/eric6.UI.UserInterface.html --- a/Documentation/Source/eric6.UI.UserInterface.html Tue Apr 07 13:54:51 2015 +0200 +++ b/Documentation/Source/eric6.UI.UserInterface.html Tue Apr 07 13:56:03 2015 +0200 @@ -621,10 +621,10 @@ <td>Private method to show the result of the version check action.</td> </tr><tr> <td><a href="#UserInterface.__versionsDownloadCanceled">__versionsDownloadCanceled</a></td> -<td>Private method called to cancel the version check.</td> +<td>Private slot called to cancel the version check.</td> </tr><tr> <td><a href="#UserInterface.__versionsDownloadDone">__versionsDownloadDone</a></td> -<td>Private method called, after the versions file has been downloaded from the internet.</td> +<td>Private slot called, after the versions file has been downloaded from the internet.</td> </tr><tr> <td><a href="#UserInterface.__webBrowser">__webBrowser</a></td> <td>Private slot to start the eric6 web browser.</td> @@ -1852,12 +1852,12 @@ <h4>UserInterface.__versionsDownloadCanceled</h4> <b>__versionsDownloadCanceled</b>(<i></i>) <p> - Private method called to cancel the version check. + Private slot called to cancel the version check. </p><a NAME="UserInterface.__versionsDownloadDone" ID="UserInterface.__versionsDownloadDone"></a> <h4>UserInterface.__versionsDownloadDone</h4> <b>__versionsDownloadDone</b>(<i></i>) <p> - Private method called, after the versions file has been downloaded + Private slot called, after the versions file has been downloaded from the internet. </p><a NAME="UserInterface.__webBrowser" ID="UserInterface.__webBrowser"></a> <h4>UserInterface.__webBrowser</h4>
diff -r 2a9316cb3fad -r 64027512bbf3 UI/UserInterface.py --- a/UI/UserInterface.py Tue Apr 07 13:54:51 2015 +0200 +++ b/UI/UserInterface.py Tue Apr 07 13:56:03 2015 +0200 @@ -5941,9 +5941,10 @@ reply.finished.connect(self.__versionsDownloadDone) self.__replies.append(reply) + @pyqtSlot() def __versionsDownloadDone(self): """ - Private method called, after the versions file has been downloaded + Private slot called, after the versions file has been downloaded from the internet. """ if self.__versionCheckCanceled: @@ -6105,9 +6106,10 @@ if url: QDesktopServices.openUrl(QUrl(url)) + @pyqtSlot() def __versionsDownloadCanceled(self): """ - Private method called to cancel the version check. + Private slot called to cancel the version check. """ if self.__replies: self.__versionCheckCanceled = True