Mercurial Repositories > eric / changeset

--- a/eric7/WebBrowser/QtHelp/HelpIndexWidget.py	Tue Aug 31 17:48:20 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/HelpIndexWidget.py	Tue Aug 31 19:56:40 2021 +0200
@@ -73,7 +73,7 @@
             self.__index.activateCurrentItem)
         self.__layout.addWidget(self.__index)
     
-    @pyqtSlot(QUrl, str)
+    @pyqtSlot(QHelpLink, str)
     def __documentActivated(self, document, keyword, modifiers=None):
         """
         Private slot to handle the activation of a keyword entry.

--- a/eric7/WebBrowser/QtHelp/QtHelpDocumentationConfigurationDialog.py	Tue Aug 31 17:48:20 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/QtHelpDocumentationConfigurationDialog.py	Tue Aug 31 19:56:40 2021 +0200
@@ -75,7 +75,8 @@
         @param button button that was clicked
         @type QAbstractButton
         """
-        if button == QDialogButtonBox.StandardButton.Apply:
+        if button == self.buttonBox.button(
+                QDialogButtonBox.StandardButton.Apply):
             self.__applyConfiguration()
             
             self.__settings = QtHelpDocumentationSettings.readSettings(
@@ -87,7 +88,8 @@
                 self.__settings.versions())
             self.filterSettingsWidget.readSettings(
                 self.__engine.filterEngine())
-        elif button == QDialogButtonBox.StandardButton.Ok:
+        elif button == self.buttonBox.button(
+                QDialogButtonBox.StandardButton.Ok):
             self.__applyConfiguration()
             self.accept()
     

--- a/eric7/WebBrowser/QtHelp/QtHelpDocumentationSettings.py	Tue Aug 31 17:48:20 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/QtHelpDocumentationSettings.py	Tue Aug 31 19:56:40 2021 +0200
@@ -109,7 +109,7 @@
         @return name of the namespace
         @rtype str
         """
-        return self._filenameToNamespace(filename)
+        return self._filenameToNamespace[filename]
     
     def components(self):
         """

--- a/eric7/WebBrowser/WebBrowserWindow.py	Tue Aug 31 17:48:20 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWindow.py	Tue Aug 31 19:56:40 2021 +0200
@@ -29,7 +29,7 @@
     QWebEngineSettings, QWebEnginePage, QWebEngineProfile, QWebEngineScript
 )
 try:
-    from PyQt6.QtHelp import QHelpEngine, QHelpEngineCore
+    from PyQt6.QtHelp import QHelpEngine, QHelpEngineCore, QHelpFilterData
     QTHELP_AVAILABLE = True
 except ImportError:
     QTHELP_AVAILABLE = False
@@ -3592,14 +3592,12 @@
         """
         if WebBrowserWindow._useQtHelp:
             unfiltered = self.tr("Unfiltered")
-            if unfiltered not in self.__helpEngine.customFilters():
-                hc = QHelpEngineCore(self.__helpEngine.collectionFile())
-                hc.addCustomFilter(unfiltered, [])
-                hc = None
-                del hc
+            filterEngine = self.__helpEngine.filterEngine()
+            if unfiltered not in filterEngine.filters():
+                filterEngine.setFilterData(unfiltered, QHelpFilterData())
                 
                 self.__helpEngine.blockSignals(True)
-                self.__helpEngine.setCurrentFilter(unfiltered)
+                filterEngine.setActiveFilter(unfiltered)
                 self.__helpEngine.blockSignals(False)
         
     def __warning(self, msg):