Thu, 01 Aug 2024 11:46:28 +0200
Changed '__refresh()' method of the editor back to 'refresh()' because the previous change broke the refactoring plug-in.
--- a/src/eric7/APIs/Python3/eric7.api Thu Aug 01 11:37:18 2024 +0200 +++ b/src/eric7/APIs/Python3/eric7.api Thu Aug 01 11:46:28 2024 +0200 @@ -8737,6 +8737,7 @@ eric7.QScintilla.Editor.Editor.recordModificationTime?4(filename="") eric7.QScintilla.Editor.Editor.redo?4() eric7.QScintilla.Editor.Editor.redoAvailable?7 +eric7.QScintilla.Editor.Editor.refresh?4() eric7.QScintilla.Editor.Editor.refreshCoverageAnnotations?4() eric7.QScintilla.Editor.Editor.refreshed?7 eric7.QScintilla.Editor.Editor.registerMouseHoverHelpFunction?4(func)
--- a/src/eric7/Documentation/Help/source.qhp Thu Aug 01 11:37:18 2024 +0200 +++ b/src/eric7/Documentation/Help/source.qhp Thu Aug 01 11:46:28 2024 +0200 @@ -4740,7 +4740,6 @@ <keyword name="Editor.__processSyntaxCheckError" id="Editor.__processSyntaxCheckError" ref="eric7.QScintilla.Editor.html#Editor.__processSyntaxCheckError" /> <keyword name="Editor.__processSyntaxCheckResult" id="Editor.__processSyntaxCheckResult" ref="eric7.QScintilla.Editor.html#Editor.__processSyntaxCheckResult" /> <keyword name="Editor.__projectPropertiesChanged" id="Editor.__projectPropertiesChanged" ref="eric7.QScintilla.Editor.html#Editor.__projectPropertiesChanged" /> - <keyword name="Editor.__refresh" id="Editor.__refresh" ref="eric7.QScintilla.Editor.html#Editor.__refresh" /> <keyword name="Editor.__refreshAnnotations" id="Editor.__refreshAnnotations" ref="eric7.QScintilla.Editor.html#Editor.__refreshAnnotations" /> <keyword name="Editor.__registerImages" id="Editor.__registerImages" ref="eric7.QScintilla.Editor.html#Editor.__registerImages" /> <keyword name="Editor.__reinitOnlineChangeTrace" id="Editor.__reinitOnlineChangeTrace" ref="eric7.QScintilla.Editor.html#Editor.__reinitOnlineChangeTrace" /> @@ -4982,6 +4981,7 @@ <keyword name="Editor.receive" id="Editor.receive" ref="eric7.QScintilla.Editor.html#Editor.receive" /> <keyword name="Editor.recordModificationTime" id="Editor.recordModificationTime" ref="eric7.QScintilla.Editor.html#Editor.recordModificationTime" /> <keyword name="Editor.redo" id="Editor.redo" ref="eric7.QScintilla.Editor.html#Editor.redo" /> + <keyword name="Editor.refresh" id="Editor.refresh" ref="eric7.QScintilla.Editor.html#Editor.refresh" /> <keyword name="Editor.refreshCoverageAnnotations" id="Editor.refreshCoverageAnnotations" ref="eric7.QScintilla.Editor.html#Editor.refreshCoverageAnnotations" /> <keyword name="Editor.registerMouseHoverHelpFunction" id="Editor.registerMouseHoverHelpFunction" ref="eric7.QScintilla.Editor.html#Editor.registerMouseHoverHelpFunction" /> <keyword name="Editor.reload" id="Editor.reload" ref="eric7.QScintilla.Editor.html#Editor.reload" />
--- a/src/eric7/Documentation/Source/eric7.QScintilla.Editor.html Thu Aug 01 11:37:18 2024 +0200 +++ b/src/eric7/Documentation/Source/eric7.QScintilla.Editor.html Thu Aug 01 11:46:28 2024 +0200 @@ -698,10 +698,6 @@ <td>Private slot to handle changes of the project properties.</td> </tr> <tr> -<td><a href="#Editor.__refresh">__refresh</a></td> -<td>Private slot to refresh the editor contents.</td> -</tr> -<tr> <td><a href="#Editor.__refreshAnnotations">__refreshAnnotations</a></td> <td>Private method to refresh the annotations.</td> </tr> @@ -1666,6 +1662,10 @@ <td>Public method to redo the last recorded change.</td> </tr> <tr> +<td><a href="#Editor.refresh">refresh</a></td> +<td>Public slot to refresh the editor contents.</td> +</tr> +<tr> <td><a href="#Editor.refreshCoverageAnnotations">refreshCoverageAnnotations</a></td> <td>Public method to refresh the code coverage annotations.</td> </tr> @@ -3777,13 +3777,6 @@ Private slot to handle changes of the project properties. </p> -<a NAME="Editor.__refresh" ID="Editor.__refresh"></a> -<h4>Editor.__refresh</h4> -<b>__refresh</b>(<i></i>) -<p> - Private slot to refresh the editor contents. -</p> - <a NAME="Editor.__refreshAnnotations" ID="Editor.__refreshAnnotations"></a> <h4>Editor.__refreshAnnotations</h4> <b>__refreshAnnotations</b>(<i></i>) @@ -7157,6 +7150,13 @@ Public method to redo the last recorded change. </p> +<a NAME="Editor.refresh" ID="Editor.refresh"></a> +<h4>Editor.refresh</h4> +<b>refresh</b>(<i></i>) +<p> + Public slot to refresh the editor contents. +</p> + <a NAME="Editor.refreshCoverageAnnotations" ID="Editor.refreshCoverageAnnotations"></a> <h4>Editor.refreshCoverageAnnotations</h4> <b>refreshCoverageAnnotations</b>(<i></i>)
--- a/src/eric7/QScintilla/Editor.py Thu Aug 01 11:37:18 2024 +0200 +++ b/src/eric7/QScintilla/Editor.py Thu Aug 01 11:46:28 2024 +0200 @@ -8399,7 +8399,7 @@ """ if self.__checkExternalModification and self.checkModificationTime(): if Preferences.getEditor("AutoReopen") and not self.isModified(): - self.__refresh() + self.refresh() else: msg = self.tr( """<p>The file <b>{0}</b> has been changed while it""" @@ -8420,7 +8420,7 @@ yesDefault=yesDefault, ) if res: - self.__refresh() + self.refresh() else: # do not prompt for this change again... self.recordModificationTime() @@ -8499,9 +8499,9 @@ return False @pyqtSlot() - def __refresh(self): - """ - Private slot to refresh the editor contents. + def refresh(self): + """ + Public slot to refresh the editor contents. """ # save cursor position cline, cindex = self.getCursorPosition() @@ -8570,7 +8570,7 @@ else True ) if ok: - self.__refresh() + self.refresh() def setMonospaced(self, on): """