Mercurial Repositories > eric / file diff

--- a/APIs/Python3/eric6.api	Tue Jun 06 19:52:41 2017 +0200
+++ b/APIs/Python3/eric6.api	Wed Jun 28 19:14:32 2017 +0200
@@ -947,6 +947,7 @@
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.generateRules?4()
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.highlightBlock?4(text)
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.makeFormat?4(fg=None, bg=None, bold=False)
+eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.regenerateRules?4()
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter?1(doc)
 eric6.E5Gui.E5GenericDiffHighlighter.TERMINAL?4(pattern)
 eric6.E5Gui.E5GenericDiffHighlighter._REGEX_CACHE?8
@@ -1242,6 +1243,7 @@
 eric6.E5Gui.E5SideBar.E5SideBar.tabWhatsThis?4(index)
 eric6.E5Gui.E5SideBar.E5SideBar.widget?4(index)
 eric6.E5Gui.E5SideBar.E5SideBar?1(orientation=None, delay=200, parent=None)
+eric6.E5Gui.E5SimpleHelpDialog.E5SimpleHelpDialog?1(title="", label="", help="", parent=None)
 eric6.E5Gui.E5SingleApplication.E5SingleApplicationClient.processArgs?4(args)
 eric6.E5Gui.E5SingleApplication.E5SingleApplicationClient?1()
 eric6.E5Gui.E5SingleApplication.E5SingleApplicationServer.handleCommand?4(cmd, params)
@@ -1432,6 +1434,14 @@
 eric6.E5Network.E5Ftp.E5FtpProxyType.Site?7
 eric6.E5Network.E5Ftp.E5FtpProxyType.UserAtProxyuserAtServer?7
 eric6.E5Network.E5Ftp.E5FtpProxyType.UserAtServer?7
+eric6.E5Network.E5GoogleMail.APPLICATION_NAME?7
+eric6.E5Network.E5GoogleMail.CLIENT_SECRET_FILE?7
+eric6.E5Network.E5GoogleMail.GoogleMailHelp?4()
+eric6.E5Network.E5GoogleMail.GoogleMailSendMessage?4(message)
+eric6.E5Network.E5GoogleMail.SCOPES?7
+eric6.E5Network.E5GoogleMail._prepareMessage_v2?5(message)
+eric6.E5Network.E5GoogleMail._prepareMessage_v3?5(message)
+eric6.E5Network.E5GoogleMail.getCredentials?4()
 eric6.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog.setData?4(name, value)
 eric6.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog?1(parent=None)
 eric6.E5Network.E5NetworkIcon.E5NetworkIcon.isOnline?4()
@@ -3936,7 +3946,7 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.CodeStyleAddBuiltinIgnoreDialog?1(parent=None)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.CodeStyleCheckerReport.error_args?4(line_number, offset, code, check, *args)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.CodeStyleCheckerReport?1(options)
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.codeStyleBatchCheck?4(argumentsList, send, fx, cancelled)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.codeStyleBatchCheck?4(argumentsList, send, fx, cancelled, maxProcesses=0)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.codeStyleCheck?4(filename, source, args)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.extractLineFlags?4(line, startComment=")
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.ignoreCode?4(code, lineFlags)
@@ -4203,7 +4213,7 @@
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.initBatchService?4()
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.initService?4()
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.normalizeCode?4(codestring)
-eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.syntaxAndPyflakesBatchCheck?4(argumentsList, send, fx, cancelled)
+eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.syntaxAndPyflakesBatchCheck?4(argumentsList, send, fx, cancelled, maxProcesses=0)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.syntaxAndPyflakesCheck?4(filename, codestring, checkFlakes=True, ignoreStarImportWarnings=False)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckService.SyntaxCheckService.addLanguage?4(lang, env, path, module, getArgs, getExt, callback, onError)
@@ -4237,7 +4247,7 @@
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog?1(parent=None)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.initBatchService?4()
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.initService?4()
-eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.jsSyntaxBatchCheck?4(argumentsList, send, fx, cancelled)
+eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.jsSyntaxBatchCheck?4(argumentsList, send, fx, cancelled, maxProcesses=0)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.jsSyntaxCheck?4(file, codestring)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.normalizeCode?4(codestring)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.worker?4(inputQueue, outputQueue)
@@ -4252,7 +4262,7 @@
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.Whitespace.not_equal_witness?4(other)
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.Whitespace.not_less_witness?4(other)
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.Whitespace?1(ws)
-eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.batchCheck?4(argumentsList, send, fx, cancelled)
+eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.batchCheck?4(argumentsList, send, fx, cancelled, maxProcesses=0)
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.check?4(file, text="")
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.format_witnesses?4(w)
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.initBatchService?4()
@@ -6288,6 +6298,9 @@
 eric6.Preferences.ConfigurationPages.DebuggerPythonPage.DebuggerPythonPage.save?4()
 eric6.Preferences.ConfigurationPages.DebuggerPythonPage.DebuggerPythonPage?1()
 eric6.Preferences.ConfigurationPages.DebuggerPythonPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.DiffColoursPage.DiffColoursPage.save?4()
+eric6.Preferences.ConfigurationPages.DiffColoursPage.DiffColoursPage?1()
+eric6.Preferences.ConfigurationPages.DiffColoursPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_addApiFileButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_addInstalledApiFileButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_addPluginApiFileButton_clicked?4()
@@ -6593,6 +6606,7 @@
 eric6.Preferences.Prefs.cooperationDefaults?7
 eric6.Preferences.Prefs.corbaDefaults?7
 eric6.Preferences.Prefs.debuggerDefaults?7
+eric6.Preferences.Prefs.diffColourDefaults?7
 eric6.Preferences.Prefs.editorColourDefaults?7
 eric6.Preferences.Prefs.editorDefaults?7
 eric6.Preferences.Prefs.editorExporterDefaults?7
@@ -6688,6 +6702,7 @@
 eric6.Preferences.getCooperation?4(key, prefClass=Prefs)
 eric6.Preferences.getCorba?4(key, prefClass=Prefs)
 eric6.Preferences.getDebugger?4(key, prefClass=Prefs)
+eric6.Preferences.getDiffColour?4(key, prefClass=Prefs)
 eric6.Preferences.getEditor?4(key, prefClass=Prefs)
 eric6.Preferences.getEditorAPI?4(language, projectType="", prefClass=Prefs)
 eric6.Preferences.getEditorColour?4(key, prefClass=Prefs)
@@ -6741,6 +6756,7 @@
 eric6.Preferences.setCooperation?4(key, value, prefClass=Prefs)
 eric6.Preferences.setCorba?4(key, value, prefClass=Prefs)
 eric6.Preferences.setDebugger?4(key, value, prefClass=Prefs)
+eric6.Preferences.setDiffColour?4(key, value, prefClass=Prefs)
 eric6.Preferences.setEditor?4(key, value, prefClass=Prefs)
 eric6.Preferences.setEditorAPI?4(language, projectType, apilist, prefClass=Prefs)
 eric6.Preferences.setEditorColour?4(key, value, prefClass=Prefs)
@@ -8381,7 +8397,6 @@
 eric6.Tasks.TaskViewer.TaskViewer.setProjectOpen?4(o=False)
 eric6.Tasks.TaskViewer.TaskViewer.stopProjectTaskExtraction?4()
 eric6.Tasks.TaskViewer.TaskViewer?1(parent, project)
-eric6.Templates.TemplateHelpDialog.TemplateHelpDialog?1(parent=None)
 eric6.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog.getVariables?4()
 eric6.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog?1(variables, parent=None)
 eric6.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog.getData?4()
@@ -8698,6 +8713,7 @@
 eric6.UI.EmailDialog.EmailDialog.on_buttonBox_clicked?4(button)
 eric6.UI.EmailDialog.EmailDialog.on_buttonBox_rejected?4()
 eric6.UI.EmailDialog.EmailDialog.on_deleteButton_clicked?4()
+eric6.UI.EmailDialog.EmailDialog.on_googleHelpButton_clicked?4()
 eric6.UI.EmailDialog.EmailDialog.on_message_textChanged?4()
 eric6.UI.EmailDialog.EmailDialog.on_sendButton_clicked?4()
 eric6.UI.EmailDialog.EmailDialog.on_subject_textChanged?4(txt)
@@ -8933,7 +8949,7 @@
 eric6.Utilities.AutoSaver.AutoSaver?1(parent, save)
 eric6.Utilities.BackgroundClient.BackgroundClient.backgroundClient?7
 eric6.Utilities.BackgroundClient.BackgroundClient.run?4()
-eric6.Utilities.BackgroundClient.BackgroundClient?1(host, port)
+eric6.Utilities.BackgroundClient.BackgroundClient?1(host, port, maxProcs)
 eric6.Utilities.BackgroundService.BackgroundService.batchJobDone?7
 eric6.Utilities.BackgroundService.BackgroundService.enqueueRequest?4(fx, lang, fn, data)
 eric6.Utilities.BackgroundService.BackgroundService.on_disconnectSocket?4(lang)