Mercurial Repositories > eric / changeset

--- a/eric6/APIs/Python3/eric6.api	Sun Mar 14 13:49:41 2021 +0100
+++ b/eric6/APIs/Python3/eric6.api	Sun Mar 14 13:49:55 2021 +0100
@@ -656,7 +656,7 @@
 eric6.Debugger.DebugServer.DebugServer.utTestFailedExpected?7
 eric6.Debugger.DebugServer.DebugServer.utTestSkipped?7
 eric6.Debugger.DebugServer.DebugServer.utTestSucceededUnexpected?7
-eric6.Debugger.DebugServer.DebugServer?1(originalPathString, preventPassiveDebugging=False, project=None)
+eric6.Debugger.DebugServer.DebugServer?1(originalPathString, preventPassiveDebugging=False, project=None, parent=None)
 eric6.Debugger.DebugServer.DebuggerInterfaces?7
 eric6.Debugger.DebugUI.DebugUI.appendStdout?7
 eric6.Debugger.DebugUI.DebugUI.clearHistories?4()
@@ -1108,7 +1108,7 @@
 eric6.E5Gui.E5ErrorMessage.messageHandlerInstalled?4()
 eric6.E5Gui.E5ErrorMessage.qtHandler?4()
 eric6.E5Gui.E5ErrorMessageFilterDialog.E5ErrorMessageFilterDialog.getFilters?4()
-eric6.E5Gui.E5ErrorMessageFilterDialog.E5ErrorMessageFilterDialog?1(messageFilters, defaultFilters, parent=None)
+eric6.E5Gui.E5ErrorMessageFilterDialog.E5ErrorMessageFilterDialog?1(messageFilters, parent=None)
 eric6.E5Gui.E5FileDialog.DontConfirmOverwrite?7
 eric6.E5Gui.E5FileDialog.DontResolveSymlinks?7
 eric6.E5Gui.E5FileDialog.DontUseCustomDirectoryIcons?7
@@ -8046,6 +8046,7 @@
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments.isStringStyle?4(style)
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments.language?4()
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments.name?4()
+eric6.QScintilla.Lexers.LexerPygments.LexerPygments.readSettings?4(qs, prefix="/Scintilla")
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments.styleText?4(start, end)
 eric6.QScintilla.Lexers.LexerPygments.LexerPygments?1(parent=None, name="")
 eric6.QScintilla.Lexers.LexerPygments.PYGMENTS_ATTRIBUTE?7

Binary file eric6/Documentation/Help/source.qch has changed

--- a/eric6/Documentation/Help/source.qhp	Sun Mar 14 13:49:41 2021 +0100
+++ b/eric6/Documentation/Help/source.qhp	Sun Mar 14 13:49:55 2021 +0100
@@ -4046,7 +4046,6 @@
       <keyword name="E5ErrorMessageFilterDialog" id="E5ErrorMessageFilterDialog" ref="eric6.E5Gui.E5ErrorMessageFilterDialog.html#E5ErrorMessageFilterDialog" />
       <keyword name="E5ErrorMessageFilterDialog (Constructor)" id="E5ErrorMessageFilterDialog (Constructor)" ref="eric6.E5Gui.E5ErrorMessageFilterDialog.html#E5ErrorMessageFilterDialog.__init__" />
       <keyword name="E5ErrorMessageFilterDialog (Module)" id="E5ErrorMessageFilterDialog (Module)" ref="eric6.E5Gui.E5ErrorMessageFilterDialog.html" />
-      <keyword name="E5ErrorMessageFilterDialog.__setToDefault" id="E5ErrorMessageFilterDialog.__setToDefault" ref="eric6.E5Gui.E5ErrorMessageFilterDialog.html#E5ErrorMessageFilterDialog.__setToDefault" />
       <keyword name="E5ErrorMessageFilterDialog.getFilters" id="E5ErrorMessageFilterDialog.getFilters" ref="eric6.E5Gui.E5ErrorMessageFilterDialog.html#E5ErrorMessageFilterDialog.getFilters" />
       <keyword name="E5FileCompleter" id="E5FileCompleter" ref="eric6.E5Gui.E5Completers.html#E5FileCompleter" />
       <keyword name="E5FileCompleter (Constructor)" id="E5FileCompleter (Constructor)" ref="eric6.E5Gui.E5Completers.html#E5FileCompleter.__init__" />
@@ -9452,6 +9451,7 @@
       <keyword name="LexerPygments.isStringStyle" id="LexerPygments.isStringStyle" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.isStringStyle" />
       <keyword name="LexerPygments.language" id="LexerPygments.language" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.language" />
       <keyword name="LexerPygments.name" id="LexerPygments.name" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.name" />
+      <keyword name="LexerPygments.readSettings" id="LexerPygments.readSettings" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.readSettings" />
       <keyword name="LexerPygments.styleText" id="LexerPygments.styleText" ref="eric6.QScintilla.Lexers.LexerPygments.html#LexerPygments.styleText" />
       <keyword name="LexerPython" id="LexerPython" ref="eric6.QScintilla.Lexers.LexerPython.html#LexerPython" />
       <keyword name="LexerPython (Constructor)" id="LexerPython (Constructor)" ref="eric6.QScintilla.Lexers.LexerPython.html#LexerPython.__init__" />

--- a/eric6/Documentation/Source/eric6.Debugger.DebugServer.html	Sun Mar 14 13:49:41 2021 +0100
+++ b/eric6/Documentation/Source/eric6.Debugger.DebugServer.html	Sun Mar 14 13:49:55 2021 +0100
@@ -765,7 +765,7 @@
 
 <a NAME="DebugServer.__init__" ID="DebugServer.__init__"></a>
 <h4>DebugServer (Constructor)</h4>
-<b>DebugServer</b>(<i>originalPathString, preventPassiveDebugging=False, project=None</i>)
+<b>DebugServer</b>(<i>originalPathString, preventPassiveDebugging=False, project=None, parent=None</i>)
 
 <p>
         Constructor
@@ -785,6 +785,10 @@
 <dd>
 reference to the project object (defaults to None)
 </dd>
+<dt><i>parent</i> (QObject)</dt>
+<dd>
+reference to the parent object
+</dd>
 </dl>
 <a NAME="DebugServer.__addBreakPoints" ID="DebugServer.__addBreakPoints"></a>
 <h4>DebugServer.__addBreakPoints</h4>

--- a/eric6/Documentation/Source/eric6.E5Gui.E5ErrorMessageFilterDialog.html	Sun Mar 14 13:49:41 2021 +0100
+++ b/eric6/Documentation/Source/eric6.E5Gui.E5ErrorMessageFilterDialog.html	Sun Mar 14 13:49:55 2021 +0100
@@ -73,10 +73,6 @@
 <td>Constructor</td>
 </tr>
 <tr>
-<td><a href="#E5ErrorMessageFilterDialog.__setToDefault">__setToDefault</a></td>
-<td>Private slot to set the message list to the default values.</td>
-</tr>
-<tr>
 <td><a href="#E5ErrorMessageFilterDialog.getFilters">getFilters</a></td>
 <td>Public method to get the list of message filters.</td>
 </tr>
@@ -89,7 +85,7 @@
 
 <a NAME="E5ErrorMessageFilterDialog.__init__" ID="E5ErrorMessageFilterDialog.__init__"></a>
 <h4>E5ErrorMessageFilterDialog (Constructor)</h4>
-<b>E5ErrorMessageFilterDialog</b>(<i>messageFilters, defaultFilters, parent=None</i>)
+<b>E5ErrorMessageFilterDialog</b>(<i>messageFilters, parent=None</i>)
 
 <p>
         Constructor
@@ -100,22 +96,11 @@
 <dd>
 list of message filters to be edited
 </dd>
-<dt><i>defaultFilters</i> (list of str)</dt>
-<dd>
-list of default message filters
-</dd>
 <dt><i>parent</i> (QWidget)</dt>
 <dd>
 reference to the parent widget
 </dd>
 </dl>
-<a NAME="E5ErrorMessageFilterDialog.__setToDefault" ID="E5ErrorMessageFilterDialog.__setToDefault"></a>
-<h4>E5ErrorMessageFilterDialog.__setToDefault</h4>
-<b>__setToDefault</b>(<i></i>)
-
-<p>
-        Private slot to set the message list to the default values.
-</p>
 <a NAME="E5ErrorMessageFilterDialog.getFilters" ID="E5ErrorMessageFilterDialog.getFilters"></a>
 <h4>E5ErrorMessageFilterDialog.getFilters</h4>
 <b>getFilters</b>(<i></i>)

--- a/eric6/Documentation/Source/eric6.QScintilla.Lexers.LexerPygments.html	Sun Mar 14 13:49:41 2021 +0100
+++ b/eric6/Documentation/Source/eric6.QScintilla.Lexers.LexerPygments.html	Sun Mar 14 13:49:55 2021 +0100
@@ -121,6 +121,10 @@
 <td>Public method to get the name of the pygments lexer.</td>
 </tr>
 <tr>
+<td><a href="#LexerPygments.readSettings">readSettings</a></td>
+<td>Public method to read the lexer settings.</td>
+</tr>
+<tr>
 <td><a href="#LexerPygments.styleText">styleText</a></td>
 <td>Public method to perform the styling.</td>
 </tr>
@@ -369,6 +373,27 @@
 name of the pygments lexer (string)
 </dd>
 </dl>
+<a NAME="LexerPygments.readSettings" ID="LexerPygments.readSettings"></a>
+<h4>LexerPygments.readSettings</h4>
+<b>readSettings</b>(<i>qs, prefix="/Scintilla"</i>)
+
+<p>
+        Public method to read the lexer settings.
+</p>
+<p>
+        Note: Overridden to treat the Pygments lexer specially.
+</p>
+<dl>
+
+<dt><i>qs</i> (QSettings)</dt>
+<dd>
+reference to the settings object
+</dd>
+<dt><i>prefix</i> (str (optional))</dt>
+<dd>
+prefix for the settings key (defaults to "/Scintilla")
+</dd>
+</dl>
 <a NAME="LexerPygments.styleText" ID="LexerPygments.styleText"></a>
 <h4>LexerPygments.styleText</h4>
 <b>styleText</b>(<i>start, end</i>)