Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html	Sat Dec 15 16:29:47 2018 +0100
+++ b/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html	Sat Dec 15 16:30:36 2018 +0100
@@ -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>_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>_safeBrowsingManager</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>
+<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>_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>_safeBrowsingManager</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>
@@ -226,6 +226,9 @@
 <td><a href="#WebBrowserWindow.__clearPrivateData">__clearPrivateData</a></td>
 <td>Private slot to clear the private data.</td>
 </tr><tr>
+<td><a href="#WebBrowserWindow.__configShortcuts">__configShortcuts</a></td>
+<td>Private slot to configure the keyboard shortcuts.</td>
+</tr><tr>
 <td><a href="#WebBrowserWindow.__copy">__copy</a></td>
 <td>Private slot called to handle the copy action.</td>
 </tr><tr>
@@ -247,6 +250,9 @@
 <td><a href="#WebBrowserWindow.__docsInstalled">__docsInstalled</a></td>
 <td>Private slot handling the end of documentation installation.</td>
 </tr><tr>
+<td><a href="#WebBrowserWindow.__exportShortcuts">__exportShortcuts</a></td>
+<td>Private slot to export the keyboard shortcuts.</td>
+</tr><tr>
 <td><a href="#WebBrowserWindow.__feedsManagerClosed">__feedsManagerClosed</a></td>
 <td>Private slot to handle closing the feeds manager dialog.</td>
 </tr><tr>
@@ -265,6 +271,9 @@
 <td><a href="#WebBrowserWindow.__home">__home</a></td>
 <td>Private slot called to handle the home action.</td>
 </tr><tr>
+<td><a href="#WebBrowserWindow.__importShortcuts">__importShortcuts</a></td>
+<td>Private slot to import the keyboard shortcuts.</td>
+</tr><tr>
 <td><a href="#WebBrowserWindow.__indexingFinished">__indexingFinished</a></td>
 <td>Private slot to handle the start of the indexing process.</td>
 </tr><tr>
@@ -328,6 +337,15 @@
 <td><a href="#WebBrowserWindow.__removeOldDocumentation">__removeOldDocumentation</a></td>
 <td>Private slot to remove non-existing documentation from the help engine.</td>
 </tr><tr>
+<td><a href="#WebBrowserWindow.__saLoadUrl">__saLoadUrl</a></td>
+<td>Private slot to load an URL received via the single application protocol.</td>
+</tr><tr>
+<td><a href="#WebBrowserWindow.__saNewTab">__saNewTab</a></td>
+<td>Private slot to load an URL received via the single application protocol in a new tab.</td>
+</tr><tr>
+<td><a href="#WebBrowserWindow.__saSearchWord">__saSearchWord</a></td>
+<td>Private slot to search for the given word.</td>
+</tr><tr>
 <td><a href="#WebBrowserWindow.__savePageAs">__savePageAs</a></td>
 <td>Private slot to save the current page.</td>
 </tr><tr>
@@ -556,12 +574,12 @@
 <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>
 <td><a href="#WebBrowserWindow.getActions">getActions</a></td>
 <td>Public method to get a list of all actions.</td>
 </tr><tr>
+<td><a href="#WebBrowserWindow.getActionsCategory">getActionsCategory</a></td>
+<td>Public method to get the category of the defined actions.</td>
+</tr><tr>
 <td><a href="#WebBrowserWindow.getSourceFileList">getSourceFileList</a></td>
 <td>Public method to get a list of all opened source files.</td>
 </tr><tr>
@@ -1096,7 +1114,7 @@
 </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="", restoreSession=False</i>)
+<b>WebBrowserWindow</b>(<i>home, path, parent, name, searchWord=None, private=False, qthelp=False, settingsDir="", restoreSession=False, single=False, saname=""</i>)
 <p>
         Constructor
 </p><dl>
@@ -1112,29 +1130,27 @@
 </dd><dt><i>name</i> (str)</dt>
 <dd>
 name of this window
-</dd><dt><i>fromEric</i> (bool)</dt>
-<dd>
-flag indicating whether it was called from within
-            eric6
-</dd><dt><i>initShortcutsOnly=</i> (bool)</dt>
-<dd>
-flag indicating to just initialize the
-            keyboard shortcuts
-</dd><dt><i>searchWord=</i> (str)</dt>
+</dd><dt><i>searchWord</i> (str)</dt>
 <dd>
 word to search for
-</dd><dt><i>private=</i> (bool)</dt>
+</dd><dt><i>private</i> (bool)</dt>
 <dd>
 flag indicating a private browsing window
-</dd><dt><i>qthelp=</i> (bool)</dt>
+</dd><dt><i>qthelp</i> (bool)</dt>
 <dd>
 flag indicating to enable the QtHelp support
-</dd><dt><i>settingsDir=</i> (str)</dt>
+</dd><dt><i>settingsDir</i> (str)</dt>
 <dd>
 directory to be used for the settings files
-</dd><dt><i>restoreSession=</i> (bool)</dt>
+</dd><dt><i>restoreSession</i> (bool)</dt>
 <dd>
 flag indicating a restore session action
+</dd><dt><i>single</i> (bool)</dt>
+<dd>
+flag indicating to start in single application mode
+</dd><dt><i>saname</i> (str)</dt>
+<dd>
+name to be used for the single application server
 </dd>
 </dl><a NAME="WebBrowserWindow.__TBMenuTriggered" ID="WebBrowserWindow.__TBMenuTriggered"></a>
 <h4>WebBrowserWindow.__TBMenuTriggered</h4>
@@ -1247,6 +1263,11 @@
 <b>__clearPrivateData</b>(<i></i>)
 <p>
         Private slot to clear the private data.
+</p><a NAME="WebBrowserWindow.__configShortcuts" ID="WebBrowserWindow.__configShortcuts"></a>
+<h4>WebBrowserWindow.__configShortcuts</h4>
+<b>__configShortcuts</b>(<i></i>)
+<p>
+        Private slot to configure the keyboard shortcuts.
 </p><a NAME="WebBrowserWindow.__copy" ID="WebBrowserWindow.__copy"></a>
 <h4>WebBrowserWindow.__copy</h4>
 <b>__copy</b>(<i></i>)
@@ -1319,7 +1340,12 @@
 flag indicating that documents were installed
             (boolean)
 </dd>
-</dl><a NAME="WebBrowserWindow.__feedsManagerClosed" ID="WebBrowserWindow.__feedsManagerClosed"></a>
+</dl><a NAME="WebBrowserWindow.__exportShortcuts" ID="WebBrowserWindow.__exportShortcuts"></a>
+<h4>WebBrowserWindow.__exportShortcuts</h4>
+<b>__exportShortcuts</b>(<i></i>)
+<p>
+        Private slot to export the keyboard shortcuts.
+</p><a NAME="WebBrowserWindow.__feedsManagerClosed" ID="WebBrowserWindow.__feedsManagerClosed"></a>
 <h4>WebBrowserWindow.__feedsManagerClosed</h4>
 <b>__feedsManagerClosed</b>(<i>feedsManager</i>)
 <p>
@@ -1362,6 +1388,11 @@
 <b>__home</b>(<i></i>)
 <p>
         Private slot called to handle the home action.
+</p><a NAME="WebBrowserWindow.__importShortcuts" ID="WebBrowserWindow.__importShortcuts"></a>
+<h4>WebBrowserWindow.__importShortcuts</h4>
+<b>__importShortcuts</b>(<i></i>)
+<p>
+        Private slot to import the keyboard shortcuts.
 </p><a NAME="WebBrowserWindow.__indexingFinished" ID="WebBrowserWindow.__indexingFinished"></a>
 <h4>WebBrowserWindow.__indexingFinished</h4>
 <b>__indexingFinished</b>(<i></i>)
@@ -1479,7 +1510,39 @@
 <b>__removeOldDocumentation</b>(<i></i>)
 <p>
         Private slot to remove non-existing documentation from the help engine.
-</p><a NAME="WebBrowserWindow.__savePageAs" ID="WebBrowserWindow.__savePageAs"></a>
+</p><a NAME="WebBrowserWindow.__saLoadUrl" ID="WebBrowserWindow.__saLoadUrl"></a>
+<h4>WebBrowserWindow.__saLoadUrl</h4>
+<b>__saLoadUrl</b>(<i>urlStr</i>)
+<p>
+        Private slot to load an URL received via the single application
+        protocol.
+</p><dl>
+<dt><i>urlStr</i> (str)</dt>
+<dd>
+URL to be loaded
+</dd>
+</dl><a NAME="WebBrowserWindow.__saNewTab" ID="WebBrowserWindow.__saNewTab"></a>
+<h4>WebBrowserWindow.__saNewTab</h4>
+<b>__saNewTab</b>(<i>urlStr</i>)
+<p>
+        Private slot to load an URL received via the single application
+        protocol in a new tab.
+</p><dl>
+<dt><i>urlStr</i> (str)</dt>
+<dd>
+URL to be loaded
+</dd>
+</dl><a NAME="WebBrowserWindow.__saSearchWord" ID="WebBrowserWindow.__saSearchWord"></a>
+<h4>WebBrowserWindow.__saSearchWord</h4>
+<b>__saSearchWord</b>(<i>word</i>)
+<p>
+        Private slot to search for the given word.
+</p><dl>
+<dt><i>word</i> (str)</dt>
+<dd>
+word to be searched for
+</dd>
+</dl><a NAME="WebBrowserWindow.__savePageAs" ID="WebBrowserWindow.__savePageAs"></a>
 <h4>WebBrowserWindow.__savePageAs</h4>
 <b>__savePageAs</b>(<i></i>)
 <p>
@@ -2030,23 +2093,7 @@
 <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>
-        Public method to check, if the web browser was called from within the
-        eric IDE.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-flag indicating that the browserw as opened from within eric
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-bool
-</dd>
-</dl><a NAME="WebBrowserWindow.getActions" ID="WebBrowserWindow.getActions"></a>
+</p><a NAME="WebBrowserWindow.getActions" ID="WebBrowserWindow.getActions"></a>
 <h4>WebBrowserWindow.getActions</h4>
 <b>getActions</b>(<i></i>)
 <p>
@@ -2056,6 +2103,21 @@
 <dd>
 list of all actions (list of E5Action)
 </dd>
+</dl><a NAME="WebBrowserWindow.getActionsCategory" ID="WebBrowserWindow.getActionsCategory"></a>
+<h4>WebBrowserWindow.getActionsCategory</h4>
+<b>getActionsCategory</b>(<i></i>)
+<p>
+        Public method to get the category of the defined actions.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+category of the actions
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
 </dl><a NAME="WebBrowserWindow.getSourceFileList" ID="WebBrowserWindow.getSourceFileList"></a>
 <h4>WebBrowserWindow.getSourceFileList</h4>
 <b>getSourceFileList</b>(<i></i>)