Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric6.Preferences.__init__.html	Fri Jun 23 18:46:40 2017 +0200
+++ b/Documentation/Source/eric6.Preferences.__init__.html	Sat Jun 24 12:15:03 2017 +0200
@@ -61,6 +61,9 @@
 <td><a href="#getDebugger">getDebugger</a></td>
 <td>Module function to retrieve the debugger settings.</td>
 </tr><tr>
+<td><a href="#getDiffColour">getDiffColour</a></td>
+<td>Module function to retrieve the colours for the diff highlighter.</td>
+</tr><tr>
 <td><a href="#getEditor">getEditor</a></td>
 <td>Module function to retrieve the various editor settings.</td>
 </tr><tr>
@@ -220,6 +223,9 @@
 <td><a href="#setDebugger">setDebugger</a></td>
 <td>Module function to store the debugger settings.</td>
 </tr><tr>
+<td><a href="#setDiffColour">setDiffColour</a></td>
+<td>Module function to store the diff highlighter colours.</td>
+</tr><tr>
 <td><a href="#setEditor">setEditor</a></td>
 <td>Module function to store the various editor settings.</td>
 </tr><tr>
@@ -363,7 +369,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>cooperationDefaults</td></tr><tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>hexEditorDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>ircDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>pyflakesDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>webBrowserDefaults</td></tr><tr><td>webEngineSettingsIntitialized</td></tr><tr><td>webSettingsIntitialized</td></tr>
+<tr><td>cooperationDefaults</td></tr><tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>diffColourDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>hexEditorDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>ircDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>pyflakesDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>webBrowserDefaults</td></tr><tr><td>webEngineSettingsIntitialized</td></tr><tr><td>webSettingsIntitialized</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -491,6 +497,27 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="getDiffColour" ID="getDiffColour"></a>
+<h2>getDiffColour</h2>
+<b>getDiffColour</b>(<i>key, prefClass=Prefs</i>)
+<p>
+    Module function to retrieve the colours for the diff highlighter.
+</p><dl>
+<dt><i>key</i></dt>
+<dd>
+the key of the value to get
+</dd><dt><i>prefClass</i></dt>
+<dd>
+preferences class used as the storage area
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+the requested editor colour
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="getEditor" ID="getEditor"></a>
 <h2>getEditor</h2>
 <b>getEditor</b>(<i>key, prefClass=Prefs</i>)
@@ -1528,6 +1555,25 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="setDiffColour" ID="setDiffColour"></a>
+<h2>setDiffColour</h2>
+<b>setDiffColour</b>(<i>key, value, prefClass=Prefs</i>)
+<p>
+    Module function to store the diff highlighter colours.
+</p><dl>
+<dt><i>key</i></dt>
+<dd>
+the key of the colour to be set
+</dd><dt><i>value</i></dt>
+<dd>
+the colour to be set
+</dd><dt><i>prefClass</i></dt>
+<dd>
+preferences class used as the storage area
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="setEditor" ID="setEditor"></a>
 <h2>setEditor</h2>
 <b>setEditor</b>(<i>key, value, prefClass=Prefs</i>)