Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/ConfigurationPages/WebBrowserPage.py	Sat Jan 02 17:28:57 2021 +0100
+++ b/eric6/Preferences/ConfigurationPages/WebBrowserPage.py	Sun Jan 03 15:33:39 2021 +0100
@@ -12,8 +12,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserPage import Ui_WebBrowserPage
 
-from Globals import qVersionTuple
-
 import UI.PixmapCache
 import Preferences
 
@@ -64,50 +62,27 @@
             Preferences.getWebBrowser("ScrollAnimatorEnabled"))
         self.fullscreenCheckBox.setChecked(
             Preferences.getWebBrowser("FullScreenSupportEnabled"))
-        try:
-            # Qt 5.7+
-            self.screenCaptureCheckBox.setChecked(
-                Preferences.getWebBrowser("ScreenCaptureEnabled"))
-            self.webGLCheckBox.setChecked(
-                Preferences.getWebBrowser("WebGLEnabled"))
-        except KeyError:
-            self.screenCaptureCheckBox.setEnabled(False)
-            self.webGLCheckBox.setEnabled(False)
-        try:
-            # Qt 5.11
-            self.autoplayMediaCheckBox.setChecked(
-                Preferences.getWebBrowser("PlaybackRequiresUserGesture"))
-            self.webRtcPublicOnlyCheckBox.setChecked(
-                Preferences.getWebBrowser("WebRTCPublicInterfacesOnly"))
-        except KeyError:
-            self.autoplayMediaCheckBox.setEnabled(False)
-            self.webRtcPublicOnlyCheckBox.setEnabled(False)
-        try:
-            # Qt 5.12
-            self.dnsPrefetchCheckBox.setChecked(
-                Preferences.getWebBrowser("DnsPrefetchEnabled"))
-        except KeyError:
-            self.dnsPrefetchCheckBox.setEnabled(False)
+        self.screenCaptureCheckBox.setChecked(
+            Preferences.getWebBrowser("ScreenCaptureEnabled"))
+        self.webGLCheckBox.setChecked(
+            Preferences.getWebBrowser("WebGLEnabled"))
+        self.autoplayMediaCheckBox.setChecked(
+            Preferences.getWebBrowser("PlaybackRequiresUserGesture"))
+        self.webRtcPublicOnlyCheckBox.setChecked(
+            Preferences.getWebBrowser("WebRTCPublicInterfacesOnly"))
+        self.dnsPrefetchCheckBox.setChecked(
+            Preferences.getWebBrowser("DnsPrefetchEnabled"))
         
         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.jsActivateWindowsCheckBox.setChecked(
+            Preferences.getWebBrowser("AllowWindowActivationFromJavaScript"))
         self.jsClipboardCheckBox.setChecked(
             Preferences.getWebBrowser("JavaScriptCanAccessClipboard"))
-        try:
-            # Qt 5.11
-            self.jsPasteCheckBox.setChecked(
-                Preferences.getWebBrowser("JavaScriptCanPaste"))
-        except KeyError:
-            self.jsPasteCheckBox.setEnabled(False)
+        self.jsPasteCheckBox.setChecked(
+            Preferences.getWebBrowser("JavaScriptCanPaste"))
         self.doNotTrackCheckBox.setChecked(
             Preferences.getWebBrowser("DoNotTrack"))
         self.refererSendComboBox.setCurrentIndex(
@@ -200,56 +175,28 @@
             Preferences.getWebBrowser("SpatialNavigationEnabled"))
         self.linksInFocusChainCheckBox.setChecked(
             Preferences.getWebBrowser("LinksIncludedInFocusChain"))
-        try:
-            # Qt 5.8
-            self.focusOnNavigationCheckBox.setChecked(
-                Preferences.getWebBrowser("FocusOnNavigationEnabled"))
-        except KeyError:
-            self.focusOnNavigationCheckBox.setEnabled(False)
+        self.focusOnNavigationCheckBox.setChecked(
+            Preferences.getWebBrowser("FocusOnNavigationEnabled"))
         
         self.xssAuditingCheckBox.setChecked(
             Preferences.getWebBrowser("XSSAuditingEnabled"))
-        try:
-            # Qt 5.8
-            self.insecureContentsCheckBox.setChecked(
-                Preferences.getWebBrowser("AllowRunningInsecureContent"))
-        except KeyError:
-            self.insecureContentsCheckBox.setEnabled(False)
-        try:
-            # Qt 5.9
-            self.insecureGeolocationCheckBox.setChecked(
-                Preferences.getWebBrowser("AllowGeolocationOnInsecureOrigins"))
-        except KeyError:
-            self.insecureGeolocationCheckBox.setEnabled(False)
+        self.insecureContentsCheckBox.setChecked(
+            Preferences.getWebBrowser("AllowRunningInsecureContent"))
+        self.insecureGeolocationCheckBox.setChecked(
+            Preferences.getWebBrowser("AllowGeolocationOnInsecureOrigins"))
         
-        try:
-            # Qt 5.8
-            self.printBackgroundCheckBox.setChecked(
-                Preferences.getWebBrowser("PrintElementBackgrounds"))
-        except KeyError:
-            self.printBackgroundCheckBox.setEnabled(False)
+        self.printBackgroundCheckBox.setChecked(
+            Preferences.getWebBrowser("PrintElementBackgrounds"))
         
         self.autoScrollGroupBox.setChecked(
             Preferences.getWebBrowser("AutoScrollEnabled"))
         self.autoScrollDividerSpinBox.setValue(
             Preferences.getWebBrowser("AutoScrollDivider"))
         
-        if qVersionTuple() < (5, 11, 0):
-            self.webInspectorGroup.setChecked(
-                Preferences.getWebBrowser("WebInspectorEnabled"))
-            self.webInspectorPortSpinBox.setValue(
-                Preferences.getWebBrowser("WebInspectorPort"))
-        else:
-            self.webInspectorGroup.hide()
-        
-        if qVersionTuple() >= (5, 11, 0):
-            self.protocolHandlerComboBox.setCurrentIndex(
-                Preferences.getWebBrowser("AcceptProtocolHandlerRequest"))
-            self.requestQuotaComboBox.setCurrentIndex(
-                Preferences.getWebBrowser("AcceptQuotaRequest"))
-        else:
-            self.protocolHandlerComboBox.setEnabled(False)
-            self.requestQuotaComboBox.setEnabled(False)
+        self.protocolHandlerComboBox.setCurrentIndex(
+            Preferences.getWebBrowser("AcceptProtocolHandlerRequest"))
+        self.requestQuotaComboBox.setCurrentIndex(
+            Preferences.getWebBrowser("AcceptQuotaRequest"))
     
     def save(self):
         """
@@ -277,26 +224,23 @@
             "FullScreenSupportEnabled",
             self.fullscreenCheckBox.isChecked())
         
-        if self.screenCaptureCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "ScreenCaptureEnabled",
-                self.screenCaptureCheckBox.isChecked())
-            Preferences.setWebBrowser(
-                "WebGLEnabled",
-                self.webGLCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "ScreenCaptureEnabled",
+            self.screenCaptureCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "WebGLEnabled",
+            self.webGLCheckBox.isChecked())
         
-        if self.autoplayMediaCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "PlaybackRequiresUserGesture",
-                self.autoplayMediaCheckBox.isChecked())
-            Preferences.setWebBrowser(
-                "WebRTCPublicInterfacesOnly",
-                self.webRtcPublicOnlyCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "PlaybackRequiresUserGesture",
+            self.autoplayMediaCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "WebRTCPublicInterfacesOnly",
+            self.webRtcPublicOnlyCheckBox.isChecked())
         
-        if self.dnsPrefetchCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "DnsPrefetchEnabled",
-                self.dnsPrefetchCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "DnsPrefetchEnabled",
+            self.dnsPrefetchCheckBox.isChecked())
         
         Preferences.setWebBrowser(
             "JavaScriptEnabled",
@@ -304,17 +248,15 @@
         Preferences.setWebBrowser(
             "JavaScriptCanOpenWindows",
             self.jsOpenWindowsCheckBox.isChecked())
-        if self.jsActivateWindowsCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "AllowWindowActivationFromJavaScript",
-                self.jsActivateWindowsCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "AllowWindowActivationFromJavaScript",
+            self.jsActivateWindowsCheckBox.isChecked())
         Preferences.setWebBrowser(
             "JavaScriptCanAccessClipboard",
             self.jsClipboardCheckBox.isChecked())
-        if self.jsPasteCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "JavaScriptCanPaste",
-                self.jsPasteCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "JavaScriptCanPaste",
+            self.jsPasteCheckBox.isChecked())
         
         Preferences.setWebBrowser(
             "PluginsEnabled",
@@ -403,27 +345,23 @@
         Preferences.setWebBrowser(
             "LinksIncludedInFocusChain",
             self.linksInFocusChainCheckBox.isChecked())
-        if self.focusOnNavigationCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "FocusOnNavigationEnabled",
-                self.focusOnNavigationCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "FocusOnNavigationEnabled",
+            self.focusOnNavigationCheckBox.isChecked())
         
         Preferences.setWebBrowser(
             "XSSAuditingEnabled",
             self.xssAuditingCheckBox.isChecked())
-        if self.insecureContentsCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "AllowRunningInsecureContent",
-                self.insecureContentsCheckBox.isChecked())
-        if self.insecureGeolocationCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "AllowGeolocationOnInsecureOrigins",
-                self.insecureGeolocationCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "AllowRunningInsecureContent",
+            self.insecureContentsCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "AllowGeolocationOnInsecureOrigins",
+            self.insecureGeolocationCheckBox.isChecked())
         
-        if self.printBackgroundCheckBox.isEnabled():
-            Preferences.setWebBrowser(
-                "PrintElementBackgrounds",
-                self.printBackgroundCheckBox.isChecked())
+        Preferences.setWebBrowser(
+            "PrintElementBackgrounds",
+            self.printBackgroundCheckBox.isChecked())
         
         Preferences.setWebBrowser(
             "AutoScrollEnabled",
@@ -432,21 +370,12 @@
             "AutoScrollDivider",
             self.autoScrollDividerSpinBox.value())
         
-        if qVersionTuple() < (5, 11, 0):
-            Preferences.setWebBrowser(
-                "WebInspectorEnabled",
-                self.webInspectorGroup.isChecked())
-            Preferences.setWebBrowser(
-                "WebInspectorPort",
-                self.webInspectorPortSpinBox.value())
-        
-        if self.protocolHandlerComboBox.isEnabled():
-            Preferences.setWebBrowser(
-                "AcceptProtocolHandlerRequest",
-                self.protocolHandlerComboBox.currentIndex())
-            Preferences.setWebBrowser(
-                "AcceptQuotaRequest",
-                self.requestQuotaComboBox.currentIndex())
+        Preferences.setWebBrowser(
+            "AcceptProtocolHandlerRequest",
+            self.protocolHandlerComboBox.currentIndex())
+        Preferences.setWebBrowser(
+            "AcceptQuotaRequest",
+            self.requestQuotaComboBox.currentIndex())
     
     @pyqtSlot()
     def on_setCurrentPageButton_clicked(self):