Mercurial Repositories > eric / changeset

--- a/eric6/APIs/Python3/eric6.api	Tue Sep 29 18:59:05 2020 +0200
+++ b/eric6/APIs/Python3/eric6.api	Tue Sep 29 19:00:15 2020 +0200
@@ -2230,13 +2230,6 @@
 eric6.IconEditor.IconEditorWindow.IconEditorWindow?1(fileName="", parent=None, fromEric=False, initShortcutsOnly=False, project=None)
 eric6.IconEditor.IconSizeDialog.IconSizeDialog.getData?4()
 eric6.IconEditor.IconSizeDialog.IconSizeDialog?1(width, height, parent=None)
-eric6.IconEditor.cursors.cursors_rc.qCleanupResources?4()
-eric6.IconEditor.cursors.cursors_rc.qInitResources?4()
-eric6.IconEditor.cursors.cursors_rc.qt_resource_data?7
-eric6.IconEditor.cursors.cursors_rc.qt_resource_name?7
-eric6.IconEditor.cursors.cursors_rc.qt_resource_struct_v1?7
-eric6.IconEditor.cursors.cursors_rc.qt_resource_struct_v2?7
-eric6.IconEditor.cursors.cursors_rc.qt_version?7
 eric6.MicroPython.CircuitPythonDevices.CircuitPythonDevice.DeviceVolumeName?7
 eric6.MicroPython.CircuitPythonDevices.CircuitPythonDevice.addDeviceMenuEntries?4(menu)
 eric6.MicroPython.CircuitPythonDevices.CircuitPythonDevice.canRunScript?4()
@@ -4875,7 +4868,6 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._performMonitor?5()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._shutdown?5()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread?1(interval, project, vcs, parent=None)
-eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.HgSummaryDialog.closeEvent?4(e)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.HgSummaryDialog.on_buttonBox_clicked?4(button)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.HgSummaryDialog.on_refreshButton_clicked?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.HgSummaryDialog.start?4(path, mq=False, largefiles=False)
@@ -8825,6 +8817,8 @@
 eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.clear?4()
 eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.setHtml?4(html)
 eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget?1(parent=None)
+eric6.UI.CodeDocumentationViewerTemplate._stylesheet?5()
+eric6.UI.CodeDocumentationViewerTemplate._stylesheetsCache?8
 eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocWarningDocument?4(text)
 eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocument?4(documentationInfo)
 eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlWarningDocument?4(text)
@@ -10183,13 +10177,6 @@
 eric6.WebBrowser.Bookmarks.BookmarksToolBar.BookmarksToolBar.newWindow?7
 eric6.WebBrowser.Bookmarks.BookmarksToolBar.BookmarksToolBar.openUrl?7
 eric6.WebBrowser.Bookmarks.BookmarksToolBar.BookmarksToolBar?1(mainWindow, model, parent=None)
-eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qCleanupResources?4()
-eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qInitResources?4()
-eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_data?7
-eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_name?7
-eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_struct_v1?7
-eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_struct_v2?7
-eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_version?7
 eric6.WebBrowser.Bookmarks.NsHtmlReader.NsHtmlReader.indentSize?7
 eric6.WebBrowser.Bookmarks.NsHtmlReader.NsHtmlReader.read?4(fileNameOrDevice)
 eric6.WebBrowser.Bookmarks.NsHtmlReader.NsHtmlReader?1()
@@ -10709,13 +10696,6 @@
 eric6.WebBrowser.Network.SslErrorExceptionsDialog.SslErrorExceptionsDialog?1(errorsDict, parent=None)
 eric6.WebBrowser.Network.UrlInterceptor.UrlInterceptor.interceptRequest?4(info)
 eric6.WebBrowser.Network.UrlInterceptor.UrlInterceptor?1(parent=None)
-eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qCleanupResources?4()
-eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qInitResources?4()
-eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_data?7
-eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_name?7
-eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_struct_v1?7
-eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_struct_v2?7
-eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_version?7
 eric6.WebBrowser.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_addButton_clicked?4()
 eric6.WebBrowser.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_deleteButton_clicked?4()
 eric6.WebBrowser.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_editButton_clicked?4()
@@ -11244,14 +11224,18 @@
 eric6.WebBrowser.Tools.Scripts.setupFormObserver?4()
 eric6.WebBrowser.Tools.Scripts.setupWebChannel?4(worldId)
 eric6.WebBrowser.Tools.Scripts.setupWindowObject?4()
+eric6.WebBrowser.Tools.WebBrowserTools.WebBrowserDataDirectory?7
 eric6.WebBrowser.Tools.WebBrowserTools.containsSpace?4(string)
 eric6.WebBrowser.Tools.WebBrowserTools.ensureUniqueFilename?4(name, appendFormat="({0})")
 eric6.WebBrowser.Tools.WebBrowserTools.filterCharsFromFilename?4(name)
 eric6.WebBrowser.Tools.WebBrowserTools.getFileNameFromUrl?4(url)
+eric6.WebBrowser.Tools.WebBrowserTools.getHtmlPage?4(pageFileName)
+eric6.WebBrowser.Tools.WebBrowserTools.getJavascript?4(jsFileName)
 eric6.WebBrowser.Tools.WebBrowserTools.getWebEngineVersions?4()
+eric6.WebBrowser.Tools.WebBrowserTools.pixmapFileToDataUrl?4(pixmapFile, asString=False)
 eric6.WebBrowser.Tools.WebBrowserTools.pixmapFromByteArray?4(data)
 eric6.WebBrowser.Tools.WebBrowserTools.pixmapToByteArray?4(pixmap)
-eric6.WebBrowser.Tools.WebBrowserTools.pixmapToDataUrl?4(pixmap)
+eric6.WebBrowser.Tools.WebBrowserTools.pixmapToDataUrl?4(pixmap, mimetype="image/png")
 eric6.WebBrowser.Tools.WebBrowserTools.readAllFileByteContents?4(filename)
 eric6.WebBrowser.Tools.WebBrowserTools.readAllFileContents?4(filename)
 eric6.WebBrowser.Tools.WebHitTestResult.WebHitTestResult.alternateText?4()
@@ -11325,13 +11309,6 @@
 eric6.WebBrowser.UrlBar.UrlBar.UrlBar.preferencesChanged?4()
 eric6.WebBrowser.UrlBar.UrlBar.UrlBar.setBrowser?4(browser)
 eric6.WebBrowser.UrlBar.UrlBar.UrlBar?1(mainWindow, parent=None)
-eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qCleanupResources?4()
-eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qInitResources?4()
-eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_data?7
-eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_name?7
-eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_struct_v1?7
-eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_struct_v2?7
-eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_version?7
 eric6.WebBrowser.UserAgent.UserAgentManager.UserAgentManager.allHostNames?4()
 eric6.WebBrowser.UserAgent.UserAgentManager.UserAgentManager.changed?7
 eric6.WebBrowser.UserAgent.UserAgentManager.UserAgentManager.close?4()

Binary file eric6/Documentation/Help/source.qch has changed

--- a/eric6/Documentation/Help/source.qhp	Tue Sep 29 18:59:05 2020 +0200
+++ b/eric6/Documentation/Help/source.qhp	Tue Sep 29 19:00:15 2020 +0200
@@ -8099,13 +8099,8 @@
       <keyword name="HgSummaryDialog (Constructor)" id="HgSummaryDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__init__" />
       <keyword name="HgSummaryDialog (Module)" id="HgSummaryDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html" />
       <keyword name="HgSummaryDialog.__committed" id="HgSummaryDialog.__committed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__committed" />
-      <keyword name="HgSummaryDialog.__finish" id="HgSummaryDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__finish" />
-      <keyword name="HgSummaryDialog.__procFinished" id="HgSummaryDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__procFinished" />
       <keyword name="HgSummaryDialog.__processOutput" id="HgSummaryDialog.__processOutput" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__processOutput" />
-      <keyword name="HgSummaryDialog.__readStderr" id="HgSummaryDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__readStderr" />
-      <keyword name="HgSummaryDialog.__readStdout" id="HgSummaryDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__readStdout" />
       <keyword name="HgSummaryDialog.__showError" id="HgSummaryDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__showError" />
-      <keyword name="HgSummaryDialog.closeEvent" id="HgSummaryDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.closeEvent" />
       <keyword name="HgSummaryDialog.on_buttonBox_clicked" id="HgSummaryDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.on_buttonBox_clicked" />
       <keyword name="HgSummaryDialog.on_refreshButton_clicked" id="HgSummaryDialog.on_refreshButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.on_refreshButton_clicked" />
       <keyword name="HgSummaryDialog.start" id="HgSummaryDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.start" />
@@ -17012,6 +17007,7 @@
       <keyword name="_main" id="_main" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_main" />
       <keyword name="_parse_multi_options" id="_parse_multi_options" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_parse_multi_options" />
       <keyword name="_percentReplacementFunc" id="_percentReplacementFunc" ref="eric6.Utilities.__init__.html#_percentReplacementFunc" />
+      <keyword name="_stylesheet" id="_stylesheet" ref="eric6.UI.CodeDocumentationViewerTemplate.html#_stylesheet" />
       <keyword name="_weakCryptoKeySizeCryptography" id="_weakCryptoKeySizeCryptography" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.weakCryptographicKey.html#_weakCryptoKeySizeCryptography" />
       <keyword name="_weakCryptoKeySizePycrypto" id="_weakCryptoKeySizePycrypto" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.weakCryptographicKey.html#_weakCryptoKeySizePycrypto" />
       <keyword name="absolutePath" id="absolutePath" ref="eric6.Utilities.__init__.html#absolutePath" />
@@ -17430,6 +17426,7 @@
       <keyword name="getHelp" id="getHelp" ref="eric6.Preferences.__init__.html#getHelp" />
       <keyword name="getHexEditor" id="getHexEditor" ref="eric6.Preferences.__init__.html#getHexEditor" />
       <keyword name="getHomeDir" id="getHomeDir" ref="eric6.Utilities.__init__.html#getHomeDir" />
+      <keyword name="getHtmlPage" id="getHtmlPage" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#getHtmlPage" />
       <keyword name="getIcon" id="getIcon" ref="eric6.UI.PixmapCache.html#getIcon" />
       <keyword name="getIconEditor" id="getIconEditor" ref="eric6.Preferences.__init__.html#getIconEditor" />
       <keyword name="getIcons" id="getIcons" ref="eric6.Preferences.__init__.html#getIcons" />
@@ -17445,6 +17442,7 @@
       <keyword name="getImporters" id="getImporters" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.__init__.html#getImporters" />
       <keyword name="getInstallCommand" id="getInstallCommand" ref="eric6.E5Network.E5GoogleMailHelpers.html#getInstallCommand" />
       <keyword name="getIrc" id="getIrc" ref="eric6.Preferences.__init__.html#getIrc" />
+      <keyword name="getJavascript" id="getJavascript" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#getJavascript" />
       <keyword name="getKeyUrl" id="getKeyUrl" ref="eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.__init__.html#getKeyUrl" />
       <keyword name="getLanguageIcon" id="getLanguageIcon" ref="eric6.QScintilla.Lexers.__init__.html#getLanguageIcon" />
       <keyword name="getLexer" id="getLexer" ref="eric6.QScintilla.Lexers.__init__.html#getLexer" />
@@ -17725,6 +17723,7 @@
       <keyword name="patch_modpython (Module)" id="patch_modpython (Module)" ref="patch_modpython.html" />
       <keyword name="pbkdf2" id="pbkdf2" ref="eric6.Utilities.crypto.py3PBKDF2.html#pbkdf2" />
       <keyword name="pipInstall" id="pipInstall" ref="install.html#pipInstall" />
+      <keyword name="pixmapFileToDataUrl" id="pixmapFileToDataUrl" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#pixmapFileToDataUrl" />
       <keyword name="pixmapFromByteArray" id="pixmapFromByteArray" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#pixmapFromByteArray" />
       <keyword name="pixmapToByteArray" id="pixmapToByteArray" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#pixmapToByteArray" />
       <keyword name="pixmapToDataUrl" id="pixmapToDataUrl" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#pixmapToDataUrl" />

--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html	Tue Sep 29 18:59:05 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html	Tue Sep 29 19:00:15 2020 +0200
@@ -79,34 +79,14 @@
 <td>Private slot called after the commit has finished.</td>
 </tr>
 <tr>
-<td><a href="#HgSummaryDialog.__finish">__finish</a></td>
-<td>Private slot called when the process finished or the user pressed the button.</td>
-</tr>
-<tr>
-<td><a href="#HgSummaryDialog.__procFinished">__procFinished</a></td>
-<td>Private slot connected to the finished signal.</td>
-</tr>
-<tr>
 <td><a href="#HgSummaryDialog.__processOutput">__processOutput</a></td>
 <td>Private method to process the output into nice readable text.</td>
 </tr>
 <tr>
-<td><a href="#HgSummaryDialog.__readStderr">__readStderr</a></td>
-<td>Private slot to handle the readyReadStandardError signal.</td>
-</tr>
-<tr>
-<td><a href="#HgSummaryDialog.__readStdout">__readStdout</a></td>
-<td>Private slot to handle the readyReadStandardOutput signal.</td>
-</tr>
-<tr>
 <td><a href="#HgSummaryDialog.__showError">__showError</a></td>
 <td>Private slot to show some error.</td>
 </tr>
 <tr>
-<td><a href="#HgSummaryDialog.closeEvent">closeEvent</a></td>
-<td>Protected slot implementing a close event handler.</td>
-</tr>
-<tr>
 <td><a href="#HgSummaryDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td>
 <td>Private slot called by a button of the button box clicked.</td>
 </tr>
@@ -150,32 +130,6 @@
 <p>
         Private slot called after the commit has finished.
 </p>
-<a NAME="HgSummaryDialog.__finish" ID="HgSummaryDialog.__finish"></a>
-<h4>HgSummaryDialog.__finish</h4>
-<b>__finish</b>(<i></i>)
-
-<p>
-        Private slot called when the process finished or the user pressed
-        the button.
-</p>
-<a NAME="HgSummaryDialog.__procFinished" ID="HgSummaryDialog.__procFinished"></a>
-<h4>HgSummaryDialog.__procFinished</h4>
-<b>__procFinished</b>(<i>exitCode, exitStatus</i>)
-
-<p>
-        Private slot connected to the finished signal.
-</p>
-<dl>
-
-<dt><i>exitCode</i></dt>
-<dd>
-exit code of the process (integer)
-</dd>
-<dt><i>exitStatus</i></dt>
-<dd>
-exit status of the process (QProcess.ExitStatus)
-</dd>
-</dl>
 <a NAME="HgSummaryDialog.__processOutput" ID="HgSummaryDialog.__processOutput"></a>
 <h4>HgSummaryDialog.__processOutput</h4>
 <b>__processOutput</b>(<i>output</i>)
@@ -190,28 +144,6 @@
 output from the summary command (string)
 </dd>
 </dl>
-<a NAME="HgSummaryDialog.__readStderr" ID="HgSummaryDialog.__readStderr"></a>
-<h4>HgSummaryDialog.__readStderr</h4>
-<b>__readStderr</b>(<i></i>)
-
-<p>
-        Private slot to handle the readyReadStandardError signal.
-</p>
-<p>
-        It reads the error output of the process and inserts it into the
-        error pane.
-</p>
-<a NAME="HgSummaryDialog.__readStdout" ID="HgSummaryDialog.__readStdout"></a>
-<h4>HgSummaryDialog.__readStdout</h4>
-<b>__readStdout</b>(<i></i>)
-
-<p>
-        Private slot to handle the readyReadStandardOutput signal.
-</p>
-<p>
-        It reads the output of the process, formats it and inserts it into
-        the contents pane.
-</p>
 <a NAME="HgSummaryDialog.__showError" ID="HgSummaryDialog.__showError"></a>
 <h4>HgSummaryDialog.__showError</h4>
 <b>__showError</b>(<i>out</i>)
@@ -226,20 +158,6 @@
 error to be shown (string)
 </dd>
 </dl>
-<a NAME="HgSummaryDialog.closeEvent" ID="HgSummaryDialog.closeEvent"></a>
-<h4>HgSummaryDialog.closeEvent</h4>
-<b>closeEvent</b>(<i>e</i>)
-
-<p>
-        Protected slot implementing a close event handler.
-</p>
-<dl>
-
-<dt><i>e</i></dt>
-<dd>
-close event (QCloseEvent)
-</dd>
-</dl>
 <a NAME="HgSummaryDialog.on_buttonBox_clicked" ID="HgSummaryDialog.on_buttonBox_clicked"></a>
 <h4>HgSummaryDialog.on_buttonBox_clicked</h4>
 <b>on_buttonBox_clicked</b>(<i>button</i>)

--- a/eric6/Documentation/Source/eric6.UI.CodeDocumentationViewerTemplate.html	Tue Sep 29 18:59:05 2020 +0200
+++ b/eric6/Documentation/Source/eric6.UI.CodeDocumentationViewerTemplate.html	Tue Sep 29 19:00:15 2020 +0200
@@ -28,7 +28,7 @@
 <h3>Global Attributes</h3>
 
 <table>
-<tr><td>None</td></tr>
+<tr><td>_stylesheetsCache</td></tr>
 </table>
 <h3>Classes</h3>
 
@@ -40,6 +40,10 @@
 <table>
 
 <tr>
+<td><a href="#_stylesheet">_stylesheet</a></td>
+<td>Function to get the stylesheet matching the desktop environment.</td>
+</tr>
+<tr>
 <td><a href="#prepareDocumentationViewerHtmlDocWarningDocument">prepareDocumentationViewerHtmlDocWarningDocument</a></td>
 <td>Public function to prepare a HTML warning document.</td>
 </tr>
@@ -54,6 +58,28 @@
 </table>
 <hr />
 <hr />
+<a NAME="_stylesheet" ID="_stylesheet"></a>
+<h2>_stylesheet</h2>
+<b>_stylesheet</b>(<i></i>)
+
+<p>
+    Function to get the stylesheet matching the desktop environment.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+stylesheet
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
 <a NAME="prepareDocumentationViewerHtmlDocWarningDocument" ID="prepareDocumentationViewerHtmlDocWarningDocument"></a>
 <h2>prepareDocumentationViewerHtmlDocWarningDocument</h2>
 <b>prepareDocumentationViewerHtmlDocWarningDocument</b>(<i>text</i>)

--- a/eric6/Documentation/Source/eric6.WebBrowser.Network.EricSchemeHandler.html	Tue Sep 29 18:59:05 2020 +0200
+++ b/eric6/Documentation/Source/eric6.WebBrowser.Network.EricSchemeHandler.html	Tue Sep 29 19:00:15 2020 +0200
@@ -260,7 +260,13 @@
 <dl>
 <dt>Returns:</dt>
 <dd>
-prepared speeddial page (QByteArray)
+prepared speeddial page
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <a NAME="EricSchemeReply.__startPage" ID="EricSchemeReply.__startPage"></a>

--- a/eric6/Documentation/Source/eric6.WebBrowser.Tools.WebBrowserTools.html	Tue Sep 29 18:59:05 2020 +0200
+++ b/eric6/Documentation/Source/eric6.WebBrowser.Tools.WebBrowserTools.html	Tue Sep 29 19:00:15 2020 +0200
@@ -28,7 +28,7 @@
 <h3>Global Attributes</h3>
 
 <table>
-<tr><td>None</td></tr>
+<tr><td>WebBrowserDataDirectory</td></tr>
 </table>
 <h3>Classes</h3>
 
@@ -56,10 +56,22 @@
 <td>Module function to generate a file name based on the given URL.</td>
 </tr>
 <tr>
+<td><a href="#getHtmlPage">getHtmlPage</a></td>
+<td>Module function to load a HTML page.</td>
+</tr>
+<tr>
+<td><a href="#getJavascript">getJavascript</a></td>
+<td>Module function to load a JavaScript source file.</td>
+</tr>
+<tr>
 <td><a href="#getWebEngineVersions">getWebEngineVersions</a></td>
 <td>Module function to extract the web engine version from the default user agent string.</td>
 </tr>
 <tr>
+<td><a href="#pixmapFileToDataUrl">pixmapFileToDataUrl</a></td>
+<td>Module function to load a pixmap file and convert the pixmap to a data: URL.</td>
+</tr>
+<tr>
 <td><a href="#pixmapFromByteArray">pixmapFromByteArray</a></td>
 <td>Module function to convert a byte array to a pixmap.</td>
 </tr>
@@ -185,6 +197,73 @@
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 <hr />
+<a NAME="getHtmlPage" ID="getHtmlPage"></a>
+<h2>getHtmlPage</h2>
+<b>getHtmlPage</b>(<i>pageFileName</i>)
+
+<p>
+    Module function to load a HTML page.
+</p>
+<p>
+    Note: If the given HTML file path is not absolute, it is assumed to
+    denote a HTML file in the html data directory.
+</p>
+<dl>
+
+<dt><i>pageFileName</i> (str)</dt>
+<dd>
+file name of the HTML file
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+HTML page
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
+<a NAME="getJavascript" ID="getJavascript"></a>
+<h2>getJavascript</h2>
+<b>getJavascript</b>(<i>jsFileName</i>)
+
+<p>
+    Module function to load a JavaScript source file.
+</p>
+<p>
+    Note: If the given JavaScript source file path is not absolute, it is
+    assumed to denote a JavaScript source file in the javascript data
+    directory.
+</p>
+<dl>
+
+<dt><i>jsFileName</i> (str)</dt>
+<dd>
+file name of the JavaScript source file
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+JavaScript source
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
 <a NAME="getWebEngineVersions" ID="getWebEngineVersions"></a>
 <h2>getWebEngineVersions</h2>
 <b>getWebEngineVersions</b>(<i></i>)
@@ -208,6 +287,44 @@
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 <hr />
+<a NAME="pixmapFileToDataUrl" ID="pixmapFileToDataUrl"></a>
+<h2>pixmapFileToDataUrl</h2>
+<b>pixmapFileToDataUrl</b>(<i>pixmapFile, asString=False</i>)
+
+<p>
+    Module function to load a pixmap file and convert the pixmap to a
+    data: URL.
+</p>
+<p>
+    Note: If the given pixmap file path is not absolute, it is assumed to
+    denote a pixmap file in the icons data directory.
+</p>
+<dl>
+
+<dt><i>pixmapFile</i> (str)</dt>
+<dd>
+file name of the pixmap file
+</dd>
+<dt><i>asString</i> (bool)</dt>
+<dd>
+flag indicating a string representation is requested
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+data: URL
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+QUrl or str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
 <a NAME="pixmapFromByteArray" ID="pixmapFromByteArray"></a>
 <h2>pixmapFromByteArray</h2>
 <b>pixmapFromByteArray</b>(<i>data</i>)
@@ -269,7 +386,7 @@
 <hr />
 <a NAME="pixmapToDataUrl" ID="pixmapToDataUrl"></a>
 <h2>pixmapToDataUrl</h2>
-<b>pixmapToDataUrl</b>(<i>pixmap</i>)
+<b>pixmapToDataUrl</b>(<i>pixmap, mimetype="image/png"</i>)
 
 <p>
     Module function to convert a pixmap to a data: URL.