diff -r 2ee6af6381c8 -r 0dcb92a9687d eric6/WebBrowser/WebBrowserWindow.py
--- a/eric6/WebBrowser/WebBrowserWindow.py Tue Sep 10 19:36:17 2019 +0200
+++ b/eric6/WebBrowser/WebBrowserWindow.py Fri Sep 13 18:54:34 2019 +0200
@@ -1553,20 +1553,6 @@
self.__manageQtHelpDocumentation)
self.__actions.append(self.manageQtHelpDocsAct)
- self.manageQtHelpFiltersAct = E5Action(
- self.tr('Manage QtHelp Filters'),
- self.tr('Manage QtHelp &Filters'),
- 0, 0, self, 'webbrowser_qthelp_filters')
- self.manageQtHelpFiltersAct.setStatusTip(self.tr(
- 'Shows a dialog to manage the QtHelp filters'))
- self.manageQtHelpFiltersAct.setWhatsThis(self.tr(
- """<b>Manage QtHelp Filters</b>"""
- """<p>Shows a dialog to manage the QtHelp filters.</p>"""
- ))
- self.manageQtHelpFiltersAct.triggered.connect(
- self.__manageQtHelpFilters)
- self.__actions.append(self.manageQtHelpFiltersAct)
-
self.reindexDocumentationAct = E5Action(
self.tr('Reindex Documentation'),
self.tr('&Reindex Documentation'),
@@ -2110,7 +2096,6 @@
if WebBrowserWindow._useQtHelp:
menu.addAction(self.manageQtHelpDocsAct)
- menu.addAction(self.manageQtHelpFiltersAct)
menu.addAction(self.reindexDocumentationAct)
menu.addSeparator()
menu.addAction(self.clearPrivateDataAct)
@@ -2231,7 +2216,6 @@
menu.addSeparator()
if WebBrowserWindow._useQtHelp:
menu.addAction(self.manageQtHelpDocsAct)
- menu.addAction(self.manageQtHelpFiltersAct)
menu.addAction(self.reindexDocumentationAct)
menu.addSeparator()
menu.addAction(self.clearPrivateDataAct)
@@ -3512,9 +3496,10 @@
QtHelpDocumentationDialog
dlg = QtHelpDocumentationDialog(self.__helpEngine, self)
dlg.exec_()
- if dlg.hasChanges():
+ if dlg.hasDocumentationChanges():
for i in sorted(dlg.getTabsToClose(), reverse=True):
self.__tabWidget.closeBrowserAt(i)
+ self.__searchEngine.reindexDocumentation()
def getSourceFileList(self):
"""
@@ -3524,15 +3509,6 @@
"""
return self.__tabWidget.getSourceFileList()
- def __manageQtHelpFilters(self):
- """
- Private slot to manage the QtHelp filters.
- """
- if WebBrowserWindow._useQtHelp:
- from .QtHelp.QtHelpFiltersDialog import QtHelpFiltersDialog
- dlg = QtHelpFiltersDialog(self.__helpEngine, self)
- dlg.exec_()
-
def __indexingStarted(self):
"""
Private slot to handle the start of the indexing process.
