Mercurial Repositories > eric / file diff

--- a/Tools/TrayStarter.py	Sat Dec 01 11:45:24 2018 +0100
+++ b/Tools/TrayStarter.py	Thu Jan 10 14:22:59 2019 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2006 - 2018 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2006 - 2019 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 
 """
@@ -32,7 +32,7 @@
     """
     Class implementing a starter for the system tray.
     """
-    def __init__(self, usePyQt4, settingsDir, webEngine=False):
+    def __init__(self, usePyQt4, settingsDir):
         """
         Constructor
         
@@ -40,8 +40,6 @@
         @type bool
         @param settingsDir directory to be used for the settings files
         @type str
-        @keyparam webEngine flag indicating QtWebEngine is used
-        @type bool
         """
         super(TrayStarter, self).__init__(
             UI.PixmapCache.getIcon(
@@ -49,7 +47,6 @@
         
         self.usePyQt4 = usePyQt4
         self.settingsDir = settingsDir
-        self.__webEngine = webEngine
         
         self.maxMenuFilePathLen = 75
         
@@ -317,9 +314,10 @@
         """
         Private slot to start the eric6 web browser.
         """
-        if self.__webEngine:
+        variant = Globals.getWebBrowserSupport()
+        if variant == "QtWebEngine":
             self.__startProc("eric6_browser.py")
-        else:
+        elif variant == "QtWebKit":
             self.__startProc("eric6_webbrowser.py")
 
     def __startUIPreviewer(self):
@@ -536,12 +534,14 @@
             .format(sip_version_str)
         versionText += """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""\
             .format(QSCINTILLA_VERSION_STR)
-        if self.__webEngine:
+        try:
             from WebBrowser.Tools import WebBrowserTools
             chromeVersion = WebBrowserTools.getWebEngineVersions()[0]
             versionText += \
                 """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""\
                 .format(chromeVersion)
+        except ImportError:
+            pass
         try:
             from PyQt5.QtWebKit import qWebKitVersion
             versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\