Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html	Sun Feb 19 19:57:28 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html	Mon Feb 20 19:27:37 2017 +0100
@@ -75,9 +75,6 @@
 <td><a href="#WebBrowserPage.__fullScreenRequested">__fullScreenRequested</a></td>
 <td>Private slot handling a full screen request.</td>
 </tr><tr>
-<td><a href="#WebBrowserPage.__printFinished">__printFinished</a></td>
-<td>Private method called when the print job finished.</td>
-</tr><tr>
 <td><a href="#WebBrowserPage.__setupWebChannel">__setupWebChannel</a></td>
 <td>Private method to setup a web channel to our external object.</td>
 </tr><tr>
@@ -93,6 +90,9 @@
 <td><a href="#WebBrowserPage.execJavaScript">execJavaScript</a></td>
 <td>Public method to execute a JavaScript function synchroneously.</td>
 </tr><tr>
+<td><a href="#WebBrowserPage.execPrintPage">execPrintPage</a></td>
+<td>Public method to execute a synchronous print.</td>
+</tr><tr>
 <td><a href="#WebBrowserPage.hitTestContent">hitTestContent</a></td>
 <td>Public method to test the content at a specified position.</td>
 </tr><tr>
@@ -108,8 +108,8 @@
 <td><a href="#WebBrowserPage.mapToViewport">mapToViewport</a></td>
 <td>Public method to map a position to the viewport.</td>
 </tr><tr>
-<td><a href="#WebBrowserPage.printPage">printPage</a></td>
-<td>Public method to print the current page.</td>
+<td><a href="#WebBrowserPage.printCallback">printCallback</a></td>
+<td></td>
 </tr><tr>
 <td><a href="#WebBrowserPage.resultCallback">resultCallback</a></td>
 <td></td>
@@ -202,16 +202,6 @@
 <dd>
 reference to the full screen request
 </dd>
-</dl><a NAME="WebBrowserPage.__printFinished" ID="WebBrowserPage.__printFinished"></a>
-<h4>WebBrowserPage.__printFinished</h4>
-<b>__printFinished</b>(<i>ok</i>)
-<p>
-        Private method called when the print job finished.
-</p><dl>
-<dt><i>ok</i> (bool)</dt>
-<dd>
-flag indicating a successful print
-</dd>
 </dl><a NAME="WebBrowserPage.__setupWebChannel" ID="WebBrowserPage.__setupWebChannel"></a>
 <h4>WebBrowserPage.__setupWebChannel</h4>
 <b>__setupWebChannel</b>(<i></i>)
@@ -300,6 +290,29 @@
 <dd>
 depending upon script result
 </dd>
+</dl><a NAME="WebBrowserPage.execPrintPage" ID="WebBrowserPage.execPrintPage"></a>
+<h4>WebBrowserPage.execPrintPage</h4>
+<b>execPrintPage</b>(<i>printer, timeout=1000</i>)
+<p>
+        Public method to execute a synchronous print.
+</p><dl>
+<dt><i>printer</i> (QPrinter)</dt>
+<dd>
+reference to the printer object
+</dd><dt><i>timeout</i> (int)</dt>
+<dd>
+timeout value in milliseconds
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating a successful print job
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="WebBrowserPage.hitTestContent" ID="WebBrowserPage.hitTestContent"></a>
 <h4>WebBrowserPage.hitTestContent</h4>
 <b>hitTestContent</b>(<i>pos</i>)
@@ -389,20 +402,10 @@
 <dd>
 QPoint
 </dd>
-</dl><a NAME="WebBrowserPage.printPage" ID="WebBrowserPage.printPage"></a>
-<h4>WebBrowserPage.printPage</h4>
-<b>printPage</b>(<i>printer</i>)
-<p>
-        Public method to print the current page.
-</p><p>
-        Note: This is just a wrapper around QWebEnginePage.print() to ensure
-        the printer object is available until the print job finished.
-</p><dl>
-<dt><i>printer</i> (QPrinter)</dt>
-<dd>
-reference to the printer object
-</dd>
-</dl><a NAME="WebBrowserPage.resultCallback" ID="WebBrowserPage.resultCallback"></a>
+</dl><a NAME="WebBrowserPage.printCallback" ID="WebBrowserPage.printCallback"></a>
+<h4>WebBrowserPage.printCallback</h4>
+<b>printCallback</b>(<i>resDict=resultDict</i>)
+<a NAME="WebBrowserPage.resultCallback" ID="WebBrowserPage.resultCallback"></a>
 <h4>WebBrowserPage.resultCallback</h4>
 <b>resultCallback</b>(<i>resDict=resultDict</i>)
 <a NAME="WebBrowserPage.runJavaScript" ID="WebBrowserPage.runJavaScript"></a>