Mercurial Repositories > eric / file diff

--- a/src/eric7/HelpViewer/HelpViewerWidget.py	Wed Mar 06 09:36:09 2024 +0100
+++ b/src/eric7/HelpViewer/HelpViewerWidget.py	Wed Mar 06 17:00:26 2024 +0100
@@ -40,10 +40,7 @@
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets.EricTextEditSearchWidget import (
-    EricTextEditSearchWidget,
-    EricTextEditType,
-)
+from eric7.EricWidgets.EricTextEditSearchWidget import EricTextEditSearchWidget
 from eric7.QtHelpInterface.HelpIndexWidget import HelpIndexWidget
 from eric7.QtHelpInterface.HelpSearchWidget import HelpSearchWidget
 from eric7.QtHelpInterface.HelpTocWidget import HelpTocWidget
@@ -330,7 +327,10 @@
 
         self.__initActionsMenu()
 
-        if WEBENGINE_AVAILABLE:
+        self.__useQTextBrowser = not WEBENGINE_AVAILABLE or Preferences.getHelp(
+            "ForceQTextBrowser"
+        )
+        if not self.__useQTextBrowser:
             self.__initQWebEngine()
             self.__ui.preferencesChanged.connect(self.__initQWebEngineSettings)
 
@@ -624,20 +624,18 @@
             object and its type
         @rtype tuple of (HelpViewerImpl, EricTextEditType)
         """
-        if WEBENGINE_AVAILABLE:
+        if self.__useQTextBrowser:
+            from .HelpViewerImplQTB import HelpViewerImplQTB  # __IGNORE_WARNING_I101__
+
+            viewer = HelpViewerImplQTB(self.__helpEngine, self)
+        else:
             from .HelpViewerImplQWE import HelpViewerImplQWE  # __IGNORE_WARNING_I101__
 
             viewer = HelpViewerImplQWE(self.__helpEngine, self)
-            viewerType = EricTextEditType.QWEBENGINEVIEW
-        else:
-            from .HelpViewerImplQTB import HelpViewerImplQTB  # __IGNORE_WARNING_I101__
-
-            viewer = HelpViewerImplQTB(self.__helpEngine, self)
-            viewerType = EricTextEditType.QTEXTBROWSER
 
         viewer.zoomChanged.connect(self.__checkActionButtons)
 
-        return viewer, viewerType
+        return viewer, viewer.viewerType()
 
     def currentViewer(self):
         """
@@ -910,14 +908,7 @@
         self.__checkActionButtons()
         cv = self.currentViewer()
         if cv:
-            self.__searchWidget.attachTextEdit(
-                cv,
-                editType=(
-                    EricTextEditType.QWEBENGINEVIEW
-                    if WEBENGINE_AVAILABLE
-                    else EricTextEditType.QTEXTBROWSER
-                ),
-            )
+            self.__searchWidget.attachTextEdit(cv, editType=cv.viewerType())
             cv.setFocus(Qt.FocusReason.OtherFocusReason)
 
     #######################################################################