diff -r 6411ee48fe91 -r 9487c08b6a23 APIs/Python3/eric6.api --- a/APIs/Python3/eric6.api Thu Jul 06 18:59:43 2017 +0200 +++ b/APIs/Python3/eric6.api Wed Aug 02 13:28:50 2017 +0200 @@ -1243,7 +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.E5SimpleHelpDialog.E5SimpleHelpDialog?1(title="", label="", helpStr="", parent=None) eric6.E5Gui.E5SingleApplication.E5SingleApplicationClient.processArgs?4(args) eric6.E5Gui.E5SingleApplication.E5SingleApplicationClient?1() eric6.E5Gui.E5SingleApplication.E5SingleApplicationServer.handleCommand?4(cmd, params) @@ -4018,7 +4018,9 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.contextType?4() eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.end?4() eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.indent?4() +eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.setSpecial?4(special) eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.source?4() +eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.special?4() eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.ssource?4() eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.start?4() eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext?1(source, startLine, contextType) @@ -8169,15 +8171,19 @@ eric6.QScintilla.Shell.Shell.dropEvent?4(event) eric6.QScintilla.Shell.Shell.editorCommand?4(cmd) eric6.QScintilla.Shell.Shell.event?4(evt) -eric6.QScintilla.Shell.Shell.executeLines?4(lines) +eric6.QScintilla.Shell.Shell.executeLines?4(lines, historyIndex=None) eric6.QScintilla.Shell.Shell.focusInEvent?4(event) eric6.QScintilla.Shell.Shell.focusNextPrevChild?4(nextChild) eric6.QScintilla.Shell.Shell.focusOutEvent?4(event) eric6.QScintilla.Shell.Shell.gestureEvent?4(evt) eric6.QScintilla.Shell.Shell.getClientType?4() eric6.QScintilla.Shell.Shell.getHistory?4(clientType) +eric6.QScintilla.Shell.Shell.getHistoryIndex?4() eric6.QScintilla.Shell.Shell.handlePreferencesChanged?4() +eric6.QScintilla.Shell.Shell.historyStyle?4() +eric6.QScintilla.Shell.Shell.historyStyleChanged?7 eric6.QScintilla.Shell.Shell.insert?4(txt) +eric6.QScintilla.Shell.Shell.isHistoryEnabled?4() eric6.QScintilla.Shell.Shell.keyPressEvent?4(ev) eric6.QScintilla.Shell.Shell.loadHistory?4(clientType) eric6.QScintilla.Shell.Shell.mousePressEvent?4(event) @@ -8195,6 +8201,9 @@ eric6.QScintilla.Shell.ShellAssembly.shell?4() eric6.QScintilla.Shell.ShellAssembly.showFind?4(txt="") eric6.QScintilla.Shell.ShellAssembly?1(dbs, vm, horizontal=True, parent=None) +eric6.QScintilla.Shell.ShellHistoryStyle.Disabled?7 +eric6.QScintilla.Shell.ShellHistoryStyle.LinuxStyle?7 +eric6.QScintilla.Shell.ShellHistoryStyle.WindowsStyle?7 eric6.QScintilla.ShellHistoryDialog.ShellHistoryDialog.getHistory?4() eric6.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_copyButton_clicked?4() eric6.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_deleteButton_clicked?4() @@ -8445,6 +8454,7 @@ eric6.Templates.TemplateViewer.TemplateViewer.save?4() eric6.Templates.TemplateViewer.TemplateViewer.writeTemplates?4(filename=None) eric6.Templates.TemplateViewer.TemplateViewer?1(parent, viewmanager) +eric6.Toolbox.PyQt4ImportHook.PyQt4Importer.QComboBox_currentData?4(role=None) eric6.Toolbox.PyQt4ImportHook.PyQt4Importer.find_module?4(fullname, path=None) eric6.Toolbox.PyQt4ImportHook.PyQt4Importer.load_module?4(fullname) eric6.Toolbox.PyQt4ImportHook.PyQt4Importer?1() @@ -10588,6 +10598,43 @@ eric6.WebBrowser.SearchWidget.SearchWidget.on_findtextCombo_editTextChanged?4(txt) eric6.WebBrowser.SearchWidget.SearchWidget.showFind?4() eric6.WebBrowser.SearchWidget.SearchWidget?1(mainWindow, parent=None) +eric6.WebBrowser.Session.SessionManager.SessionManager.CloneSession?7 +eric6.WebBrowser.Session.SessionManager.SessionManager.ReplaceSession?7 +eric6.WebBrowser.Session.SessionManager.SessionManager.RestoreSession?7 +eric6.WebBrowser.Session.SessionManager.SessionManager.SwitchSession?7 +eric6.WebBrowser.Session.SessionManager.SessionManager.aboutToShowSessionsMenu?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.activateTimer?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.autoSaveSession?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.cloneSession?4(sessionFilePath) +eric6.WebBrowser.Session.SessionManager.SessionManager.defaultSessionFile?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.deleteSession?4(sessionFilePath) +eric6.WebBrowser.Session.SessionManager.SessionManager.getSessionsDirectory?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.isValidSession?4(session) +eric6.WebBrowser.Session.SessionManager.SessionManager.lastActiveSessionFile?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.newSession?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.openSession?4(sessionFilePath, flags=0) +eric6.WebBrowser.Session.SessionManager.SessionManager.preferencesChanged?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.readSessionFromFile?4(sessionFileName) +eric6.WebBrowser.Session.SessionManager.SessionManager.renameSession?4(sessionFilePath, flags=0) +eric6.WebBrowser.Session.SessionManager.SessionManager.replaceSession?4(sessionFilePath) +eric6.WebBrowser.Session.SessionManager.SessionManager.restoreSessionFromData?4(window=None, sessionData=None) +eric6.WebBrowser.Session.SessionManager.SessionManager.saveSession?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.selectSession?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.sessionMetaData?4(includeBackups=False) +eric6.WebBrowser.Session.SessionManager.SessionManager.sessionsMetaDataChanged?7 +eric6.WebBrowser.Session.SessionManager.SessionManager.showSessionManagerDialog?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.shutdown?4() +eric6.WebBrowser.Session.SessionManager.SessionManager.switchToSession?4(sessionFilePath) +eric6.WebBrowser.Session.SessionManager.SessionManager.writeCurrentSession?4(sessionFileName) +eric6.WebBrowser.Session.SessionManager.SessionManager?1(parent=None) +eric6.WebBrowser.Session.SessionManager.SessionMetaData?1() +eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog.ActiveSessionRole?7 +eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog.BackupSessionRole?7 +eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog.DefaultSessionRole?7 +eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog.SessionFileRole?7 +eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog.resizeEvent?4(evt) +eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog.showEvent?4(evt) +eric6.WebBrowser.Session.SessionManagerDialog.SessionManagerDialog?1(parent=None) eric6.WebBrowser.SiteInfo.SiteInfoDialog.SiteInfoDialog.nokStyle?7 eric6.WebBrowser.SiteInfo.SiteInfoDialog.SiteInfoDialog.okStyle?7 eric6.WebBrowser.SiteInfo.SiteInfoDialog.SiteInfoDialog.on_imagesTree_currentItemChanged?4(current, previous) @@ -10941,6 +10988,8 @@ eric6.WebBrowser.WebBrowserPage.WebBrowserPage.resultCallback?4(resDict=resultDict) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.runJavaScript?4(script, worldId=-1, callback=None) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.scroll?4(x, y) +eric6.WebBrowser.WebBrowserPage.WebBrowserPage.scrollPosition?4() +eric6.WebBrowser.WebBrowserPage.WebBrowserPage.scrollTo?4(pos) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.setJavaScriptEnabled?4(enable) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.setUserAgent?4(agent) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.userAgent?4(resolveEmpty=False) @@ -10967,8 +11016,10 @@ eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.currentBrowser?4() eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.currentUrlBar?4() eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.currentUrlChanged?7 +eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.getSessionData?4() eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.getSourceFileList?4() -eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.newBrowser?4(link=None, position=-1, background=False) +eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.loadFromSessionData?4(sessionData) +eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.newBrowser?4(link=None, position=-1, background=False, restoreSession=False) eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.newBrowserAfter?4(browser, link=None, background=False) eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.preferencesChanged?4() eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.printBrowser?4(browser=None) @@ -10993,6 +11044,7 @@ eric6.WebBrowser.WebBrowserView.WebBrowserView._mousePressEvent?5(evt) eric6.WebBrowser.WebBrowserView.WebBrowserView._mouseReleaseEvent?5(evt) eric6.WebBrowser.WebBrowserView.WebBrowserView._wheelEvent?5(evt) +eric6.WebBrowser.WebBrowserView.WebBrowserView.activateSession?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.addBookmark?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.backward?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.backwardAvailable?7 @@ -11009,12 +11061,14 @@ eric6.WebBrowser.WebBrowserView.WebBrowserView.dropEvent?4(evt) eric6.WebBrowser.WebBrowserView.WebBrowserView.event?4(evt) eric6.WebBrowser.WebBrowserView.WebBrowserView.eventFilter?4(obj, evt) +eric6.WebBrowser.WebBrowserView.WebBrowserView.extractSessionMetaData?4(sessionData) eric6.WebBrowser.WebBrowserView.WebBrowserView.faviconChanged?7 eric6.WebBrowser.WebBrowserView.WebBrowserView.findNextPrev?4(txt, case, backwards, callback) eric6.WebBrowser.WebBrowserView.WebBrowserView.forward?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.forwardAvailable?7 eric6.WebBrowser.WebBrowserView.WebBrowserView.getPreview?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.getRSS?4() +eric6.WebBrowser.WebBrowserView.WebBrowserView.getSessionData?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.hasRSS?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.hasSelection?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.highlighted?7 @@ -11026,6 +11080,7 @@ eric6.WebBrowser.WebBrowserView.WebBrowserView.isFullScreen?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.isLoading?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.load?4(url) +eric6.WebBrowser.WebBrowserView.WebBrowserView.loadFromSessionData?4(sessionData) eric6.WebBrowser.WebBrowserView.WebBrowserView.mainWindow?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.mapToViewport?4(pos) eric6.WebBrowser.WebBrowserView.WebBrowserView.paste?4() @@ -11040,8 +11095,10 @@ eric6.WebBrowser.WebBrowserView.WebBrowserView.selectAll?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.setSource?4(name, newTab=False) eric6.WebBrowser.WebBrowserView.WebBrowserView.setZoomValue?4(value, saveValue=True) +eric6.WebBrowser.WebBrowserView.WebBrowserView.showEvent?4(evt) eric6.WebBrowser.WebBrowserView.WebBrowserView.source?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.sourceChanged?7 +eric6.WebBrowser.WebBrowserView.WebBrowserView.storeSessionData?4(data) eric6.WebBrowser.WebBrowserView.WebBrowserView.undo?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.unselect?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.zoomIn?4() @@ -11072,10 +11129,14 @@ eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._historyManager?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._imageSearchEngine?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._isPrivate?8 +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._lastActiveWindow?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._networkManager?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._notification?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._passwordManager?8 +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._performingShutdown?8 +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._performingStartup?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._personalInformationManager?8 +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._sessionManager?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._speedDial?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._syncManager?8 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow._tabManager?8 @@ -11102,6 +11163,7 @@ eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.featurePermissionManager?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.feedsManager?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.flashCookieManager?4() +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.forceClose?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.fromEric?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.getActions?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.getQtHelpCollectionFileName?4() @@ -11113,6 +11175,7 @@ eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.historyManager?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.icon?4(url) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.imageSearchEngine?4() +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.isClosing?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.isFullScreenNavigationVisible?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.isPrivate?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.javascriptConsole?4() @@ -11124,7 +11187,7 @@ eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.networkManager?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.newPrivateWindow?4(link=None) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.newTab?4(link=None, addNextTo=None, background=False) -eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.newWindow?4(link=None) +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.newWindow?4(link=None, restoreSession=False) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.notificationsEnabled?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.openSearchManager?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.openUrl?4(url, title=None) @@ -11139,6 +11202,7 @@ eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.requestVirusTotalScan?4(url) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.search?4(word) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.searchEnginesAction?4() +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.sessionManager?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.setBackwardAvailable?4(b) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.setEventKeyboardModifiers?4(modifiers) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.setEventMouseButtons?4(buttons) @@ -11159,7 +11223,7 @@ eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webBrowserWindowClosed?7 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webBrowserWindowOpened?7 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webProfile?4(private=False) -eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow?1(home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None, private=False, qthelp=False, settingsDir="") +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow?1(home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None, private=False, qthelp=False, settingsDir="", restoreSession=False) eric6.WebBrowser.WebInspector.WebInspector.closeEvent?4(evt) eric6.WebBrowser.WebInspector.WebInspector.inspectElement?4() eric6.WebBrowser.WebInspector.WebInspector.isEnabled?4()