Mercurial Repositories > eric / file diff

diff -r 20efcd29b237 -r 29564aad2f97 WebBrowser/StatusBar/JavaScriptSettingsDialog.py
--- a/WebBrowser/StatusBar/JavaScriptSettingsDialog.py	Thu Feb 15 19:05:22 2018 +0100
+++ b/WebBrowser/StatusBar/JavaScriptSettingsDialog.py	Fri Feb 16 20:11:36 2018 +0100
@@ -34,8 +34,17 @@
         super(JavaScriptSettingsDialog, self).__init__(parent)
         self.setupUi(self)
         
+        self.javaScriptGroup.setChecked(
+            Preferences.getWebBrowser("JavaScriptEnabled"))
         self.jsOpenWindowsCheckBox.setChecked(
             Preferences.getWebBrowser("JavaScriptCanOpenWindows"))
+        try:
+            # Qt 5.10
+            self.jsActivateWindowsCheckBox.setChecked(
+                Preferences.getWebBrowser(
+                    "AllowWindowActivationFromJavaScript"))
+        except KeyError:
+            self.jsActivateWindowsCheckBox.setEnabled(False)
         self.jsClipboardCheckBox.setChecked(
             Preferences.getWebBrowser("JavaScriptCanAccessClipboard"))
         
@@ -48,8 +57,15 @@
         Public slot to accept the dialog.
         """
         Preferences.setWebBrowser(
+            "JavaScriptEnabled",
+            self.javaScriptGroup.isChecked())
+        Preferences.setWebBrowser(
             "JavaScriptCanOpenWindows",
             self.jsOpenWindowsCheckBox.isChecked())
+        if self.jsActivateWindowsCheckBox.isEnabled():
+            Preferences.setWebBrowser(
+                "AllowWindowActivationFromJavaScript",
+                self.jsActivateWindowsCheckBox.isChecked())
         Preferences.setWebBrowser(
             "JavaScriptCanAccessClipboard",
             self.jsClipboardCheckBox.isChecked())