Mercurial Repositories > eric / file diff

diff -r 77189681b787 -r 51eefa621de4 Preferences/ConfigurationDialog.py
--- a/Preferences/ConfigurationDialog.py	Sat Dec 01 11:45:24 2018 +0100
+++ b/Preferences/ConfigurationDialog.py	Thu Jan 10 14:22:59 2019 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2002 - 2018 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2002 - 2019 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 
 """
@@ -24,7 +24,7 @@
 from E5Gui import E5MessageBox
 from E5Gui.E5MainWindow import E5MainWindow
 
-from Globals import isMacPlatform, qVersionTuple
+from Globals import isMacPlatform, qVersionTuple, getWebBrowserSupport
 
 import Preferences
 
@@ -83,7 +83,7 @@
     WebBrowserMode = 4
     
     def __init__(self, parent=None, fromEric=True, displayMode=DefaultMode,
-                 expandedEntries=None, webEngine=False):
+                 expandedEntries=None):
         """
         Constructor
         
@@ -96,7 +96,6 @@
         @exception RuntimeError raised to indicate an invalid dialog mode
         @keyparam expandedEntries list of entries to be shown expanded
             (list of strings)
-        @keyparam webEngine flag indicating QtWebEngine is used (bool)
         """
         assert displayMode in (
             ConfigurationWidget.DefaultMode,
@@ -109,7 +108,7 @@
         super(ConfigurationWidget, self).__init__(parent)
         self.fromEric = fromEric
         self.displayMode = displayMode
-        self.__webEngine = webEngine
+        self.__webEngine = getWebBrowserSupport() == "QtWebEngine"
         expandedEntries = [] if expandedEntries is None else expandedEntries[:]
         
         self.__setupUi()
@@ -339,7 +338,7 @@
                 [self.tr("Viewmanager"), "preferences-viewmanager.png",
                  "ViewmanagerPage", "0interfacePage", None],
             }
-            if webEngine:
+            if self.__webEngine:
                 self.configItems.update({
                     "0webBrowserPage":
                     [self.tr("Web Browser"), "ericWeb.png",
@@ -972,7 +971,7 @@
     
     def __init__(self, parent=None, name=None, modal=False,
                  fromEric=True, displayMode=ConfigurationWidget.DefaultMode,
-                 expandedEntries=None, webEngine=False):
+                 expandedEntries=None):
         """
         Constructor
         
@@ -986,7 +985,6 @@
              WebBrowserMode)
         @keyparam expandedEntries list of entries to be shown expanded
             (list of strings)
-        @keyparam webEngine flag indicating QtWebEngine is used (bool)
         """
         super(ConfigurationDialog, self).__init__(parent)
         if name:
@@ -1000,8 +998,7 @@
         
         self.cw = ConfigurationWidget(self, fromEric=fromEric,
                                       displayMode=displayMode,
-                                      expandedEntries=expandedEntries,
-                                      webEngine=webEngine)
+                                      expandedEntries=expandedEntries)
         size = self.cw.size()
         self.layout.addWidget(self.cw)
         self.resize(size)
@@ -1069,17 +1066,15 @@
     """
     Main window class for the standalone dialog.
     """
-    def __init__(self, parent=None, webEngine=False):
+    def __init__(self, parent=None):
         """
         Constructor
         
         @param parent reference to the parent widget (QWidget)
-        @keyparam webEngine flag indicating QtWebEngine is used (bool)
         """
         super(ConfigurationWindow, self).__init__(parent)
         
-        self.cw = ConfigurationWidget(self, fromEric=False,
-                                      webEngine=webEngine)
+        self.cw = ConfigurationWidget(self, fromEric=False)
         size = self.cw.size()
         self.setCentralWidget(self.cw)
         self.resize(size)