Mercurial Repositories > eric / file diff

--- a/eric7/UI/UserInterface.py	Sat Oct 23 12:19:47 2021 +0200
+++ b/eric7/UI/UserInterface.py	Sat Oct 23 18:58:16 2021 +0200
@@ -975,9 +975,17 @@
         self.__vcsStatusWidget = StatusWidget(
             self.project, self.viewmanager, self)
         
-        # Create the embedded help viewer
-        from HelpViewer.HelpViewerWidget import HelpViewerWidget
-        self.__helpViewerWidget = HelpViewerWidget(self)
+        if (
+            Preferences.getUI("ShowInternalHelpViewer") or
+            Preferences.getHelp("HelpViewerType") == 0
+        ):
+            # Create the embedded help viewer
+            logging.debug("Creating Internal Help Viewer...")
+            from HelpViewer.HelpViewerWidget import HelpViewerWidget
+            self.__helpViewerWidget = HelpViewerWidget(self)
+        else:
+            logging.debug("Internal Help Viewer disabled...")
+            self.__helpViewerWidget = None
     
     def __createLayout(self):
         """
@@ -1110,9 +1118,10 @@
                                   UI.PixmapCache.getIcon("codeDocuViewer"),
                                   self.tr("Code Documentation Viewer"))
         
-        self.rToolbox.addItem(self.__helpViewerWidget,
-                              UI.PixmapCache.getIcon("help"),
-                              self.tr("Help Viewer"))
+        if self.__helpViewerWidget:
+            self.rToolbox.addItem(self.__helpViewerWidget,
+                                  UI.PixmapCache.getIcon("help"),
+                                  self.tr("Help Viewer"))
         
         self.rToolbox.addItem(self.pluginRepositoryViewer,
                               UI.PixmapCache.getIcon("pluginRepository"),
@@ -1272,10 +1281,11 @@
                 UI.PixmapCache.getIcon("sbCodeDocuViewer96"),
                 self.tr("Code Documentation Viewer"))
         
-        self.rightSidebar.addTab(
-            self.__helpViewerWidget,
-            UI.PixmapCache.getIcon("sbHelpViewer96"),
-            self.tr("Help Viewer"))
+        if self.__helpViewerWidget:
+            self.rightSidebar.addTab(
+                self.__helpViewerWidget,
+                UI.PixmapCache.getIcon("sbHelpViewer96"),
+                self.tr("Help Viewer"))
         
         self.rightSidebar.addTab(
             self.pluginRepositoryViewer,
@@ -7048,29 +7058,30 @@
         @param urlStr URL to be shown
         @type str
         """
-        if self.__layoutType == "Toolboxes":
-            self.rToolboxDock.show()
-            self.rToolbox.setCurrentWidget(self.__helpViewerWidget)
-        elif self.__layoutType == "Sidebars":
-            self.rightSidebar.show()
-            self.rightSidebar.setCurrentWidget(self.__helpViewerWidget)
-        self.__helpViewerWidget.setFocus(
-            Qt.FocusReason.ActiveWindowFocusReason)
-        
-        url = None
-        searchWord = None
-        
-        if urlStr:
-            url = QUrl(urlStr)
-            if not url.isValid():
-                url = None
-        
-        if url is None:
-            searchWord = self.viewmanager.textForFind(False)
-            if searchWord == "":
-                searchWord = None
-        
-        self.__helpViewerWidget.activate(searchWord=searchWord, url=url)
+        if self.__helpViewerWidget is not None:
+            if self.__layoutType == "Toolboxes":
+                self.rToolboxDock.show()
+                self.rToolbox.setCurrentWidget(self.__helpViewerWidget)
+            elif self.__layoutType == "Sidebars":
+                self.rightSidebar.show()
+                self.rightSidebar.setCurrentWidget(self.__helpViewerWidget)
+            self.__helpViewerWidget.setFocus(
+                Qt.FocusReason.ActiveWindowFocusReason)
+            
+            url = None
+            searchWord = None
+            
+            if urlStr:
+                url = QUrl(urlStr)
+                if not url.isValid():
+                    url = None
+            
+            if url is None:
+                searchWord = self.viewmanager.textForFind(False)
+                if searchWord == "":
+                    searchWord = None
+            
+            self.__helpViewerWidget.activate(searchWord=searchWord, url=url)
     
     ##########################################################
     ## Below are slots to handle StdOut and StdErr