Mon, 11 Feb 2019 19:23:31 +0100
QsciScintillaCompat: implemented a workaround for the QScintilla.insert() method broken with QScintilla 2.11 on Windows.
(grafted from cde74a0d1f232aea619174dc9e76e270c6b6cac8)
--- a/APIs/Python3/eric6.api Sat Feb 09 14:40:32 2019 +0100 +++ b/APIs/Python3/eric6.api Mon Feb 11 19:23:31 2019 +0100 @@ -9137,6 +9137,7 @@ eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.indicatorDefine?4(indicator, style, color) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.inputMethodEvent?4(evt) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.inputMethodQuery?4(query) +eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.insert?4(txt) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.isModified?4() eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.lineAt?4(pos) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.lineEndPosition?4(line)
--- a/Documentation/Help/source.qhp Sat Feb 09 14:40:32 2019 +0100 +++ b/Documentation/Help/source.qhp Mon Feb 11 19:23:31 2019 +0100 @@ -13584,6 +13584,7 @@ <keyword name="QsciScintillaCompat.indicatorDefine" id="QsciScintillaCompat.indicatorDefine" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.indicatorDefine" /> <keyword name="QsciScintillaCompat.inputMethodEvent" id="QsciScintillaCompat.inputMethodEvent" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.inputMethodEvent" /> <keyword name="QsciScintillaCompat.inputMethodQuery" id="QsciScintillaCompat.inputMethodQuery" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.inputMethodQuery" /> + <keyword name="QsciScintillaCompat.insert" id="QsciScintillaCompat.insert" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.insert" /> <keyword name="QsciScintillaCompat.isModified" id="QsciScintillaCompat.isModified" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.isModified" /> <keyword name="QsciScintillaCompat.lineAt" id="QsciScintillaCompat.lineAt" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.lineAt" /> <keyword name="QsciScintillaCompat.lineEndPosition" id="QsciScintillaCompat.lineEndPosition" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.lineEndPosition" />
--- a/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html Sat Feb 09 14:40:32 2019 +0100 +++ b/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html Mon Feb 11 19:23:31 2019 +0100 @@ -280,6 +280,9 @@ <td><a href="#QsciScintillaCompat.inputMethodQuery">inputMethodQuery</a></td> <td>Public method to cope with a glitch in some Qscintilla versions handling input events.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.insert">insert</a></td> +<td>Public method to insert text at the cursor position.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.isModified">isModified</a></td> <td>Public method to return the modification status.</td> </tr><tr> @@ -1281,6 +1284,16 @@ <dd> object containing the requested information </dd> +</dl><a NAME="QsciScintillaCompat.insert" ID="QsciScintillaCompat.insert"></a> +<h4>QsciScintillaCompat.insert</h4> +<b>insert</b>(<i>txt</i>) +<p> + Public method to insert text at the cursor position. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +text to be inserted +</dd> </dl><a NAME="QsciScintillaCompat.isModified" ID="QsciScintillaCompat.isModified"></a> <h4>QsciScintillaCompat.isModified</h4> <b>isModified</b>(<i></i>)
--- a/QScintilla/QsciScintillaCompat.py Sat Feb 09 14:40:32 2019 +0100 +++ b/QScintilla/QsciScintillaCompat.py Mon Feb 11 19:23:31 2019 +0100 @@ -1622,6 +1622,20 @@ return string.encode("latin-1") ########################################################################### + ## methods to implement workarounds for broken things + ########################################################################### + + def insert(self, txt): + """ + Public method to insert text at the cursor position. + + @param txt text to be inserted + @type str + """ + line, col = self.getCursorPosition() + self.insertAt(txt, line, col) + + ########################################################################### ## methods below have been added to QScintilla starting with version 2.5 ###########################################################################