--- 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>
