Mercurial Repositories > eric / file diff

--- a/Documentation/Help/source.qhp	Fri Jun 23 18:46:40 2017 +0200
+++ b/Documentation/Help/source.qhp	Sat Jun 24 12:15:03 2017 +0200
@@ -774,6 +774,7 @@
               <section title="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.DebuggerPython3Page" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html" />
               <section title="eric6.Preferences.ConfigurationPages.DebuggerPythonPage" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html" />
+              <section title="eric6.Preferences.ConfigurationPages.DiffColoursPage" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorAPIsPage" ref="eric6.Preferences.ConfigurationPages.EditorAPIsPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html" />
@@ -2947,6 +2948,7 @@
       <keyword name="CompareDialog.__appendText" id="CompareDialog.__appendText" ref="eric6.UI.CompareDialog.html#CompareDialog.__appendText" />
       <keyword name="CompareDialog.__compare" id="CompareDialog.__compare" ref="eric6.UI.CompareDialog.html#CompareDialog.__compare" />
       <keyword name="CompareDialog.__fileChanged" id="CompareDialog.__fileChanged" ref="eric6.UI.CompareDialog.html#CompareDialog.__fileChanged" />
+      <keyword name="CompareDialog.__generateFormats" id="CompareDialog.__generateFormats" ref="eric6.UI.CompareDialog.html#CompareDialog.__generateFormats" />
       <keyword name="CompareDialog.__moveTextToCurrentDiffPos" id="CompareDialog.__moveTextToCurrentDiffPos" ref="eric6.UI.CompareDialog.html#CompareDialog.__moveTextToCurrentDiffPos" />
       <keyword name="CompareDialog.__scrollBarMoved" id="CompareDialog.__scrollBarMoved" ref="eric6.UI.CompareDialog.html#CompareDialog.__scrollBarMoved" />
       <keyword name="CompareDialog.compare" id="CompareDialog.compare" ref="eric6.UI.CompareDialog.html#CompareDialog.compare" />
@@ -3809,6 +3811,15 @@
       <keyword name="DictResolver.getDictionary" id="DictResolver.getDictionary" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.getDictionary" />
       <keyword name="DictResolver.keyToStr" id="DictResolver.keyToStr" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.keyToStr" />
       <keyword name="DictResolver.resolve" id="DictResolver.resolve" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.resolve" />
+      <keyword name="DiffColoursPage" id="DiffColoursPage" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage" />
+      <keyword name="DiffColoursPage (Constructor)" id="DiffColoursPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__init__" />
+      <keyword name="DiffColoursPage (Module)" id="DiffColoursPage (Module)" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html" />
+      <keyword name="DiffColoursPage.__initColour" id="DiffColoursPage.__initColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__initColour" />
+      <keyword name="DiffColoursPage.__selectBackgroundColour" id="DiffColoursPage.__selectBackgroundColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__selectBackgroundColour" />
+      <keyword name="DiffColoursPage.__selectTextColour" id="DiffColoursPage.__selectTextColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__selectTextColour" />
+      <keyword name="DiffColoursPage.__updateSampleBackgroundColour" id="DiffColoursPage.__updateSampleBackgroundColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__updateSampleBackgroundColour" />
+      <keyword name="DiffColoursPage.__updateSampleTextColour" id="DiffColoursPage.__updateSampleTextColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__updateSampleTextColour" />
+      <keyword name="DiffColoursPage.save" id="DiffColoursPage.save" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.save" />
       <keyword name="DiffDialog" id="DiffDialog" ref="eric6.UI.DiffDialog.html#DiffDialog" />
       <keyword name="DiffDialog (Constructor)" id="DiffDialog (Constructor)" ref="eric6.UI.DiffDialog.html#DiffDialog.__init__" />
       <keyword name="DiffDialog (Module)" id="DiffDialog (Module)" ref="eric6.UI.DiffDialog.html" />
@@ -4185,11 +4196,13 @@
       <keyword name="E5GenericDiffHighlighter" id="E5GenericDiffHighlighter" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter" />
       <keyword name="E5GenericDiffHighlighter (Constructor)" id="E5GenericDiffHighlighter (Constructor)" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.__init__" />
       <keyword name="E5GenericDiffHighlighter (Module)" id="E5GenericDiffHighlighter (Module)" ref="eric6.E5Gui.E5GenericDiffHighlighter.html" />
+      <keyword name="E5GenericDiffHighlighter.__initColours" id="E5GenericDiffHighlighter.__initColours" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.__initColours" />
       <keyword name="E5GenericDiffHighlighter.createRules" id="E5GenericDiffHighlighter.createRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.createRules" />
       <keyword name="E5GenericDiffHighlighter.formats" id="E5GenericDiffHighlighter.formats" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.formats" />
       <keyword name="E5GenericDiffHighlighter.generateRules" id="E5GenericDiffHighlighter.generateRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.generateRules" />
       <keyword name="E5GenericDiffHighlighter.highlightBlock" id="E5GenericDiffHighlighter.highlightBlock" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.highlightBlock" />
       <keyword name="E5GenericDiffHighlighter.makeFormat" id="E5GenericDiffHighlighter.makeFormat" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.makeFormat" />
+      <keyword name="E5GenericDiffHighlighter.regenerateRules" id="E5GenericDiffHighlighter.regenerateRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.regenerateRules" />
       <keyword name="E5Graphics (Package)" id="E5Graphics (Package)" ref="index-eric6.E5Graphics.html" />
       <keyword name="E5GraphicsView" id="E5GraphicsView" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView" />
       <keyword name="E5GraphicsView (Constructor)" id="E5GraphicsView (Constructor)" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.__init__" />
@@ -16520,6 +16533,7 @@
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html#create" />
+      <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAPIsPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#create" />
@@ -16730,6 +16744,7 @@
       <keyword name="getDebugger" id="getDebugger" ref="eric6.Preferences.__init__.html#getDebugger" />
       <keyword name="getDefaultLexerAssociations" id="getDefaultLexerAssociations" ref="eric6.QScintilla.Lexers.__init__.html#getDefaultLexerAssociations" />
       <keyword name="getDefaults" id="getDefaults" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__.html#getDefaults" />
+      <keyword name="getDiffColour" id="getDiffColour" ref="eric6.Preferences.__init__.html#getDiffColour" />
       <keyword name="getDirs" id="getDirs" ref="eric6.Utilities.__init__.html#getDirs" />
       <keyword name="getEditor" id="getEditor" ref="eric6.Preferences.__init__.html#getEditor" />
       <keyword name="getEditorAPI" id="getEditorAPI" ref="eric6.Preferences.__init__.html#getEditorAPI" />
@@ -17090,6 +17105,7 @@
       <keyword name="setCorba" id="setCorba" ref="eric6.Preferences.__init__.html#setCorba" />
       <keyword name="setCss" id="setCss" ref="eric6.WebBrowser.Tools.Scripts.html#setCss" />
       <keyword name="setDebugger" id="setDebugger" ref="eric6.Preferences.__init__.html#setDebugger" />
+      <keyword name="setDiffColour" id="setDiffColour" ref="eric6.Preferences.__init__.html#setDiffColour" />
       <keyword name="setEditor" id="setEditor" ref="eric6.Preferences.__init__.html#setEditor" />
       <keyword name="setEditorAPI" id="setEditorAPI" ref="eric6.Preferences.__init__.html#setEditorAPI" />
       <keyword name="setEditorColour" id="setEditorColour" ref="eric6.Preferences.__init__.html#setEditorColour" />
@@ -17813,6 +17829,7 @@
       <file>eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html</file>
       <file>eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html</file>
+      <file>eric6.Preferences.ConfigurationPages.DiffColoursPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorAPIsPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html</file>