Mercurial Repositories > eric / file diff

--- a/src/eric7/APIs/Python3/eric7.api	Tue Apr 04 17:26:54 2023 +0200
+++ b/src/eric7/APIs/Python3/eric7.api	Wed Apr 05 11:58:22 2023 +0200
@@ -650,8 +650,8 @@
 eric7.Debugger.DebugServer.DebugServer.isConnected?4()
 eric7.Debugger.DebugServer.DebugServer.isDebugging?4()
 eric7.Debugger.DebugServer.DebugServer.lastClientExited?7
+eric7.Debugger.DebugServer.DebugServer.mainClientConnected?4()
 eric7.Debugger.DebugServer.DebugServer.mainClientExit?7
-eric7.Debugger.DebugServer.DebugServer.masterClientConnected?4()
 eric7.Debugger.DebugServer.DebugServer.passiveDebugStarted?7
 eric7.Debugger.DebugServer.DebugServer.passiveStartUp?4(fn, exc, debuggerId)
 eric7.Debugger.DebugServer.DebugServer.preferencesChanged?4()
@@ -1453,10 +1453,10 @@
 eric7.EricWidgets.EricMapWidget.EricMapWidget.position2Value?4(position, slider=False)
 eric7.EricWidgets.EricMapWidget.EricMapWidget.scaleFactor?4(slider=False)
 eric7.EricWidgets.EricMapWidget.EricMapWidget.setBackgroundColor?4(color)
+eric7.EricWidgets.EricMapWidget.EricMapWidget.setController?4(controller)
 eric7.EricWidgets.EricMapWidget.EricMapWidget.setEnabled?4(enable)
 eric7.EricWidgets.EricMapWidget.EricMapWidget.setLineDimensions?4(border, height)
 eric7.EricWidgets.EricMapWidget.EricMapWidget.setMapPosition?4(onRight)
-eric7.EricWidgets.EricMapWidget.EricMapWidget.setMaster?4(master)
 eric7.EricWidgets.EricMapWidget.EricMapWidget.setWidth?4(width)
 eric7.EricWidgets.EricMapWidget.EricMapWidget.sizeHint?4()
 eric7.EricWidgets.EricMapWidget.EricMapWidget.value2Position?4(value, slider=False)
@@ -3169,7 +3169,7 @@
 eric7.MultiProject.MultiProject.MultiProject.getActions?4()
 eric7.MultiProject.MultiProject.MultiProject.getCategories?4()
 eric7.MultiProject.MultiProject.MultiProject.getDependantProjectFiles?4()
-eric7.MultiProject.MultiProject.MultiProject.getMasterProjectFile?4()
+eric7.MultiProject.MultiProject.MultiProject.getMainProjectFile?4()
 eric7.MultiProject.MultiProject.MultiProject.getMenu?4(menuName)
 eric7.MultiProject.MultiProject.MultiProject.getMostRecent?4()
 eric7.MultiProject.MultiProject.MultiProject.getMultiProjectFile?4()
@@ -3185,7 +3185,7 @@
 eric7.MultiProject.MultiProject.MultiProject.multiProjectOpened?7
 eric7.MultiProject.MultiProject.MultiProject.multiProjectPropertiesChanged?7
 eric7.MultiProject.MultiProject.MultiProject.newMultiProject?7
-eric7.MultiProject.MultiProject.MultiProject.openMultiProject?4(fn=None, openMaster=True)
+eric7.MultiProject.MultiProject.MultiProject.openMultiProject?4(fn=None, openMain=True)
 eric7.MultiProject.MultiProject.MultiProject.openProject?4(filename)
 eric7.MultiProject.MultiProject.MultiProject.projectAdded?7
 eric7.MultiProject.MultiProject.MultiProject.projectDataChanged?7
@@ -5730,7 +5730,7 @@
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitExtendedDiff?4(name)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitFetch?4(name)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitGetArchiveFormats?4(repodir)
-eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitGetBranchesList?4(repodir, withMaster=False, allBranches=False, remotes=False)
+eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitGetBranchesList?4(repodir, withMain=False, allBranches=False, remotes=False)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitGetBundleHeads?4(repodir, bundleFile)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitGetCurrentBranch?4(repodir)
 eric7.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemoteBranchesList?4(repodir, remote)
@@ -7257,7 +7257,7 @@
 eric7.Preferences.ConfigurationDialog.ConfigurationDialog.accept?4()
 eric7.Preferences.ConfigurationDialog.ConfigurationDialog.getConfigurationPageName?4()
 eric7.Preferences.ConfigurationDialog.ConfigurationDialog.getExpandedEntries?4()
-eric7.Preferences.ConfigurationDialog.ConfigurationDialog.masterPasswordChanged?7
+eric7.Preferences.ConfigurationDialog.ConfigurationDialog.mainPasswordChanged?7
 eric7.Preferences.ConfigurationDialog.ConfigurationDialog.preferencesChanged?7
 eric7.Preferences.ConfigurationDialog.ConfigurationDialog.setPreferences?4()
 eric7.Preferences.ConfigurationDialog.ConfigurationDialog.showConfigurationPageByName?4(pageName)
@@ -7278,7 +7278,7 @@
 eric7.Preferences.ConfigurationDialog.ConfigurationWidget.getLexers?4()
 eric7.Preferences.ConfigurationDialog.ConfigurationWidget.getPage?4(pageName)
 eric7.Preferences.ConfigurationDialog.ConfigurationWidget.isUsingWebEngine?4()
-eric7.Preferences.ConfigurationDialog.ConfigurationWidget.masterPasswordChanged?7
+eric7.Preferences.ConfigurationDialog.ConfigurationWidget.mainPasswordChanged?7
 eric7.Preferences.ConfigurationDialog.ConfigurationWidget.on_applyButton_clicked?4()
 eric7.Preferences.ConfigurationDialog.ConfigurationWidget.on_buttonBox_clicked?4(button)
 eric7.Preferences.ConfigurationDialog.ConfigurationWidget.on_configList_itemCollapsed?4(item)
@@ -7551,12 +7551,12 @@
 eric7.Preferences.ConfigurationPages.LogViewerPage.LogViewerPage.save?4()
 eric7.Preferences.ConfigurationPages.LogViewerPage.LogViewerPage?1(parent=None)
 eric7.Preferences.ConfigurationPages.LogViewerPage.create?4(dlg)
-eric7.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.getCurrentPassword?4()
-eric7.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.getMasterPassword?4()
-eric7.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.on_currentPasswordEdit_textChanged?4(txt)
-eric7.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.on_newPasswordAgainEdit_textChanged?4(txt)
-eric7.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog.on_newPasswordEdit_textChanged?4(txt)
-eric7.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog?1(oldPasswordHash, parent=None)
+eric7.Preferences.ConfigurationPages.MainPasswordEntryDialog.MainPasswordEntryDialog.getCurrentPassword?4()
+eric7.Preferences.ConfigurationPages.MainPasswordEntryDialog.MainPasswordEntryDialog.getMainPassword?4()
+eric7.Preferences.ConfigurationPages.MainPasswordEntryDialog.MainPasswordEntryDialog.on_currentPasswordEdit_textChanged?4(txt)
+eric7.Preferences.ConfigurationPages.MainPasswordEntryDialog.MainPasswordEntryDialog.on_newPasswordAgainEdit_textChanged?4(txt)
+eric7.Preferences.ConfigurationPages.MainPasswordEntryDialog.MainPasswordEntryDialog.on_newPasswordEdit_textChanged?4(txt)
+eric7.Preferences.ConfigurationPages.MainPasswordEntryDialog.MainPasswordEntryDialog?1(oldPasswordHash, parent=None)
 eric7.Preferences.ConfigurationPages.MicroPythonPage.MicroPythonPage.on_apShowPasswordButton_clicked?4(checked)
 eric7.Preferences.ConfigurationPages.MicroPythonPage.MicroPythonPage.on_mpyCrossInstallButton_clicked?4()
 eric7.Preferences.ConfigurationPages.MicroPythonPage.MicroPythonPage.on_mpyCrossPicker_textChanged?4(mpycrossPath)
@@ -7622,8 +7622,8 @@
 eric7.Preferences.ConfigurationPages.QtPage.QtPage.save?4()
 eric7.Preferences.ConfigurationPages.QtPage.QtPage?1()
 eric7.Preferences.ConfigurationPages.QtPage.create?4(dlg)
-eric7.Preferences.ConfigurationPages.SecurityPage.SecurityPage.on_masterPasswordButton_clicked?4()
-eric7.Preferences.ConfigurationPages.SecurityPage.SecurityPage.on_masterPasswordCheckBox_clicked?4(checked)
+eric7.Preferences.ConfigurationPages.SecurityPage.SecurityPage.on_mainPasswordButton_clicked?4()
+eric7.Preferences.ConfigurationPages.SecurityPage.SecurityPage.on_mainPasswordCheckBox_clicked?4(checked)
 eric7.Preferences.ConfigurationPages.SecurityPage.SecurityPage.save?4()
 eric7.Preferences.ConfigurationPages.SecurityPage.SecurityPage.setMode?4(displayMode)
 eric7.Preferences.ConfigurationPages.SecurityPage.SecurityPage?1(configDialog)
@@ -10695,7 +10695,7 @@
 eric7.UI.UserInterface.UserInterface.handleUrl?4(url)
 eric7.UI.UserInterface.UserInterface.isOnline?4()
 eric7.UI.UserInterface.UserInterface.launchHelpViewer?4(home, searchWord=None, useSingle=False)
-eric7.UI.UserInterface.UserInterface.masterPasswordChanged?7
+eric7.UI.UserInterface.UserInterface.mainPasswordChanged?7
 eric7.UI.UserInterface.UserInterface.maxFilePathLen?7
 eric7.UI.UserInterface.UserInterface.maxMenuFilePathLen?7
 eric7.UI.UserInterface.UserInterface.networkAccessManager?4()
@@ -10907,15 +10907,15 @@
 eric7.Utilities.crypto.CryptoMarker?7
 eric7.Utilities.crypto.Delimiter?7
 eric7.Utilities.crypto.EncodeMarker?7
-eric7.Utilities.crypto.MasterPassword?7
-eric7.Utilities.crypto.changeRememberedMaster?4(newPassword)
+eric7.Utilities.crypto.MainPassword?7
+eric7.Utilities.crypto.changeRememberedMain?4(newPassword)
 eric7.Utilities.crypto.dataDecrypt?4(edata, password, keyLength=32)
 eric7.Utilities.crypto.dataEncrypt?4(data, password, keyLength=32, hashIterations=10000)
 eric7.Utilities.crypto.pwConvert?4(pw, encode=True)
 eric7.Utilities.crypto.pwDecode?4(epw)
-eric7.Utilities.crypto.pwDecrypt?4(epw, masterPW=None)
+eric7.Utilities.crypto.pwDecrypt?4(epw, mainPW=None)
 eric7.Utilities.crypto.pwEncode?4(pw)
-eric7.Utilities.crypto.pwEncrypt?4(pw, masterPW=None)
+eric7.Utilities.crypto.pwEncrypt?4(pw, mainPW=None)
 eric7.Utilities.crypto.pwRecode?4(epw, oldPassword, newPassword)
 eric7.Utilities.crypto.pwReencrypt?4(epw, oldPassword, newPassword)
 eric7.Utilities.crypto.py3AES.AES.KeySize?7
@@ -12285,7 +12285,7 @@
 eric7.WebBrowser.Passwords.PasswordManager.PasswordManager.formSubmitted?4(urlStr, userName, password, data, page)
 eric7.WebBrowser.Passwords.PasswordManager.PasswordManager.getFileName?4()
 eric7.WebBrowser.Passwords.PasswordManager.PasswordManager.getLogin?4(url, realm)
-eric7.WebBrowser.Passwords.PasswordManager.PasswordManager.masterPasswordChanged?4(oldPassword, newPassword)
+eric7.WebBrowser.Passwords.PasswordManager.PasswordManager.mainPasswordChanged?4(oldPassword, newPassword)
 eric7.WebBrowser.Passwords.PasswordManager.PasswordManager.passwordsSaved?7
 eric7.WebBrowser.Passwords.PasswordManager.PasswordManager.reload?4()
 eric7.WebBrowser.Passwords.PasswordManager.PasswordManager.removePassword?4(site)
@@ -13055,9 +13055,9 @@
 eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.isPrivate?4()
 eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.javascriptConsole?4()
 eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.keyPressEvent?4(evt)
+eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.mainPasswordChanged?4(oldPassword, newPassword, local=False)
 eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.mainWindow?4()
 eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.mainWindows?4()
-eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.masterPasswordChanged?4(oldPassword, newPassword, local=False)
 eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager?4()
 eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.newPrivateWindow?4(link=None)
 eric7.WebBrowser.WebBrowserWindow.WebBrowserWindow.newTab?4(link=None, addNextTo=None, background=False)