--- a/Documentation/Source/eric6.Preferences.ConfigurationDialog.html Sun Apr 03 17:07:25 2016 +0200 +++ b/Documentation/Source/eric6.Preferences.ConfigurationDialog.html Sun Apr 03 17:10:43 2016 +0200 @@ -67,7 +67,7 @@ QDialog <h3>Class Attributes</h3> <table> -<tr><td>DefaultMode</td></tr><tr><td>HelpBrowserMode</td></tr><tr><td>HexEditorMode</td></tr><tr><td>TrayStarterMode</td></tr> +<tr><td>DefaultMode</td></tr><tr><td>HelpBrowserMode</td></tr><tr><td>HexEditorMode</td></tr><tr><td>TrayStarterMode</td></tr><tr><td>WebBrowserMode</td></tr> </table> <h3>Class Methods</h3> <table> @@ -107,7 +107,7 @@ </table> <a NAME="ConfigurationDialog.__init__" ID="ConfigurationDialog.__init__"></a> <h4>ConfigurationDialog (Constructor)</h4> -<b>ConfigurationDialog</b>(<i>parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationWidget.DefaultMode, expandedEntries=[]</i>) +<b>ConfigurationDialog</b>(<i>parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationWidget.DefaultMode, expandedEntries=[], webEngine=False</i>) <p> Constructor </p><dl> @@ -127,11 +127,15 @@ </dd><dt><i>displayMode=</i></dt> <dd> mode of the configuration dialog - (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode) + (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode, + WebBrowserMode) </dd><dt><i>expandedEntries=</i></dt> <dd> list of entries to be shown expanded (list of strings) +</dd><dt><i>webEngine=</i></dt> +<dd> +flag indicating QtWebEngine is used (bool) </dd> </dl><a NAME="ConfigurationDialog.__masterPasswordChanged" ID="ConfigurationDialog.__masterPasswordChanged"></a> <h4>ConfigurationDialog.__masterPasswordChanged</h4> @@ -282,7 +286,7 @@ QWidget <h3>Class Attributes</h3> <table> -<tr><td>DefaultMode</td></tr><tr><td>HelpBrowserMode</td></tr><tr><td>HexEditorMode</td></tr><tr><td>TrayStarterMode</td></tr> +<tr><td>DefaultMode</td></tr><tr><td>HelpBrowserMode</td></tr><tr><td>HexEditorMode</td></tr><tr><td>TrayStarterMode</td></tr><tr><td>WebBrowserMode</td></tr> </table> <h3>Class Methods</h3> <table> @@ -333,6 +337,9 @@ <td><a href="#ConfigurationWidget.getPage">getPage</a></td> <td>Public method to get a reference to the named page.</td> </tr><tr> +<td><a href="#ConfigurationWidget.isUsingWebEngine">isUsingWebEngine</a></td> +<td>Public method to get an indication, if QtWebEngine is being used.</td> +</tr><tr> <td><a href="#ConfigurationWidget.on_applyButton_clicked">on_applyButton_clicked</a></td> <td>Private slot called to apply the settings of the current page.</td> </tr><tr> @@ -361,7 +368,7 @@ </table> <a NAME="ConfigurationWidget.__init__" ID="ConfigurationWidget.__init__"></a> <h4>ConfigurationWidget (Constructor)</h4> -<b>ConfigurationWidget</b>(<i>parent=None, fromEric=True, displayMode=DefaultMode, expandedEntries=[]</i>) +<b>ConfigurationWidget</b>(<i>parent=None, fromEric=True, displayMode=DefaultMode, expandedEntries=[], webEngine=False</i>) <p> Constructor </p><dl> @@ -375,11 +382,15 @@ </dd><dt><i>displayMode=</i></dt> <dd> mode of the configuration dialog - (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode) + (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode, + WebBrowserMode) </dd><dt><i>expandedEntries=</i></dt> <dd> list of entries to be shown expanded (list of strings) +</dd><dt><i>webEngine=</i></dt> +<dd> +flag indicating QtWebEngine is used (bool) </dd> </dl><dl> <dt>Raises <b>RuntimeError</b>:</dt> @@ -529,6 +540,21 @@ reference to the page or None, indicating page was not loaded yet </dd> +</dl><a NAME="ConfigurationWidget.isUsingWebEngine" ID="ConfigurationWidget.isUsingWebEngine"></a> +<h4>ConfigurationWidget.isUsingWebEngine</h4> +<b>isUsingWebEngine</b>(<i></i>) +<p> + Public method to get an indication, if QtWebEngine is being used. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the use of QtWebEngine +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> </dl><a NAME="ConfigurationWidget.on_applyButton_clicked" ID="ConfigurationWidget.on_applyButton_clicked"></a> <h4>ConfigurationWidget.on_applyButton_clicked</h4> <b>on_applyButton_clicked</b>(<i></i>) @@ -625,13 +651,16 @@ </table> <a NAME="ConfigurationWindow.__init__" ID="ConfigurationWindow.__init__"></a> <h4>ConfigurationWindow (Constructor)</h4> -<b>ConfigurationWindow</b>(<i>parent=None</i>) +<b>ConfigurationWindow</b>(<i>parent=None, webEngine=False</i>) <p> Constructor </p><dl> <dt><i>parent</i></dt> <dd> reference to the parent widget (QWidget) +</dd><dt><i>webEngine=</i></dt> +<dd> +flag indicating QtWebEngine is used (bool) </dd> </dl><a NAME="ConfigurationWindow.accept" ID="ConfigurationWindow.accept"></a> <h4>ConfigurationWindow.accept</h4>