eric7/WebBrowser/WebBrowserWindow.py

branch
eric7
changeset 8421
cd4eee7f1d28
parent 8358
144a6b854f70
child 8422
bb5da74c1b3f
equal deleted inserted replaced
8420:ff89f8bac0a5 8421:cd4eee7f1d28
195 195
196 if WebBrowserWindow._useQtHelp: 196 if WebBrowserWindow._useQtHelp:
197 self.__helpEngine = QHelpEngine( 197 self.__helpEngine = QHelpEngine(
198 WebBrowserWindow.getQtHelpCollectionFileName(), 198 WebBrowserWindow.getQtHelpCollectionFileName(),
199 self) 199 self)
200 self.__helpEngine.setUsesFilterEngine(True)
200 self.__removeOldDocumentation() 201 self.__removeOldDocumentation()
201 self.__helpEngine.warning.connect(self.__warning) 202 self.__helpEngine.warning.connect(self.__warning)
202 else: 203 else:
203 self.__helpEngine = None 204 self.__helpEngine = None
204 self.__helpInstaller = None 205 self.__helpInstaller = None
2308 "ComboBoxWithEnoughWidth") 2309 "ComboBoxWithEnoughWidth")
2309 self.filterCombo.setMinimumWidth(comboWidth) 2310 self.filterCombo.setMinimumWidth(comboWidth)
2310 filtertb.addWidget(QLabel(self.tr("Filtered by: "))) 2311 filtertb.addWidget(QLabel(self.tr("Filtered by: ")))
2311 filtertb.addWidget(self.filterCombo) 2312 filtertb.addWidget(self.filterCombo)
2312 self.__helpEngine.setupFinished.connect(self.__setupFilterCombo) 2313 self.__helpEngine.setupFinished.connect(self.__setupFilterCombo)
2313 self.filterCombo.activated[int].connect( 2314 self.filterCombo.currentTextChanged.connect(
2314 self.__filterQtHelpDocumentation) 2315 self.__filterQtHelpDocumentation)
2315 self.__setupFilterCombo() 2316 self.__setupFilterCombo()
2316 self.__toolbars["filter"] = (filtertb.windowTitle(), filtertb) 2317 self.__toolbars["filter"] = (filtertb.windowTitle(), filtertb)
2317 2318
2318 settingstb = self.addToolBar(self.tr("Settings")) 2319 settingstb = self.addToolBar(self.tr("Settings"))
3434 def __setupFilterCombo(self): 3435 def __setupFilterCombo(self):
3435 """ 3436 """
3436 Private slot to setup the filter combo box. 3437 Private slot to setup the filter combo box.
3437 """ 3438 """
3438 if WebBrowserWindow._useQtHelp: 3439 if WebBrowserWindow._useQtHelp:
3439 curFilter = self.filterCombo.currentText() 3440 activeFilter = self.filterCombo.currentText()
3440 if not curFilter: 3441 if not activeFilter:
3441 curFilter = self.__helpEngine.currentFilter() 3442 activeFilter = self.__helpEngine.filterEngine().activeFilter()
3442 self.filterCombo.clear() 3443 self.filterCombo.clear()
3443 self.filterCombo.addItems(self.__helpEngine.customFilters()) 3444 self.filterCombo.addItems(sorted(
3444 idx = self.filterCombo.findText(curFilter) 3445 self.__helpEngine.filterEngine().filters()))
3445 if idx < 0: 3446 self.filterCombo.setCurrentText(activeFilter)
3446 idx = 0 3447
3447 self.filterCombo.setCurrentIndex(idx) 3448 def __filterQtHelpDocumentation(self, activeFilter):
3448
3449 def __filterQtHelpDocumentation(self, index):
3450 """ 3449 """
3451 Private slot to filter the QtHelp documentation. 3450 Private slot to filter the QtHelp documentation.
3452 3451
3453 @param index index of the selected entry 3452 @param activeFilter current text of the filter combobox
3454 @type int 3453 @type str
3455 """ 3454 """
3456 customFilter = self.filterCombo.itemText(index)
3457 if self.__helpEngine: 3455 if self.__helpEngine:
3458 self.__helpEngine.setCurrentFilter(customFilter) 3456 self.__helpEngine.filterEngine().setActiveFilter(activeFilter)
3459 3457
3460 def __manageQtHelpDocumentation(self): 3458 def __manageQtHelpDocumentation(self):
3461 """ 3459 """
3462 Private slot to manage the QtHelp documentation database. 3460 Private slot to manage the QtHelp documentation database.
3463 """ 3461 """

eric ide

mercurial