Mercurial Repositories > eric / changeset
changeset
Updated source docu.
Wed, 05 Jul 2017 19:58:40 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 05 Jul 2017 19:58:40 +0200
- changeset 5788
- b01d2c1e0973
- parent 5787
- 0a83583316c2
- child 5789
- abd01db5aa35
Updated source docu.
--- a/APIs/Python3/eric6.api Wed Jul 05 19:57:39 2017 +0200 +++ b/APIs/Python3/eric6.api Wed Jul 05 19:58:40 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) @@ -10588,6 +10588,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 +10978,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 +11006,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 +11034,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 +11051,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 +11070,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 +11085,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 +11119,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 +11153,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() @@ -11124,7 +11176,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 +11191,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 +11212,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()
--- a/APIs/Python3/eric6.bas Wed Jul 05 19:57:39 2017 +0200 +++ b/APIs/Python3/eric6.bas Wed Jul 05 19:58:40 2017 +0200 @@ -689,6 +689,8 @@ SearchWidget QWidget Ui_SearchWidget SecurityPage ConfigurationPageBase Ui_SecurityPage SendRefererWhitelistDialog QDialog Ui_SendRefererWhitelistDialog +SessionManager QObject +SessionManagerDialog QDialog Ui_SessionManagerDialog SessionReader XMLStreamReaderBase SessionWriter XMLStreamWriterBase SetResolver BaseResolver
--- a/Documentation/Help/source.qhp Wed Jul 05 19:57:39 2017 +0200 +++ b/Documentation/Help/source.qhp Wed Jul 05 19:58:40 2017 +0200 @@ -1224,6 +1224,10 @@ <section title="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html" /> <section title="eric6.WebBrowser.QtHelp.QtHelpFiltersDialog" ref="eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.html" /> </section> + <section title="eric6.WebBrowser.Session" ref="index-eric6.WebBrowser.Session.html"> + <section title="eric6.WebBrowser.Session.SessionManager" ref="eric6.WebBrowser.Session.SessionManager.html" /> + <section title="eric6.WebBrowser.Session.SessionManagerDialog" ref="eric6.WebBrowser.Session.SessionManagerDialog.html" /> + </section> <section title="eric6.WebBrowser.SiteInfo" ref="index-eric6.WebBrowser.SiteInfo.html"> <section title="eric6.WebBrowser.SiteInfo.SiteInfoDialog" ref="eric6.WebBrowser.SiteInfo.SiteInfoDialog.html" /> </section> @@ -12406,6 +12410,56 @@ <keyword name="SendRefererWhitelistDialog.accept" id="SendRefererWhitelistDialog.accept" ref="eric6.WebBrowser.Network.SendRefererWhitelistDialog.html#SendRefererWhitelistDialog.accept" /> <keyword name="SendRefererWhitelistDialog.on_addButton_clicked" id="SendRefererWhitelistDialog.on_addButton_clicked" ref="eric6.Helpviewer.Network.SendRefererWhitelistDialog.html#SendRefererWhitelistDialog.on_addButton_clicked" /> <keyword name="SendRefererWhitelistDialog.on_addButton_clicked" id="SendRefererWhitelistDialog.on_addButton_clicked" ref="eric6.WebBrowser.Network.SendRefererWhitelistDialog.html#SendRefererWhitelistDialog.on_addButton_clicked" /> + <keyword name="Session (Package)" id="Session (Package)" ref="index-eric6.WebBrowser.Session.html" /> + <keyword name="SessionManager" id="SessionManager" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager" /> + <keyword name="SessionManager (Constructor)" id="SessionManager (Constructor)" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.__init__" /> + <keyword name="SessionManager (Module)" id="SessionManager (Module)" ref="eric6.WebBrowser.Session.SessionManager.html" /> + <keyword name="SessionManager.__autoSaveSession" id="SessionManager.__autoSaveSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.__autoSaveSession" /> + <keyword name="SessionManager.__backupSavedSession" id="SessionManager.__backupSavedSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.__backupSavedSession" /> + <keyword name="SessionManager.__fillMetaDataList" id="SessionManager.__fillMetaDataList" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.__fillMetaDataList" /> + <keyword name="SessionManager.__initSessionSaveTimer" id="SessionManager.__initSessionSaveTimer" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.__initSessionSaveTimer" /> + <keyword name="SessionManager.__isActive" id="SessionManager.__isActive" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.__isActive" /> + <keyword name="SessionManager.__sessionActTriggered" id="SessionManager.__sessionActTriggered" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.__sessionActTriggered" /> + <keyword name="SessionManager.__sessionDirectoryChanged" id="SessionManager.__sessionDirectoryChanged" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.__sessionDirectoryChanged" /> + <keyword name="SessionManager.aboutToShowSessionsMenu" id="SessionManager.aboutToShowSessionsMenu" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.aboutToShowSessionsMenu" /> + <keyword name="SessionManager.activateTimer" id="SessionManager.activateTimer" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.activateTimer" /> + <keyword name="SessionManager.autoSaveSession" id="SessionManager.autoSaveSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.autoSaveSession" /> + <keyword name="SessionManager.cloneSession" id="SessionManager.cloneSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.cloneSession" /> + <keyword name="SessionManager.defaultSessionFile" id="SessionManager.defaultSessionFile" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.defaultSessionFile" /> + <keyword name="SessionManager.deleteSession" id="SessionManager.deleteSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.deleteSession" /> + <keyword name="SessionManager.getSessionsDirectory" id="SessionManager.getSessionsDirectory" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.getSessionsDirectory" /> + <keyword name="SessionManager.isValidSession" id="SessionManager.isValidSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.isValidSession" /> + <keyword name="SessionManager.lastActiveSessionFile" id="SessionManager.lastActiveSessionFile" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.lastActiveSessionFile" /> + <keyword name="SessionManager.newSession" id="SessionManager.newSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.newSession" /> + <keyword name="SessionManager.openSession" id="SessionManager.openSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.openSession" /> + <keyword name="SessionManager.preferencesChanged" id="SessionManager.preferencesChanged" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.preferencesChanged" /> + <keyword name="SessionManager.readSessionFromFile" id="SessionManager.readSessionFromFile" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.readSessionFromFile" /> + <keyword name="SessionManager.renameSession" id="SessionManager.renameSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.renameSession" /> + <keyword name="SessionManager.replaceSession" id="SessionManager.replaceSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.replaceSession" /> + <keyword name="SessionManager.restoreSessionFromData" id="SessionManager.restoreSessionFromData" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.restoreSessionFromData" /> + <keyword name="SessionManager.saveSession" id="SessionManager.saveSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.saveSession" /> + <keyword name="SessionManager.selectSession" id="SessionManager.selectSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.selectSession" /> + <keyword name="SessionManager.sessionMetaData" id="SessionManager.sessionMetaData" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.sessionMetaData" /> + <keyword name="SessionManager.showSessionManagerDialog" id="SessionManager.showSessionManagerDialog" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.showSessionManagerDialog" /> + <keyword name="SessionManager.shutdown" id="SessionManager.shutdown" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.shutdown" /> + <keyword name="SessionManager.switchToSession" id="SessionManager.switchToSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.switchToSession" /> + <keyword name="SessionManager.writeCurrentSession" id="SessionManager.writeCurrentSession" ref="eric6.WebBrowser.Session.SessionManager.html#SessionManager.writeCurrentSession" /> + <keyword name="SessionManagerDialog" id="SessionManagerDialog" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog" /> + <keyword name="SessionManagerDialog (Constructor)" id="SessionManagerDialog (Constructor)" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__init__" /> + <keyword name="SessionManagerDialog (Module)" id="SessionManagerDialog (Module)" ref="eric6.WebBrowser.Session.SessionManagerDialog.html" /> + <keyword name="SessionManagerDialog.__cloneSession" id="SessionManagerDialog.__cloneSession" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__cloneSession" /> + <keyword name="SessionManagerDialog.__deleteSession" id="SessionManagerDialog.__deleteSession" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__deleteSession" /> + <keyword name="SessionManagerDialog.__newSession" id="SessionManagerDialog.__newSession" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__newSession" /> + <keyword name="SessionManagerDialog.__refresh" id="SessionManagerDialog.__refresh" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__refresh" /> + <keyword name="SessionManagerDialog.__renameSession" id="SessionManagerDialog.__renameSession" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__renameSession" /> + <keyword name="SessionManagerDialog.__resizeViewHeader" id="SessionManagerDialog.__resizeViewHeader" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__resizeViewHeader" /> + <keyword name="SessionManagerDialog.__switchToSession" id="SessionManagerDialog.__switchToSession" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__switchToSession" /> + <keyword name="SessionManagerDialog.__updateButtons" id="SessionManagerDialog.__updateButtons" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__updateButtons" /> + <keyword name="SessionManagerDialog.__updateSessionItem" id="SessionManagerDialog.__updateSessionItem" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.__updateSessionItem" /> + <keyword name="SessionManagerDialog.resizeEvent" id="SessionManagerDialog.resizeEvent" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.resizeEvent" /> + <keyword name="SessionManagerDialog.showEvent" id="SessionManagerDialog.showEvent" ref="eric6.WebBrowser.Session.SessionManagerDialog.html#SessionManagerDialog.showEvent" /> + <keyword name="SessionMetaData" id="SessionMetaData" ref="eric6.WebBrowser.Session.SessionManager.html#SessionMetaData" /> + <keyword name="SessionMetaData (Constructor)" id="SessionMetaData (Constructor)" ref="eric6.WebBrowser.Session.SessionManager.html#SessionMetaData.__init__" /> <keyword name="SessionReader" id="SessionReader" ref="eric6.E5XML.SessionReader.html#SessionReader" /> <keyword name="SessionReader (Constructor)" id="SessionReader (Constructor)" ref="eric6.E5XML.SessionReader.html#SessionReader.__init__" /> <keyword name="SessionReader (Module)" id="SessionReader (Module)" ref="eric6.E5XML.SessionReader.html" /> @@ -15793,6 +15847,8 @@ <keyword name="WebBrowserPage.runJavaScript" id="WebBrowserPage.runJavaScript" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.runJavaScript" /> <keyword name="WebBrowserPage.save" id="WebBrowserPage.save" ref="eric6.Preferences.ConfigurationPages.WebBrowserPage.html#WebBrowserPage.save" /> <keyword name="WebBrowserPage.scroll" id="WebBrowserPage.scroll" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.scroll" /> + <keyword name="WebBrowserPage.scrollPosition" id="WebBrowserPage.scrollPosition" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.scrollPosition" /> + <keyword name="WebBrowserPage.scrollTo" id="WebBrowserPage.scrollTo" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.scrollTo" /> <keyword name="WebBrowserPage.setJavaScriptEnabled" id="WebBrowserPage.setJavaScriptEnabled" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.setJavaScriptEnabled" /> <keyword name="WebBrowserPage.setUserAgent" id="WebBrowserPage.setUserAgent" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.setUserAgent" /> <keyword name="WebBrowserPage.userAgent" id="WebBrowserPage.userAgent" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.userAgent" /> @@ -15857,7 +15913,9 @@ <keyword name="WebBrowserTabWidget.closedTabsManager" id="WebBrowserTabWidget.closedTabsManager" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.closedTabsManager" /> <keyword name="WebBrowserTabWidget.currentBrowser" id="WebBrowserTabWidget.currentBrowser" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.currentBrowser" /> <keyword name="WebBrowserTabWidget.currentUrlBar" id="WebBrowserTabWidget.currentUrlBar" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.currentUrlBar" /> + <keyword name="WebBrowserTabWidget.getSessionData" id="WebBrowserTabWidget.getSessionData" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.getSessionData" /> <keyword name="WebBrowserTabWidget.getSourceFileList" id="WebBrowserTabWidget.getSourceFileList" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.getSourceFileList" /> + <keyword name="WebBrowserTabWidget.loadFromSessionData" id="WebBrowserTabWidget.loadFromSessionData" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.loadFromSessionData" /> <keyword name="WebBrowserTabWidget.newBrowser" id="WebBrowserTabWidget.newBrowser" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.newBrowser" /> <keyword name="WebBrowserTabWidget.newBrowserAfter" id="WebBrowserTabWidget.newBrowserAfter" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.newBrowserAfter" /> <keyword name="WebBrowserTabWidget.preferencesChanged" id="WebBrowserTabWidget.preferencesChanged" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.preferencesChanged" /> @@ -15918,6 +15976,7 @@ <keyword name="WebBrowserView.__searchRequested" id="WebBrowserView.__searchRequested" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__searchRequested" /> <keyword name="WebBrowserView.__sendLink" id="WebBrowserView.__sendLink" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__sendLink" /> <keyword name="WebBrowserView.__setRwhvqt" id="WebBrowserView.__setRwhvqt" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__setRwhvqt" /> + <keyword name="WebBrowserView.__showEventSlot" id="WebBrowserView.__showEventSlot" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__showEventSlot" /> <keyword name="WebBrowserView.__showTabCrashPage" id="WebBrowserView.__showTabCrashPage" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__showTabCrashPage" /> <keyword name="WebBrowserView.__urlChanged" id="WebBrowserView.__urlChanged" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__urlChanged" /> <keyword name="WebBrowserView.__virusTotal" id="WebBrowserView.__virusTotal" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__virusTotal" /> @@ -15930,6 +15989,7 @@ <keyword name="WebBrowserView._mousePressEvent" id="WebBrowserView._mousePressEvent" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView._mousePressEvent" /> <keyword name="WebBrowserView._mouseReleaseEvent" id="WebBrowserView._mouseReleaseEvent" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView._mouseReleaseEvent" /> <keyword name="WebBrowserView._wheelEvent" id="WebBrowserView._wheelEvent" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView._wheelEvent" /> + <keyword name="WebBrowserView.activateSession" id="WebBrowserView.activateSession" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.activateSession" /> <keyword name="WebBrowserView.addBookmark" id="WebBrowserView.addBookmark" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.addBookmark" /> <keyword name="WebBrowserView.backward" id="WebBrowserView.backward" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.backward" /> <keyword name="WebBrowserView.checkRSS" id="WebBrowserView.checkRSS" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.checkRSS" /> @@ -15945,10 +16005,12 @@ <keyword name="WebBrowserView.dropEvent" id="WebBrowserView.dropEvent" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.dropEvent" /> <keyword name="WebBrowserView.event" id="WebBrowserView.event" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.event" /> <keyword name="WebBrowserView.eventFilter" id="WebBrowserView.eventFilter" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.eventFilter" /> + <keyword name="WebBrowserView.extractSessionMetaData" id="WebBrowserView.extractSessionMetaData" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.extractSessionMetaData" /> <keyword name="WebBrowserView.findNextPrev" id="WebBrowserView.findNextPrev" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.findNextPrev" /> <keyword name="WebBrowserView.forward" id="WebBrowserView.forward" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.forward" /> <keyword name="WebBrowserView.getPreview" id="WebBrowserView.getPreview" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.getPreview" /> <keyword name="WebBrowserView.getRSS" id="WebBrowserView.getRSS" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.getRSS" /> + <keyword name="WebBrowserView.getSessionData" id="WebBrowserView.getSessionData" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.getSessionData" /> <keyword name="WebBrowserView.hasRSS" id="WebBrowserView.hasRSS" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.hasRSS" /> <keyword name="WebBrowserView.hasSelection" id="WebBrowserView.hasSelection" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.hasSelection" /> <keyword name="WebBrowserView.home" id="WebBrowserView.home" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.home" /> @@ -15959,6 +16021,7 @@ <keyword name="WebBrowserView.isFullScreen" id="WebBrowserView.isFullScreen" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.isFullScreen" /> <keyword name="WebBrowserView.isLoading" id="WebBrowserView.isLoading" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.isLoading" /> <keyword name="WebBrowserView.load" id="WebBrowserView.load" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.load" /> + <keyword name="WebBrowserView.loadFromSessionData" id="WebBrowserView.loadFromSessionData" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.loadFromSessionData" /> <keyword name="WebBrowserView.mainWindow" id="WebBrowserView.mainWindow" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.mainWindow" /> <keyword name="WebBrowserView.mapToViewport" id="WebBrowserView.mapToViewport" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.mapToViewport" /> <keyword name="WebBrowserView.paste" id="WebBrowserView.paste" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.paste" /> @@ -15972,7 +16035,9 @@ <keyword name="WebBrowserView.selectAll" id="WebBrowserView.selectAll" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.selectAll" /> <keyword name="WebBrowserView.setSource" id="WebBrowserView.setSource" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.setSource" /> <keyword name="WebBrowserView.setZoomValue" id="WebBrowserView.setZoomValue" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.setZoomValue" /> + <keyword name="WebBrowserView.showEvent" id="WebBrowserView.showEvent" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.showEvent" /> <keyword name="WebBrowserView.source" id="WebBrowserView.source" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.source" /> + <keyword name="WebBrowserView.storeSessionData" id="WebBrowserView.storeSessionData" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.storeSessionData" /> <keyword name="WebBrowserView.undo" id="WebBrowserView.undo" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.undo" /> <keyword name="WebBrowserView.unselect" id="WebBrowserView.unselect" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.unselect" /> <keyword name="WebBrowserView.zoomIn" id="WebBrowserView.zoomIn" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.zoomIn" /> @@ -16020,7 +16085,6 @@ <keyword name="WebBrowserWindow.__bookmarkAllCallback" id="WebBrowserWindow.__bookmarkAllCallback" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__bookmarkAllCallback" /> <keyword name="WebBrowserWindow.__clearIconsDatabase" id="WebBrowserWindow.__clearIconsDatabase" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__clearIconsDatabase" /> <keyword name="WebBrowserWindow.__clearPrivateData" id="WebBrowserWindow.__clearPrivateData" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__clearPrivateData" /> - <keyword name="WebBrowserWindow.__closeAllWindows" id="WebBrowserWindow.__closeAllWindows" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__closeAllWindows" /> <keyword name="WebBrowserWindow.__copy" id="WebBrowserWindow.__copy" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__copy" /> <keyword name="WebBrowserWindow.__createTextEncodingAction" id="WebBrowserWindow.__createTextEncodingAction" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__createTextEncodingAction" /> <keyword name="WebBrowserWindow.__createTextEncodingSubmenu" id="WebBrowserWindow.__createTextEncodingSubmenu" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__createTextEncodingSubmenu" /> @@ -16068,6 +16132,7 @@ <keyword name="WebBrowserWindow.__setTextEncoding" id="WebBrowserWindow.__setTextEncoding" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__setTextEncoding" /> <keyword name="WebBrowserWindow.__setUserStyleSheet" id="WebBrowserWindow.__setUserStyleSheet" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__setUserStyleSheet" /> <keyword name="WebBrowserWindow.__setupFilterCombo" id="WebBrowserWindow.__setupFilterCombo" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__setupFilterCombo" /> + <keyword name="WebBrowserWindow.__shallShutDown" id="WebBrowserWindow.__shallShutDown" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__shallShutDown" /> <keyword name="WebBrowserWindow.__showAcceptedLanguages" id="WebBrowserWindow.__showAcceptedLanguages" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showAcceptedLanguages" /> <keyword name="WebBrowserWindow.__showAdBlockDialog" id="WebBrowserWindow.__showAdBlockDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showAdBlockDialog" /> <keyword name="WebBrowserWindow.__showBookmarksDialog" id="WebBrowserWindow.__showBookmarksDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showBookmarksDialog" /> @@ -16087,6 +16152,7 @@ <keyword name="WebBrowserWindow.__showPersonalInformationDialog" id="WebBrowserWindow.__showPersonalInformationDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showPersonalInformationDialog" /> <keyword name="WebBrowserWindow.__showPreferences" id="WebBrowserWindow.__showPreferences" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showPreferences" /> <keyword name="WebBrowserWindow.__showSearchWindow" id="WebBrowserWindow.__showSearchWindow" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showSearchWindow" /> + <keyword name="WebBrowserWindow.__showSessionManagerDialog" id="WebBrowserWindow.__showSessionManagerDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showSessionManagerDialog" /> <keyword name="WebBrowserWindow.__showSiteinfoDialog" id="WebBrowserWindow.__showSiteinfoDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showSiteinfoDialog" /> <keyword name="WebBrowserWindow.__showSyncDialog" id="WebBrowserWindow.__showSyncDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showSyncDialog" /> <keyword name="WebBrowserWindow.__showTabManager" id="WebBrowserWindow.__showTabManager" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showTabManager" /> @@ -16095,6 +16161,7 @@ <keyword name="WebBrowserWindow.__showUserAgentsDialog" id="WebBrowserWindow.__showUserAgentsDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showUserAgentsDialog" /> <keyword name="WebBrowserWindow.__showWebIconsDialog" id="WebBrowserWindow.__showWebIconsDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showWebIconsDialog" /> <keyword name="WebBrowserWindow.__showZoomValuesDialog" id="WebBrowserWindow.__showZoomValuesDialog" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__showZoomValuesDialog" /> + <keyword name="WebBrowserWindow.__shutdownWindow" id="WebBrowserWindow.__shutdownWindow" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__shutdownWindow" /> <keyword name="WebBrowserWindow.__stopLoading" id="WebBrowserWindow.__stopLoading" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__stopLoading" /> <keyword name="WebBrowserWindow.__switchTab" id="WebBrowserWindow.__switchTab" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__switchTab" /> <keyword name="WebBrowserWindow.__syncTOC" id="WebBrowserWindow.__syncTOC" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.__syncTOC" /> @@ -16134,6 +16201,7 @@ <keyword name="WebBrowserWindow.featurePermissionManager" id="WebBrowserWindow.featurePermissionManager" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.featurePermissionManager" /> <keyword name="WebBrowserWindow.feedsManager" id="WebBrowserWindow.feedsManager" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.feedsManager" /> <keyword name="WebBrowserWindow.flashCookieManager" id="WebBrowserWindow.flashCookieManager" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.flashCookieManager" /> + <keyword name="WebBrowserWindow.forceClose" id="WebBrowserWindow.forceClose" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.forceClose" /> <keyword name="WebBrowserWindow.fromEric" id="WebBrowserWindow.fromEric" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.fromEric" /> <keyword name="WebBrowserWindow.getActions" id="WebBrowserWindow.getActions" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.getActions" /> <keyword name="WebBrowserWindow.getQtHelpCollectionFileName" id="WebBrowserWindow.getQtHelpCollectionFileName" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.getQtHelpCollectionFileName" /> @@ -16171,6 +16239,7 @@ <keyword name="WebBrowserWindow.requestVirusTotalScan" id="WebBrowserWindow.requestVirusTotalScan" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.requestVirusTotalScan" /> <keyword name="WebBrowserWindow.search" id="WebBrowserWindow.search" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.search" /> <keyword name="WebBrowserWindow.searchEnginesAction" id="WebBrowserWindow.searchEnginesAction" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.searchEnginesAction" /> + <keyword name="WebBrowserWindow.sessionManager" id="WebBrowserWindow.sessionManager" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.sessionManager" /> <keyword name="WebBrowserWindow.setBackwardAvailable" id="WebBrowserWindow.setBackwardAvailable" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.setBackwardAvailable" /> <keyword name="WebBrowserWindow.setEventKeyboardModifiers" id="WebBrowserWindow.setEventKeyboardModifiers" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.setEventKeyboardModifiers" /> <keyword name="WebBrowserWindow.setEventMouseButtons" id="WebBrowserWindow.setEventMouseButtons" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.setEventMouseButtons" /> @@ -18205,6 +18274,8 @@ <file>eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html</file> <file>eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.html</file> <file>eric6.WebBrowser.SearchWidget.html</file> + <file>eric6.WebBrowser.Session.SessionManager.html</file> + <file>eric6.WebBrowser.Session.SessionManagerDialog.html</file> <file>eric6.WebBrowser.SiteInfo.SiteInfoDialog.html</file> <file>eric6.WebBrowser.SpeedDial.Page.html</file> <file>eric6.WebBrowser.SpeedDial.PageThumbnailer.html</file> @@ -18428,6 +18499,7 @@ <file>index-eric6.WebBrowser.Passwords.html</file> <file>index-eric6.WebBrowser.PersonalInformationManager.html</file> <file>index-eric6.WebBrowser.QtHelp.html</file> + <file>index-eric6.WebBrowser.Session.html</file> <file>index-eric6.WebBrowser.SiteInfo.html</file> <file>index-eric6.WebBrowser.SpeedDial.html</file> <file>index-eric6.WebBrowser.StatusBar.html</file>
--- a/Documentation/Source/eric6.E5Gui.E5SimpleHelpDialog.html Wed Jul 05 19:57:39 2017 +0200 +++ b/Documentation/Source/eric6.E5Gui.E5SimpleHelpDialog.html Wed Jul 05 19:58:40 2017 +0200 @@ -67,7 +67,7 @@ </table> <a NAME="E5SimpleHelpDialog.__init__" ID="E5SimpleHelpDialog.__init__"></a> <h4>E5SimpleHelpDialog (Constructor)</h4> -<b>E5SimpleHelpDialog</b>(<i>title="", label="", help="", parent=None</i>) +<b>E5SimpleHelpDialog</b>(<i>title="", label="", helpStr="", parent=None</i>) <p> Constructor </p><dl> @@ -77,7 +77,7 @@ </dd><dt><i>label</i> (str)</dt> <dd> label for the help -</dd><dt><i>help</i> (str)</dt> +</dd><dt><i>helpStr</i> (str)</dt> <dd> HTML help text </dd><dt><i>parent</i> (QWidget)</dt>
--- a/Documentation/Source/eric6.UI.EmailDialog.html Wed Jul 05 19:57:39 2017 +0200 +++ b/Documentation/Source/eric6.UI.EmailDialog.html Wed Jul 05 19:58:40 2017 +0200 @@ -210,7 +210,7 @@ <p> Private method to actually send the message via Google Mail. </p><dl> -<dt><i>message</i> (email.mime.text.MIMEBase)</dt> +<dt><i>msg</i> (email.mime.text.MIMEBase)</dt> <dd> email message to be sent </dd>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.WebBrowser.Session.SessionManager.html Wed Jul 05 19:58:40 2017 +0200 @@ -0,0 +1,542 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.WebBrowser.Session.SessionManager</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.WebBrowser.Session.SessionManager</h1> +<p> +Module implementing the session manager. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#SessionManager">SessionManager</a></td> +<td>Class implementing the session manager.</td> +</tr><tr> +<td><a href="#SessionMetaData">SessionMetaData</a></td> +<td>Class implementing a data structure to store meta data for a session.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="SessionManager" ID="SessionManager"></a> +<h2>SessionManager</h2> +<p> + Class implementing the session manager. +</p><h3>Signals</h3> +<dl> +<dt>sessionsMetaDataChanged()</dt> +<dd> +emitted to indicate a change of the + list of session meta data +</dd> +</dl> +<h3>Derived from</h3> +QObject +<h3>Class Attributes</h3> +<table> +<tr><td>CloneSession</td></tr><tr><td>ReplaceSession</td></tr><tr><td>RestoreSession</td></tr><tr><td>SwitchSession</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr> +<td><a href="#SessionManager.isValidSession">isValidSession</a></td> +<td>Class method to check the validity of a session.</td> +</tr><tr> +<td><a href="#SessionManager.readSessionFromFile">readSessionFromFile</a></td> +<td>Class method to read the session data from a file.</td> +</tr><tr> +<td><a href="#SessionManager.restoreSessionFromData">restoreSessionFromData</a></td> +<td>Class method to restore a session from a session data dictionary.</td> +</tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#SessionManager.__init__">SessionManager</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#SessionManager.__autoSaveSession">__autoSaveSession</a></td> +<td>Private slot to save the current session state.</td> +</tr><tr> +<td><a href="#SessionManager.__backupSavedSession">__backupSavedSession</a></td> +<td>Private method to backup the most recently saved session.</td> +</tr><tr> +<td><a href="#SessionManager.__fillMetaDataList">__fillMetaDataList</a></td> +<td>Private method to fill the sessions meta data list.</td> +</tr><tr> +<td><a href="#SessionManager.__initSessionSaveTimer">__initSessionSaveTimer</a></td> +<td>Private slot to initialize the auto save timer.</td> +</tr><tr> +<td><a href="#SessionManager.__isActive">__isActive</a></td> +<td>Private method to check, if a given file is the active one.</td> +</tr><tr> +<td><a href="#SessionManager.__sessionActTriggered">__sessionActTriggered</a></td> +<td>Private slot to handle the menu selection of a session.</td> +</tr><tr> +<td><a href="#SessionManager.__sessionDirectoryChanged">__sessionDirectoryChanged</a></td> +<td>Private slot handling changes of the sessions directory.</td> +</tr><tr> +<td><a href="#SessionManager.aboutToShowSessionsMenu">aboutToShowSessionsMenu</a></td> +<td>Public slot to populate the sessions selection menu.</td> +</tr><tr> +<td><a href="#SessionManager.activateTimer">activateTimer</a></td> +<td>Public method to activate the session save timer.</td> +</tr><tr> +<td><a href="#SessionManager.autoSaveSession">autoSaveSession</a></td> +<td>Public method to save the current session state.</td> +</tr><tr> +<td><a href="#SessionManager.cloneSession">cloneSession</a></td> +<td>Public method to clone a session.</td> +</tr><tr> +<td><a href="#SessionManager.defaultSessionFile">defaultSessionFile</a></td> +<td>Public method to get the name of the default session file.</td> +</tr><tr> +<td><a href="#SessionManager.deleteSession">deleteSession</a></td> +<td>Public method to delete a session.</td> +</tr><tr> +<td><a href="#SessionManager.getSessionsDirectory">getSessionsDirectory</a></td> +<td>Public method to get the directory sessions are stored in.</td> +</tr><tr> +<td><a href="#SessionManager.lastActiveSessionFile">lastActiveSessionFile</a></td> +<td>Public method to get the name of the last active session file.</td> +</tr><tr> +<td><a href="#SessionManager.newSession">newSession</a></td> +<td>Public method to start a new session.</td> +</tr><tr> +<td><a href="#SessionManager.openSession">openSession</a></td> +<td>Public method to open a session from a given session file.</td> +</tr><tr> +<td><a href="#SessionManager.preferencesChanged">preferencesChanged</a></td> +<td>Public slot to react upon changes of the settings.</td> +</tr><tr> +<td><a href="#SessionManager.renameSession">renameSession</a></td> +<td>Public method to rename or clone a session.</td> +</tr><tr> +<td><a href="#SessionManager.replaceSession">replaceSession</a></td> +<td>Public method to replace the current session with the given one.</td> +</tr><tr> +<td><a href="#SessionManager.saveSession">saveSession</a></td> +<td>Public method to save the current session.</td> +</tr><tr> +<td><a href="#SessionManager.selectSession">selectSession</a></td> +<td>Public method to select a session to be restored.</td> +</tr><tr> +<td><a href="#SessionManager.sessionMetaData">sessionMetaData</a></td> +<td>Public method to get the sessions meta data.</td> +</tr><tr> +<td><a href="#SessionManager.showSessionManagerDialog">showSessionManagerDialog</a></td> +<td>Public method to show the session manager dialog.</td> +</tr><tr> +<td><a href="#SessionManager.shutdown">shutdown</a></td> +<td>Public method to perform any shutdown actions.</td> +</tr><tr> +<td><a href="#SessionManager.switchToSession">switchToSession</a></td> +<td>Public method to switch the current session to the given one.</td> +</tr><tr> +<td><a href="#SessionManager.writeCurrentSession">writeCurrentSession</a></td> +<td>Public method to write the current session to the given file name.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="SessionManager.isValidSession" ID="SessionManager.isValidSession"></a> +<h4>SessionManager.isValidSession (class method)</h4> +<b>isValidSession</b>(<i>session</i>) +<p> + Class method to check the validity of a session. +</p><dl> +<dt><i>session</i> (dict)</dt> +<dd> +dictionary containing the session data +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating validity +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SessionManager.readSessionFromFile" ID="SessionManager.readSessionFromFile"></a> +<h4>SessionManager.readSessionFromFile (class method)</h4> +<b>readSessionFromFile</b>(<i>sessionFileName</i>) +<p> + Class method to read the session data from a file. +</p><dl> +<dt><i>sessionFileName</i> (str)</dt> +<dd> +file name of the session file +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +dictionary containing the session data +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +dict +</dd> +</dl><a NAME="SessionManager.restoreSessionFromData" ID="SessionManager.restoreSessionFromData"></a> +<h4>SessionManager.restoreSessionFromData (class method)</h4> +<b>restoreSessionFromData</b>(<i>window=None, sessionData=None</i>) +<p> + Class method to restore a session from a session data dictionary. +</p><dl> +<dt><i>window</i> (WebBrowserWindow)</dt> +<dd> +reference to main window to restore to +</dd><dt><i>sessionData</i></dt> +<dd> +dictionary containing the session data +</dd> +</dl><a NAME="SessionManager.__init__" ID="SessionManager.__init__"></a> +<h4>SessionManager (Constructor)</h4> +<b>SessionManager</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i> (QObject)</dt> +<dd> +reference to the parent object +</dd> +</dl><a NAME="SessionManager.__autoSaveSession" ID="SessionManager.__autoSaveSession"></a> +<h4>SessionManager.__autoSaveSession</h4> +<b>__autoSaveSession</b>(<i>startTimer=True</i>) +<p> + Private slot to save the current session state. +</p><dl> +<dt><i>startTimer</i> (bool)</dt> +<dd> +flag indicating to restart the timer +</dd> +</dl><a NAME="SessionManager.__backupSavedSession" ID="SessionManager.__backupSavedSession"></a> +<h4>SessionManager.__backupSavedSession</h4> +<b>__backupSavedSession</b>(<i></i>) +<p> + Private method to backup the most recently saved session. +</p><a NAME="SessionManager.__fillMetaDataList" ID="SessionManager.__fillMetaDataList"></a> +<h4>SessionManager.__fillMetaDataList</h4> +<b>__fillMetaDataList</b>(<i></i>) +<p> + Private method to fill the sessions meta data list. +</p><p> + The sessions meta data list is only populated, if the variable holding + it is empty (i.e. it is populated on demand). +</p><a NAME="SessionManager.__initSessionSaveTimer" ID="SessionManager.__initSessionSaveTimer"></a> +<h4>SessionManager.__initSessionSaveTimer</h4> +<b>__initSessionSaveTimer</b>(<i></i>) +<p> + Private slot to initialize the auto save timer. +</p><a NAME="SessionManager.__isActive" ID="SessionManager.__isActive"></a> +<h4>SessionManager.__isActive</h4> +<b>__isActive</b>(<i>filePath</i>) +<p> + Private method to check, if a given file is the active one. +</p><dl> +<dt><i>filePath</i> (str or QFileInfo)</dt> +<dd> +path of the session file to be checked +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating the active file +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SessionManager.__sessionActTriggered" ID="SessionManager.__sessionActTriggered"></a> +<h4>SessionManager.__sessionActTriggered</h4> +<b>__sessionActTriggered</b>(<i></i>) +<p> + Private slot to handle the menu selection of a session. +</p><a NAME="SessionManager.__sessionDirectoryChanged" ID="SessionManager.__sessionDirectoryChanged"></a> +<h4>SessionManager.__sessionDirectoryChanged</h4> +<b>__sessionDirectoryChanged</b>(<i></i>) +<p> + Private slot handling changes of the sessions directory. +</p><a NAME="SessionManager.aboutToShowSessionsMenu" ID="SessionManager.aboutToShowSessionsMenu"></a> +<h4>SessionManager.aboutToShowSessionsMenu</h4> +<b>aboutToShowSessionsMenu</b>(<i></i>) +<p> + Public slot to populate the sessions selection menu. +</p><a NAME="SessionManager.activateTimer" ID="SessionManager.activateTimer"></a> +<h4>SessionManager.activateTimer</h4> +<b>activateTimer</b>(<i></i>) +<p> + Public method to activate the session save timer. +</p><a NAME="SessionManager.autoSaveSession" ID="SessionManager.autoSaveSession"></a> +<h4>SessionManager.autoSaveSession</h4> +<b>autoSaveSession</b>(<i></i>) +<p> + Public method to save the current session state. +</p><a NAME="SessionManager.cloneSession" ID="SessionManager.cloneSession"></a> +<h4>SessionManager.cloneSession</h4> +<b>cloneSession</b>(<i>sessionFilePath</i>) +<p> + Public method to clone a session. +</p><dl> +<dt><i>sessionFilePath</i> (str)</dt> +<dd> +file name of the session file to be cloned +</dd> +</dl><a NAME="SessionManager.defaultSessionFile" ID="SessionManager.defaultSessionFile"></a> +<h4>SessionManager.defaultSessionFile</h4> +<b>defaultSessionFile</b>(<i></i>) +<p> + Public method to get the name of the default session file. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the default session file +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="SessionManager.deleteSession" ID="SessionManager.deleteSession"></a> +<h4>SessionManager.deleteSession</h4> +<b>deleteSession</b>(<i>sessionFilePath</i>) +<p> + Public method to delete a session. +</p><dl> +<dt><i>sessionFilePath</i> (str)</dt> +<dd> +file name of the session file to be deleted +</dd> +</dl><a NAME="SessionManager.getSessionsDirectory" ID="SessionManager.getSessionsDirectory"></a> +<h4>SessionManager.getSessionsDirectory</h4> +<b>getSessionsDirectory</b>(<i></i>) +<p> + Public method to get the directory sessions are stored in. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the sessions directory +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="SessionManager.lastActiveSessionFile" ID="SessionManager.lastActiveSessionFile"></a> +<h4>SessionManager.lastActiveSessionFile</h4> +<b>lastActiveSessionFile</b>(<i></i>) +<p> + Public method to get the name of the last active session file. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the last active session file +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="SessionManager.newSession" ID="SessionManager.newSession"></a> +<h4>SessionManager.newSession</h4> +<b>newSession</b>(<i></i>) +<p> + Public method to start a new session. +</p><a NAME="SessionManager.openSession" ID="SessionManager.openSession"></a> +<h4>SessionManager.openSession</h4> +<b>openSession</b>(<i>sessionFilePath, flags=0</i>) +<p> + Public method to open a session from a given session file. +</p><dl> +<dt><i>sessionFilePath</i> (str)</dt> +<dd> +name of the session file to get session from +</dd><dt><i>flags</i> (int)</dt> +<dd> +flags determining the open mode +</dd> +</dl><a NAME="SessionManager.preferencesChanged" ID="SessionManager.preferencesChanged"></a> +<h4>SessionManager.preferencesChanged</h4> +<b>preferencesChanged</b>(<i></i>) +<p> + Public slot to react upon changes of the settings. +</p><a NAME="SessionManager.renameSession" ID="SessionManager.renameSession"></a> +<h4>SessionManager.renameSession</h4> +<b>renameSession</b>(<i>sessionFilePath, flags=0</i>) +<p> + Public method to rename or clone a session. +</p><dl> +<dt><i>sessionFilePath</i> (str)</dt> +<dd> +name of the session file +</dd><dt><i>flags</i> (int)</dt> +<dd> +flags determining a rename or clone operation +</dd> +</dl><a NAME="SessionManager.replaceSession" ID="SessionManager.replaceSession"></a> +<h4>SessionManager.replaceSession</h4> +<b>replaceSession</b>(<i>sessionFilePath</i>) +<p> + Public method to replace the current session with the given one. +</p><dl> +<dt><i>sessionFilePath</i> (str)</dt> +<dd> +file name of the session file to replace with +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SessionManager.saveSession" ID="SessionManager.saveSession"></a> +<h4>SessionManager.saveSession</h4> +<b>saveSession</b>(<i></i>) +<p> + Public method to save the current session. +</p><a NAME="SessionManager.selectSession" ID="SessionManager.selectSession"></a> +<h4>SessionManager.selectSession</h4> +<b>selectSession</b>(<i></i>) +<p> + Public method to select a session to be restored. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the session file to be restored +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="SessionManager.sessionMetaData" ID="SessionManager.sessionMetaData"></a> +<h4>SessionManager.sessionMetaData</h4> +<b>sessionMetaData</b>(<i>includeBackups=False</i>) +<p> + Public method to get the sessions meta data. +</p><dl> +<dt><i>includeBackups</i> (bool)</dt> +<dd> +flag indicating to include backup sessions +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of session meta data +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of SessionMetaData +</dd> +</dl><a NAME="SessionManager.showSessionManagerDialog" ID="SessionManager.showSessionManagerDialog"></a> +<h4>SessionManager.showSessionManagerDialog</h4> +<b>showSessionManagerDialog</b>(<i></i>) +<p> + Public method to show the session manager dialog. +</p><a NAME="SessionManager.shutdown" ID="SessionManager.shutdown"></a> +<h4>SessionManager.shutdown</h4> +<b>shutdown</b>(<i></i>) +<p> + Public method to perform any shutdown actions. +</p><a NAME="SessionManager.switchToSession" ID="SessionManager.switchToSession"></a> +<h4>SessionManager.switchToSession</h4> +<b>switchToSession</b>(<i>sessionFilePath</i>) +<p> + Public method to switch the current session to the given one. +</p><dl> +<dt><i>sessionFilePath</i> (str)</dt> +<dd> +file name of the session file to switch to +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SessionManager.writeCurrentSession" ID="SessionManager.writeCurrentSession"></a> +<h4>SessionManager.writeCurrentSession</h4> +<b>writeCurrentSession</b>(<i>sessionFileName</i>) +<p> + Public method to write the current session to the given file name. +</p><dl> +<dt><i>sessionFileName</i> (str)</dt> +<dd> +file name of the session +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="SessionMetaData" ID="SessionMetaData"></a> +<h2>SessionMetaData</h2> +<p> + Class implementing a data structure to store meta data for a session. +</p> +<h3>Derived from</h3> +object +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#SessionMetaData.__init__">SessionMetaData</a></td> +<td>Constructor</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="SessionMetaData.__init__" ID="SessionMetaData.__init__"></a> +<h4>SessionMetaData (Constructor)</h4> +<b>SessionMetaData</b>(<i></i>) +<p> + Constructor +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.WebBrowser.Session.SessionManagerDialog.html Wed Jul 05 19:58:40 2017 +0200 @@ -0,0 +1,184 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.WebBrowser.Session.SessionManagerDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.WebBrowser.Session.SessionManagerDialog</h1> +<p> +Module implementing a dialog to manage sessions. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#SessionManagerDialog">SessionManagerDialog</a></td> +<td>Class documentation goes here.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="SessionManagerDialog" ID="SessionManagerDialog"></a> +<h2>SessionManagerDialog</h2> +<p> + Class documentation goes here. +</p> +<h3>Derived from</h3> +QDialog, Ui_SessionManagerDialog +<h3>Class Attributes</h3> +<table> +<tr><td>ActiveSessionRole</td></tr><tr><td>BackupSessionRole</td></tr><tr><td>DefaultSessionRole</td></tr><tr><td>SessionFileRole</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#SessionManagerDialog.__init__">SessionManagerDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__cloneSession">__cloneSession</a></td> +<td>Private slot to clone the selected session.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__deleteSession">__deleteSession</a></td> +<td>Private slot to delete the selected session.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__newSession">__newSession</a></td> +<td>Private slot to create a new session.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__refresh">__refresh</a></td> +<td>Private slot to refresh the list of sessions.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__renameSession">__renameSession</a></td> +<td>Private slot to rename the selected session.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__resizeViewHeader">__resizeViewHeader</a></td> +<td>Private method to resize the session column of the list.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__switchToSession">__switchToSession</a></td> +<td>Private slot to switch to the selected session.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__updateButtons">__updateButtons</a></td> +<td>Private method to update the button state.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.__updateSessionItem">__updateSessionItem</a></td> +<td>Private method to set various item properties.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.resizeEvent">resizeEvent</a></td> +<td>Protected method handling the dialog being resized.</td> +</tr><tr> +<td><a href="#SessionManagerDialog.showEvent">showEvent</a></td> +<td>Protected method handling the dialog being shown.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="SessionManagerDialog.__init__" ID="SessionManagerDialog.__init__"></a> +<h4>SessionManagerDialog (Constructor)</h4> +<b>SessionManagerDialog</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="SessionManagerDialog.__cloneSession" ID="SessionManagerDialog.__cloneSession"></a> +<h4>SessionManagerDialog.__cloneSession</h4> +<b>__cloneSession</b>(<i></i>) +<p> + Private slot to clone the selected session. +</p><a NAME="SessionManagerDialog.__deleteSession" ID="SessionManagerDialog.__deleteSession"></a> +<h4>SessionManagerDialog.__deleteSession</h4> +<b>__deleteSession</b>(<i></i>) +<p> + Private slot to delete the selected session. +</p><a NAME="SessionManagerDialog.__newSession" ID="SessionManagerDialog.__newSession"></a> +<h4>SessionManagerDialog.__newSession</h4> +<b>__newSession</b>(<i></i>) +<p> + Private slot to create a new session. +</p><a NAME="SessionManagerDialog.__refresh" ID="SessionManagerDialog.__refresh"></a> +<h4>SessionManagerDialog.__refresh</h4> +<b>__refresh</b>(<i></i>) +<p> + Private slot to refresh the list of sessions. +</p><a NAME="SessionManagerDialog.__renameSession" ID="SessionManagerDialog.__renameSession"></a> +<h4>SessionManagerDialog.__renameSession</h4> +<b>__renameSession</b>(<i></i>) +<p> + Private slot to rename the selected session. +</p><a NAME="SessionManagerDialog.__resizeViewHeader" ID="SessionManagerDialog.__resizeViewHeader"></a> +<h4>SessionManagerDialog.__resizeViewHeader</h4> +<b>__resizeViewHeader</b>(<i></i>) +<p> + Private method to resize the session column of the list. +</p><a NAME="SessionManagerDialog.__switchToSession" ID="SessionManagerDialog.__switchToSession"></a> +<h4>SessionManagerDialog.__switchToSession</h4> +<b>__switchToSession</b>(<i></i>) +<p> + Private slot to switch to the selected session. +</p><a NAME="SessionManagerDialog.__updateButtons" ID="SessionManagerDialog.__updateButtons"></a> +<h4>SessionManagerDialog.__updateButtons</h4> +<b>__updateButtons</b>(<i></i>) +<p> + Private method to update the button state. +</p><a NAME="SessionManagerDialog.__updateSessionItem" ID="SessionManagerDialog.__updateSessionItem"></a> +<h4>SessionManagerDialog.__updateSessionItem</h4> +<b>__updateSessionItem</b>(<i>itm</i>) +<p> + Private method to set various item properties. +</p><dl> +<dt><i>itm</i> (QTreeWidgetItem)</dt> +<dd> +reference to the item to be updated +</dd> +</dl><a NAME="SessionManagerDialog.resizeEvent" ID="SessionManagerDialog.resizeEvent"></a> +<h4>SessionManagerDialog.resizeEvent</h4> +<b>resizeEvent</b>(<i>evt</i>) +<p> + Protected method handling the dialog being resized. +</p><dl> +<dt><i>evt</i> (QResizeEvent)</dt> +<dd> +reference to the event object +</dd> +</dl><a NAME="SessionManagerDialog.showEvent" ID="SessionManagerDialog.showEvent"></a> +<h4>SessionManagerDialog.showEvent</h4> +<b>showEvent</b>(<i>evt</i>) +<p> + Protected method handling the dialog being shown. +</p><dl> +<dt><i>evt</i> (QShowEvent)</dt> +<dd> +reference to the event object +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html Wed Jul 05 19:57:39 2017 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html Wed Jul 05 19:58:40 2017 +0200 @@ -120,6 +120,12 @@ <td><a href="#WebBrowserPage.scroll">scroll</a></td> <td>Public method to scroll by the given amount of pixels.</td> </tr><tr> +<td><a href="#WebBrowserPage.scrollPosition">scrollPosition</a></td> +<td>Public method to get the scroll position of the web page.</td> +</tr><tr> +<td><a href="#WebBrowserPage.scrollTo">scrollTo</a></td> +<td>Public method to scroll to the given position.</td> +</tr><tr> <td><a href="#WebBrowserPage.setJavaScriptEnabled">setJavaScriptEnabled</a></td> <td>Public method to enable JavaScript.</td> </tr> @@ -438,6 +444,31 @@ <dd> vertical scroll value </dd> +</dl><a NAME="WebBrowserPage.scrollPosition" ID="WebBrowserPage.scrollPosition"></a> +<h4>WebBrowserPage.scrollPosition</h4> +<b>scrollPosition</b>(<i></i>) +<p> + Public method to get the scroll position of the web page. +</p><dl> +<dt>Returns:</dt> +<dd> +scroll position +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QPointF +</dd> +</dl><a NAME="WebBrowserPage.scrollTo" ID="WebBrowserPage.scrollTo"></a> +<h4>WebBrowserPage.scrollTo</h4> +<b>scrollTo</b>(<i>pos</i>) +<p> + Public method to scroll to the given position. +</p><dl> +<dt><i>pos</i> (QPointF)</dt> +<dd> +position to scroll to +</dd> </dl><a NAME="WebBrowserPage.setJavaScriptEnabled" ID="WebBrowserPage.setJavaScriptEnabled"></a> <h4>WebBrowserPage.setJavaScriptEnabled</h4> <b>setJavaScriptEnabled</b>(<i>enable</i>)
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserTabWidget.html Wed Jul 05 19:57:39 2017 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserTabWidget.html Wed Jul 05 19:58:40 2017 +0200 @@ -212,9 +212,15 @@ <td><a href="#WebBrowserTabWidget.currentUrlBar">currentUrlBar</a></td> <td>Public method to get a reference to the current url bar.</td> </tr><tr> +<td><a href="#WebBrowserTabWidget.getSessionData">getSessionData</a></td> +<td>Public method to populate the session data.</td> +</tr><tr> <td><a href="#WebBrowserTabWidget.getSourceFileList">getSourceFileList</a></td> <td>Public method to get a list of all opened Qt help files.</td> </tr><tr> +<td><a href="#WebBrowserTabWidget.loadFromSessionData">loadFromSessionData</a></td> +<td>Public method to load the session data.</td> +</tr><tr> <td><a href="#WebBrowserTabWidget.newBrowser">newBrowser</a></td> <td>Public method to create a new web browser tab.</td> </tr><tr> @@ -611,6 +617,21 @@ <dd> reference to the current url bar (UrlBar) </dd> +</dl><a NAME="WebBrowserTabWidget.getSessionData" ID="WebBrowserTabWidget.getSessionData"></a> +<h4>WebBrowserTabWidget.getSessionData</h4> +<b>getSessionData</b>(<i></i>) +<p> + Public method to populate the session data. +</p><dl> +<dt>Returns:</dt> +<dd> +dictionary containing the session data +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +dict +</dd> </dl><a NAME="WebBrowserTabWidget.getSourceFileList" ID="WebBrowserTabWidget.getSourceFileList"></a> <h4>WebBrowserTabWidget.getSourceFileList</h4> <b>getSourceFileList</b>(<i></i>) @@ -621,23 +642,37 @@ <dd> dictionary with tab id as key and host/namespace as value </dd> +</dl><a NAME="WebBrowserTabWidget.loadFromSessionData" ID="WebBrowserTabWidget.loadFromSessionData"></a> +<h4>WebBrowserTabWidget.loadFromSessionData</h4> +<b>loadFromSessionData</b>(<i>sessionData</i>) +<p> + Public method to load the session data. +</p><dl> +<dt><i>sessionData</i> (dict)</dt> +<dd> +dictionary containing the session data as + generated by getSessionData() +</dd> </dl><a NAME="WebBrowserTabWidget.newBrowser" ID="WebBrowserTabWidget.newBrowser"></a> <h4>WebBrowserTabWidget.newBrowser</h4> -<b>newBrowser</b>(<i>link=None, position=-1, background=False</i>) +<b>newBrowser</b>(<i>link=None, position=-1, background=False, restoreSession=False</i>) <p> Public method to create a new web browser tab. </p><dl> -<dt><i>link</i></dt> +<dt><i>link</i> (str or QUrl)</dt> <dd> -link to be shown (string or QUrl) -</dd><dt><i>position=</i></dt> +link to be shown +</dd><dt><i>position=</i> (int)</dt> <dd> position to create the new tab at or -1 to add it - to the end (integer) -</dd><dt><i>background=</i></dt> + to the end +</dd><dt><i>background=</i> (bool)</dt> <dd> flag indicating to open the tab in the - background (bool) + background +</dd><dt><i>restoreSession=</i> (bool)</dt> +<dd> +flag indicating a restore session action </dd> </dl><dl> <dt>Returns:</dt>
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Wed Jul 05 19:57:39 2017 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Wed Jul 05 19:58:40 2017 +0200 @@ -219,6 +219,9 @@ <td><a href="#WebBrowserView.__setRwhvqt">__setRwhvqt</a></td> <td>Private slot to set widget that receives input events.</td> </tr><tr> +<td><a href="#WebBrowserView.__showEventSlot">__showEventSlot</a></td> +<td>Private slot to perform actions when the view is shown and the event loop is running.</td> +</tr><tr> <td><a href="#WebBrowserView.__showTabCrashPage">__showTabCrashPage</a></td> <td>Private slot to show the tab crash page.</td> </tr><tr> @@ -255,6 +258,9 @@ <td><a href="#WebBrowserView._wheelEvent">_wheelEvent</a></td> <td>Protected method to handle wheel events.</td> </tr><tr> +<td><a href="#WebBrowserView.activateSession">activateSession</a></td> +<td>Private slot to activate a restored session.</td> +</tr><tr> <td><a href="#WebBrowserView.addBookmark">addBookmark</a></td> <td>Public slot to bookmark the current page.</td> </tr><tr> @@ -300,6 +306,9 @@ <td><a href="#WebBrowserView.eventFilter">eventFilter</a></td> <td>Public method to process event for other objects.</td> </tr><tr> +<td><a href="#WebBrowserView.extractSessionMetaData">extractSessionMetaData</a></td> +<td>Public method to extract some session meta data elements needed by the tab widget in case of deferred loading.</td> +</tr><tr> <td><a href="#WebBrowserView.findNextPrev">findNextPrev</a></td> <td>Public slot to find the next occurrence of a text.</td> </tr><tr> @@ -312,6 +321,9 @@ <td><a href="#WebBrowserView.getRSS">getRSS</a></td> <td>Public method to get the extracted RSS feeds.</td> </tr><tr> +<td><a href="#WebBrowserView.getSessionData">getSessionData</a></td> +<td>Public method to populate the session data.</td> +</tr><tr> <td><a href="#WebBrowserView.hasRSS">hasRSS</a></td> <td>Public method to check, if the loaded page has RSS links.</td> </tr><tr> @@ -342,6 +354,9 @@ <td><a href="#WebBrowserView.load">load</a></td> <td>Public method to load a web site.</td> </tr><tr> +<td><a href="#WebBrowserView.loadFromSessionData">loadFromSessionData</a></td> +<td>Public method to load the session data.</td> +</tr><tr> <td><a href="#WebBrowserView.mainWindow">mainWindow</a></td> <td>Public method to get a reference to the main window.</td> </tr><tr> @@ -381,9 +396,15 @@ <td><a href="#WebBrowserView.setZoomValue">setZoomValue</a></td> <td>Public method to set the zoom value.</td> </tr><tr> +<td><a href="#WebBrowserView.showEvent">showEvent</a></td> +<td>Protected method to handle show events.</td> +</tr><tr> <td><a href="#WebBrowserView.source">source</a></td> <td>Public method to return the URL of the loaded page.</td> </tr><tr> +<td><a href="#WebBrowserView.storeSessionData">storeSessionData</a></td> +<td>Public method to store session data to be restored later on.</td> +</tr><tr> <td><a href="#WebBrowserView.undo">undo</a></td> <td>Public slot to undo the last edit action.</td> </tr><tr> @@ -792,6 +813,12 @@ <b>__setRwhvqt</b>(<i></i>) <p> Private slot to set widget that receives input events. +</p><a NAME="WebBrowserView.__showEventSlot" ID="WebBrowserView.__showEventSlot"></a> +<h4>WebBrowserView.__showEventSlot</h4> +<b>__showEventSlot</b>(<i></i>) +<p> + Private slot to perform actions when the view is shown and the event + loop is running. </p><a NAME="WebBrowserView.__showTabCrashPage" ID="WebBrowserView.__showTabCrashPage"></a> <h4>WebBrowserView.__showTabCrashPage</h4> <b>__showTabCrashPage</b>(<i>status</i>) @@ -905,7 +932,12 @@ <dd> reference to the wheel event (QWheelEvent) </dd> -</dl><a NAME="WebBrowserView.addBookmark" ID="WebBrowserView.addBookmark"></a> +</dl><a NAME="WebBrowserView.activateSession" ID="WebBrowserView.activateSession"></a> +<h4>WebBrowserView.activateSession</h4> +<b>activateSession</b>(<i></i>) +<p> + Private slot to activate a restored session. +</p><a NAME="WebBrowserView.addBookmark" ID="WebBrowserView.addBookmark"></a> <h4>WebBrowserView.addBookmark</h4> <b>addBookmark</b>(<i></i>) <p> @@ -1052,6 +1084,28 @@ <dd> bool </dd> +</dl><a NAME="WebBrowserView.extractSessionMetaData" ID="WebBrowserView.extractSessionMetaData"></a> +<h4>WebBrowserView.extractSessionMetaData</h4> +<b>extractSessionMetaData</b>(<i>sessionData</i>) +<p> + Public method to extract some session meta data elements needed by the + tab widget in case of deferred loading. +</p><dl> +<dt><i>sessionData</i> (dict)</dt> +<dd> +dictionary containing the session data as + generated by getSessionData() +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple containing the title, URL and web icon +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str, QIcon) +</dd> </dl><a NAME="WebBrowserView.findNextPrev" ID="WebBrowserView.findNextPrev"></a> <h4>WebBrowserView.findNextPrev</h4> <b>findNextPrev</b>(<i>txt, case, backwards, callback</i>) @@ -1101,6 +1155,21 @@ <dd> list of RSS feeds (list of tuples of two strings) </dd> +</dl><a NAME="WebBrowserView.getSessionData" ID="WebBrowserView.getSessionData"></a> +<h4>WebBrowserView.getSessionData</h4> +<b>getSessionData</b>(<i></i>) +<p> + Public method to populate the session data. +</p><dl> +<dt>Returns:</dt> +<dd> +dictionary containing the session data +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +dict +</dd> </dl><a NAME="WebBrowserView.hasRSS" ID="WebBrowserView.hasRSS"></a> <h4>WebBrowserView.hasRSS</h4> <b>hasRSS</b>(<i></i>) @@ -1211,6 +1280,17 @@ <dd> URL to be loaded </dd> +</dl><a NAME="WebBrowserView.loadFromSessionData" ID="WebBrowserView.loadFromSessionData"></a> +<h4>WebBrowserView.loadFromSessionData</h4> +<b>loadFromSessionData</b>(<i>sessionData</i>) +<p> + Public method to load the session data. +</p><dl> +<dt><i>sessionData</i> (dict)</dt> +<dd> +dictionary containing the session data as + generated by getSessionData() +</dd> </dl><a NAME="WebBrowserView.mainWindow" ID="WebBrowserView.mainWindow"></a> <h4>WebBrowserView.mainWindow</h4> <b>mainWindow</b>(<i></i>) @@ -1328,6 +1408,16 @@ flag indicating to save the zoom value with the zoom manager </dd> +</dl><a NAME="WebBrowserView.showEvent" ID="WebBrowserView.showEvent"></a> +<h4>WebBrowserView.showEvent</h4> +<b>showEvent</b>(<i>evt</i>) +<p> + Protected method to handle show events. +</p><dl> +<dt><i>evt</i> (QShowEvent)</dt> +<dd> +reference to the show event object +</dd> </dl><a NAME="WebBrowserView.source" ID="WebBrowserView.source"></a> <h4>WebBrowserView.source</h4> <b>source</b>(<i></i>) @@ -1338,6 +1428,16 @@ <dd> URL loaded in the help browser (QUrl) </dd> +</dl><a NAME="WebBrowserView.storeSessionData" ID="WebBrowserView.storeSessionData"></a> +<h4>WebBrowserView.storeSessionData</h4> +<b>storeSessionData</b>(<i>data</i>) +<p> + Public method to store session data to be restored later on. +</p><dl> +<dt><i>data</i> (dict)</dt> +<dd> +dictionary with session data to be restored +</dd> </dl><a NAME="WebBrowserView.undo" ID="WebBrowserView.undo"></a> <h4>WebBrowserView.undo</h4> <b>undo</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html Wed Jul 05 19:57:39 2017 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html Wed Jul 05 19:58:40 2017 +0200 @@ -67,7 +67,7 @@ E5MainWindow <h3>Class Attributes</h3> <table> -<tr><td>BrowserWindows</td></tr><tr><td>_adblockManager</td></tr><tr><td>_autoScroller</td></tr><tr><td>_bookmarksManager</td></tr><tr><td>_cookieJar</td></tr><tr><td>_downloadManager</td></tr><tr><td>_featurePermissionManager</td></tr><tr><td>_feedsManager</td></tr><tr><td>_flashCookieManager</td></tr><tr><td>_fromEric</td></tr><tr><td>_greaseMonkeyManager</td></tr><tr><td>_helpEngine</td></tr><tr><td>_historyManager</td></tr><tr><td>_imageSearchEngine</td></tr><tr><td>_isPrivate</td></tr><tr><td>_networkManager</td></tr><tr><td>_notification</td></tr><tr><td>_passwordManager</td></tr><tr><td>_personalInformationManager</td></tr><tr><td>_speedDial</td></tr><tr><td>_syncManager</td></tr><tr><td>_tabManager</td></tr><tr><td>_useQtHelp</td></tr><tr><td>_userAgentsManager</td></tr><tr><td>_webProfile</td></tr> +<tr><td>BrowserWindows</td></tr><tr><td>_adblockManager</td></tr><tr><td>_autoScroller</td></tr><tr><td>_bookmarksManager</td></tr><tr><td>_cookieJar</td></tr><tr><td>_downloadManager</td></tr><tr><td>_featurePermissionManager</td></tr><tr><td>_feedsManager</td></tr><tr><td>_flashCookieManager</td></tr><tr><td>_fromEric</td></tr><tr><td>_greaseMonkeyManager</td></tr><tr><td>_helpEngine</td></tr><tr><td>_historyManager</td></tr><tr><td>_imageSearchEngine</td></tr><tr><td>_isPrivate</td></tr><tr><td>_lastActiveWindow</td></tr><tr><td>_networkManager</td></tr><tr><td>_notification</td></tr><tr><td>_passwordManager</td></tr><tr><td>_performingShutdown</td></tr><tr><td>_performingStartup</td></tr><tr><td>_personalInformationManager</td></tr><tr><td>_sessionManager</td></tr><tr><td>_speedDial</td></tr><tr><td>_syncManager</td></tr><tr><td>_tabManager</td></tr><tr><td>_useQtHelp</td></tr><tr><td>_userAgentsManager</td></tr><tr><td>_webProfile</td></tr> </table> <h3>Class Methods</h3> <table> @@ -102,6 +102,9 @@ <td><a href="#WebBrowserWindow.getQtHelpCollectionFileName">getQtHelpCollectionFileName</a></td> <td>Class method to determine the name of the QtHelp collection file.</td> </tr><tr> +<td><a href="#WebBrowserWindow.getWindow">getWindow</a></td> +<td>Class method to get a reference to the most recent active web browser window.</td> +</tr><tr> <td><a href="#WebBrowserWindow.greaseMonkeyManager">greaseMonkeyManager</a></td> <td>Class method to get a reference to the GreaseMonkey manager.</td> </tr><tr> @@ -138,6 +141,9 @@ <td><a href="#WebBrowserWindow.personalInformationManager">personalInformationManager</a></td> <td>Class method to get a reference to the personal information manager.</td> </tr><tr> +<td><a href="#WebBrowserWindow.sessionManager">sessionManager</a></td> +<td>Class method to get a reference to the session manager.</td> +</tr><tr> <td><a href="#WebBrowserWindow.setUseQtHelp">setUseQtHelp</a></td> <td>Class method to set the QtHelp usage.</td> </tr><tr> @@ -211,9 +217,6 @@ <td><a href="#WebBrowserWindow.__clearPrivateData">__clearPrivateData</a></td> <td>Private slot to clear the private data.</td> </tr><tr> -<td><a href="#WebBrowserWindow.__closeAllWindows">__closeAllWindows</a></td> -<td>Private slot to close all windows.</td> -</tr><tr> <td><a href="#WebBrowserWindow.__copy">__copy</a></td> <td>Private slot called to handle the copy action.</td> </tr><tr> @@ -355,6 +358,9 @@ <td><a href="#WebBrowserWindow.__setupFilterCombo">__setupFilterCombo</a></td> <td>Private slot to setup the filter combo box.</td> </tr><tr> +<td><a href="#WebBrowserWindow.__shallShutDown">__shallShutDown</a></td> +<td>Private method to check, if the application should be shut down.</td> +</tr><tr> <td><a href="#WebBrowserWindow.__showAcceptedLanguages">__showAcceptedLanguages</a></td> <td>Private slot to configure the accepted languages for web pages.</td> </tr><tr> @@ -412,6 +418,9 @@ <td><a href="#WebBrowserWindow.__showSearchWindow">__showSearchWindow</a></td> <td>Private method to show the search window.</td> </tr><tr> +<td><a href="#WebBrowserWindow.__showSessionManagerDialog">__showSessionManagerDialog</a></td> +<td>Private slot to show the session manager dialog.</td> +</tr><tr> <td><a href="#WebBrowserWindow.__showSiteinfoDialog">__showSiteinfoDialog</a></td> <td>Private slot to show the site info dialog.</td> </tr><tr> @@ -436,6 +445,9 @@ <td><a href="#WebBrowserWindow.__showZoomValuesDialog">__showZoomValuesDialog</a></td> <td>Private slot to show the zoom values management dialog.</td> </tr><tr> +<td><a href="#WebBrowserWindow.__shutdownWindow">__shutdownWindow</a></td> +<td>Private method to shut down a web browser window.</td> +</tr><tr> <td><a href="#WebBrowserWindow.__stopLoading">__stopLoading</a></td> <td>Private slot called to handle loading of the current page.</td> </tr><tr> @@ -526,6 +538,9 @@ <td><a href="#WebBrowserWindow.eventMouseButtons">eventMouseButtons</a></td> <td>Public method to get the last recorded mouse buttons.</td> </tr><tr> +<td><a href="#WebBrowserWindow.forceClose">forceClose</a></td> +<td>Public method to force closing the window.</td> +</tr><tr> <td><a href="#WebBrowserWindow.fromEric">fromEric</a></td> <td>Public method to check, if the web browser was called from within the eric IDE.</td> </tr><tr> @@ -535,9 +550,6 @@ <td><a href="#WebBrowserWindow.getSourceFileList">getSourceFileList</a></td> <td>Public method to get a list of all opened source files.</td> </tr><tr> -<td><a href="#WebBrowserWindow.getWindow">getWindow</a></td> -<td>Public method to get a reference to the most recent active web browser window.</td> -</tr><tr> <td><a href="#WebBrowserWindow.hideFullScreenNavigation">hideFullScreenNavigation</a></td> <td>Public slot to hide full screen navigation.</td> </tr><tr> @@ -750,6 +762,22 @@ <dd> str </dd> +</dl><a NAME="WebBrowserWindow.getWindow" ID="WebBrowserWindow.getWindow"></a> +<h4>WebBrowserWindow.getWindow (class method)</h4> +<b>getWindow</b>(<i></i>) +<p> + Class method to get a reference to the most recent active + web browser window. +</p><dl> +<dt>Returns:</dt> +<dd> +reference to most recent web browser window +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +WebBrowserWindow +</dd> </dl><a NAME="WebBrowserWindow.greaseMonkeyManager" ID="WebBrowserWindow.greaseMonkeyManager"></a> <h4>WebBrowserWindow.greaseMonkeyManager (class method)</h4> <b>greaseMonkeyManager</b>(<i></i>) @@ -886,6 +914,21 @@ reference to the personal information manager (PersonalInformationManager) </dd> +</dl><a NAME="WebBrowserWindow.sessionManager" ID="WebBrowserWindow.sessionManager"></a> +<h4>WebBrowserWindow.sessionManager (class method)</h4> +<b>sessionManager</b>(<i></i>) +<p> + Class method to get a reference to the session manager. +</p><dl> +<dt>Returns:</dt> +<dd> +reference to the session manager +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +SessionManager +</dd> </dl><a NAME="WebBrowserWindow.setUseQtHelp" ID="WebBrowserWindow.setUseQtHelp"></a> <h4>WebBrowserWindow.setUseQtHelp (class method)</h4> <b>setUseQtHelp</b>(<i>use</i>) @@ -979,42 +1022,45 @@ </dd> </dl><a NAME="WebBrowserWindow.__init__" ID="WebBrowserWindow.__init__"></a> <h4>WebBrowserWindow (Constructor)</h4> -<b>WebBrowserWindow</b>(<i>home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None, private=False, qthelp=False, settingsDir=""</i>) +<b>WebBrowserWindow</b>(<i>home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None, private=False, qthelp=False, settingsDir="", restoreSession=False</i>) <p> Constructor </p><dl> -<dt><i>home</i></dt> +<dt><i>home</i> (str)</dt> <dd> -the URL to be shown (string) -</dd><dt><i>path</i></dt> +the URL to be shown +</dd><dt><i>path</i> (str)</dt> <dd> -the path of the working dir (usually '.') (string) -</dd><dt><i>parent</i></dt> +the path of the working dir (usually '.') +</dd><dt><i>parent</i> (QWidget)</dt> <dd> -parent widget of this window (QWidget) -</dd><dt><i>name</i></dt> +parent widget of this window +</dd><dt><i>name</i> (str)</dt> <dd> -name of this window (string) -</dd><dt><i>fromEric</i></dt> +name of this window +</dd><dt><i>fromEric</i> (bool)</dt> <dd> flag indicating whether it was called from within - eric6 (boolean) -</dd><dt><i>initShortcutsOnly=</i></dt> + eric6 +</dd><dt><i>initShortcutsOnly=</i> (bool)</dt> <dd> flag indicating to just initialize the - keyboard shortcuts (boolean) -</dd><dt><i>searchWord=</i></dt> + keyboard shortcuts +</dd><dt><i>searchWord=</i> (str)</dt> <dd> -word to search for (string) -</dd><dt><i>private=</i></dt> +word to search for +</dd><dt><i>private=</i> (bool)</dt> <dd> -flag indicating a private browsing window (bool) -</dd><dt><i>qthelp=</i></dt> +flag indicating a private browsing window +</dd><dt><i>qthelp=</i> (bool)</dt> <dd> -flag indicating to enable the QtHelp support (bool) -</dd><dt><i>settingsDir=</i></dt> +flag indicating to enable the QtHelp support +</dd><dt><i>settingsDir=</i> (str)</dt> <dd> -directory to be used for the settings files (str) +directory to be used for the settings files +</dd><dt><i>restoreSession=</i> (bool)</dt> +<dd> +flag indicating a restore session action </dd> </dl><a NAME="WebBrowserWindow.__TBMenuTriggered" ID="WebBrowserWindow.__TBMenuTriggered"></a> <h4>WebBrowserWindow.__TBMenuTriggered</h4> @@ -1090,18 +1136,10 @@ Private slot to add a new bookmarks folder. </p><a NAME="WebBrowserWindow.__appFocusChanged" ID="WebBrowserWindow.__appFocusChanged"></a> <h4>WebBrowserWindow.__appFocusChanged</h4> -<b>__appFocusChanged</b>(<i>old, now</i>) +<b>__appFocusChanged</b>(<i></i>) <p> Private slot to handle a change of the focus. -</p><dl> -<dt><i>old</i></dt> -<dd> -reference to the widget, that lost focus (QWidget or None) -</dd><dt><i>now</i></dt> -<dd> -reference to the widget having the focus (QWidget or None) -</dd> -</dl><a NAME="WebBrowserWindow.__backward" ID="WebBrowserWindow.__backward"></a> +</p><a NAME="WebBrowserWindow.__backward" ID="WebBrowserWindow.__backward"></a> <h4>WebBrowserWindow.__backward</h4> <b>__backward</b>(<i></i>) <p> @@ -1135,11 +1173,6 @@ <b>__clearPrivateData</b>(<i></i>) <p> Private slot to clear the private data. -</p><a NAME="WebBrowserWindow.__closeAllWindows" ID="WebBrowserWindow.__closeAllWindows"></a> -<h4>WebBrowserWindow.__closeAllWindows</h4> -<b>__closeAllWindows</b>(<i></i>) -<p> - Private slot to close all windows. </p><a NAME="WebBrowserWindow.__copy" ID="WebBrowserWindow.__copy"></a> <h4>WebBrowserWindow.__copy</h4> <b>__copy</b>(<i></i>) @@ -1470,7 +1503,22 @@ <b>__setupFilterCombo</b>(<i></i>) <p> Private slot to setup the filter combo box. -</p><a NAME="WebBrowserWindow.__showAcceptedLanguages" ID="WebBrowserWindow.__showAcceptedLanguages"></a> +</p><a NAME="WebBrowserWindow.__shallShutDown" ID="WebBrowserWindow.__shallShutDown"></a> +<h4>WebBrowserWindow.__shallShutDown</h4> +<b>__shallShutDown</b>(<i></i>) +<p> + Private method to check, if the application should be shut down. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating a shut down +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="WebBrowserWindow.__showAcceptedLanguages" ID="WebBrowserWindow.__showAcceptedLanguages"></a> <h4>WebBrowserWindow.__showAcceptedLanguages</h4> <b>__showAcceptedLanguages</b>(<i></i>) <p> @@ -1575,6 +1623,11 @@ <b>__showSearchWindow</b>(<i></i>) <p> Private method to show the search window. +</p><a NAME="WebBrowserWindow.__showSessionManagerDialog" ID="WebBrowserWindow.__showSessionManagerDialog"></a> +<h4>WebBrowserWindow.__showSessionManagerDialog</h4> +<b>__showSessionManagerDialog</b>(<i></i>) +<p> + Private slot to show the session manager dialog. </p><a NAME="WebBrowserWindow.__showSiteinfoDialog" ID="WebBrowserWindow.__showSiteinfoDialog"></a> <h4>WebBrowserWindow.__showSiteinfoDialog</h4> <b>__showSiteinfoDialog</b>(<i></i>) @@ -1615,7 +1668,17 @@ <b>__showZoomValuesDialog</b>(<i></i>) <p> Private slot to show the zoom values management dialog. -</p><a NAME="WebBrowserWindow.__stopLoading" ID="WebBrowserWindow.__stopLoading"></a> +</p><a NAME="WebBrowserWindow.__shutdownWindow" ID="WebBrowserWindow.__shutdownWindow"></a> +<h4>WebBrowserWindow.__shutdownWindow</h4> +<b>__shutdownWindow</b>(<i></i>) +<p> + Private method to shut down a web browser window. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating successful shutdown (boolean) +</dd> +</dl><a NAME="WebBrowserWindow.__stopLoading" ID="WebBrowserWindow.__stopLoading"></a> <h4>WebBrowserWindow.__stopLoading</h4> <b>__stopLoading</b>(<i></i>) <p> @@ -1869,7 +1932,12 @@ <dd> mouse buttons (Qt.MouseButtons) </dd> -</dl><a NAME="WebBrowserWindow.fromEric" ID="WebBrowserWindow.fromEric"></a> +</dl><a NAME="WebBrowserWindow.forceClose" ID="WebBrowserWindow.forceClose"></a> +<h4>WebBrowserWindow.forceClose</h4> +<b>forceClose</b>(<i></i>) +<p> + Public method to force closing the window. +</p><a NAME="WebBrowserWindow.fromEric" ID="WebBrowserWindow.fromEric"></a> <h4>WebBrowserWindow.fromEric</h4> <b>fromEric</b>(<i></i>) <p> @@ -1905,22 +1973,6 @@ <dd> dictionary with tab id as key and host/namespace as value </dd> -</dl><a NAME="WebBrowserWindow.getWindow" ID="WebBrowserWindow.getWindow"></a> -<h4>WebBrowserWindow.getWindow</h4> -<b>getWindow</b>(<i></i>) -<p> - Public method to get a reference to the most recent active - web browser window. -</p><dl> -<dt>Returns:</dt> -<dd> -reference to most recent web browser window -</dd> -</dl><dl> -<dt>Return Type:</dt> -<dd> -WebBrowserWindow -</dd> </dl><a NAME="WebBrowserWindow.hideFullScreenNavigation" ID="WebBrowserWindow.hideFullScreenNavigation"></a> <h4>WebBrowserWindow.hideFullScreenNavigation</h4> <b>hideFullScreenNavigation</b>(<i></i>) @@ -2030,13 +2082,16 @@ </dd> </dl><a NAME="WebBrowserWindow.newWindow" ID="WebBrowserWindow.newWindow"></a> <h4>WebBrowserWindow.newWindow</h4> -<b>newWindow</b>(<i>link=None</i>) +<b>newWindow</b>(<i>link=None, restoreSession=False</i>) <p> Public slot called to open a new web browser window. </p><dl> <dt><i>link</i> (str or QUrl)</dt> <dd> URL to be displayed in the new window +</dd><dt><i>restoreSession</i> (bool)</dt> +<dd> +flag indicating a restore session action </dd> </dl><dl> <dt>Returns:</dt>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/index-eric6.WebBrowser.Session.html Wed Jul 05 19:58:40 2017 +0200 @@ -0,0 +1,38 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.WebBrowser.Session</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body> +<h1>eric6.WebBrowser.Session</h1> +<p> +Package implementing the session related functionality. +</p> + + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric6.WebBrowser.Session.SessionManager.html">SessionManager</a></td> +<td>Module implementing the session manager.</td> +</tr><tr> +<td><a href="eric6.WebBrowser.Session.SessionManagerDialog.html">SessionManagerDialog</a></td> +<td>Module implementing a dialog to manage sessions.</td> +</tr> +</table> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.WebBrowser.html Wed Jul 05 19:57:39 2017 +0200 +++ b/Documentation/Source/index-eric6.WebBrowser.html Wed Jul 05 19:58:40 2017 +0200 @@ -88,6 +88,9 @@ <td><a href="index-eric6.WebBrowser.QtHelp.html">QtHelp</a></td> <td>Package containing the interface to QtHelp.</td> </tr><tr> +<td><a href="index-eric6.WebBrowser.Session.html">Session</a></td> +<td>Package implementing the session related functionality.</td> +</tr><tr> <td><a href="index-eric6.WebBrowser.SiteInfo.html">SiteInfo</a></td> <td>Package implementing the site info widgets.</td> </tr><tr>
