Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- changeset 6630
- bddd12f27a4c
- parent 6627
- acd62f281a99
- child 6634
- 0ee9b45c24be
equal
deleted
inserted
replaced
| 6629:643ec3a53d17 | 6630:bddd12f27a4c |
|---|---|
| 127 @type str | 127 @type str |
| 128 @param parent parent widget of this window | 128 @param parent parent widget of this window |
| 129 @type QWidget | 129 @type QWidget |
| 130 @param name name of this window | 130 @param name name of this window |
| 131 @type str | 131 @type str |
| 132 @keyparam searchWord word to search for | 132 @param searchWord word to search for |
| 133 @type str | 133 @type str |
| 134 @keyparam private flag indicating a private browsing window | 134 @param private flag indicating a private browsing window |
| 135 @type bool | 135 @type bool |
| 136 @keyparam qthelp flag indicating to enable the QtHelp support | 136 @param qthelp flag indicating to enable the QtHelp support |
| 137 @type bool | 137 @type bool |
| 138 @keyparam settingsDir directory to be used for the settings files | 138 @param settingsDir directory to be used for the settings files |
| 139 @type str | 139 @type str |
| 140 @keyparam restoreSession flag indicating a restore session action | 140 @param restoreSession flag indicating a restore session action |
| 141 @type bool | 141 @type bool |
| 142 @param single flag indicating to start in single application mode | 142 @param single flag indicating to start in single application mode |
| 143 @type bool | 143 @type bool |
| 144 @param saname name to be used for the single application server | 144 @param saname name to be used for the single application server |
| 145 @type str | 145 @type str |
| 2357 | 2357 |
| 2358 settingstb = self.addToolBar(self.tr("Settings")) | 2358 settingstb = self.addToolBar(self.tr("Settings")) |
| 2359 settingstb.setObjectName("SettingsToolBar") | 2359 settingstb.setObjectName("SettingsToolBar") |
| 2360 settingstb.setIconSize(UI.Config.ToolBarIconSize) | 2360 settingstb.setIconSize(UI.Config.ToolBarIconSize) |
| 2361 settingstb.addAction(self.prefAct) | 2361 settingstb.addAction(self.prefAct) |
| 2362 settingstb.addAction(self.shortcutsAct) | |
| 2362 settingstb.addAction(self.acceptedLanguagesAct) | 2363 settingstb.addAction(self.acceptedLanguagesAct) |
| 2363 settingstb.addAction(self.cookiesAct) | 2364 settingstb.addAction(self.cookiesAct) |
| 2364 settingstb.addAction(self.flashCookiesAct) | 2365 settingstb.addAction(self.flashCookiesAct) |
| 2365 settingstb.addAction(self.personalDataAct) | 2366 settingstb.addAction(self.personalDataAct) |
| 2366 settingstb.addAction(self.greaseMonkeyAct) | 2367 settingstb.addAction(self.greaseMonkeyAct) |
| 3196 """ | 3197 """ |
| 3197 Private slot to set the preferences. | 3198 Private slot to set the preferences. |
| 3198 """ | 3199 """ |
| 3199 from Preferences.ConfigurationDialog import ConfigurationDialog | 3200 from Preferences.ConfigurationDialog import ConfigurationDialog |
| 3200 dlg = ConfigurationDialog( | 3201 dlg = ConfigurationDialog( |
| 3201 self, 'Configuration', True, fromEric=self.__fromEric, | 3202 self, 'Configuration', True, fromEric=False, |
| 3202 displayMode=ConfigurationDialog.WebBrowserMode) | 3203 displayMode=ConfigurationDialog.WebBrowserMode) |
| 3203 dlg.preferencesChanged.connect(self.preferencesChanged) | 3204 dlg.preferencesChanged.connect(self.preferencesChanged) |
| 3204 dlg.masterPasswordChanged.connect( | 3205 dlg.masterPasswordChanged.connect( |
| 3205 lambda old, new: self.masterPasswordChanged(old, new, local=True)) | 3206 lambda old, new: self.masterPasswordChanged(old, new, local=True)) |
| 3206 dlg.show() | 3207 dlg.show() |
| 3584 | 3585 |
| 3585 def __removeOldDocumentation(self): | 3586 def __removeOldDocumentation(self): |
| 3586 """ | 3587 """ |
| 3587 Private slot to remove non-existing documentation from the help engine. | 3588 Private slot to remove non-existing documentation from the help engine. |
| 3588 """ | 3589 """ |
| 3589 for namespace in self.__helpEngine.registeredDocumentations(): | 3590 if WebBrowserWindow._useQtHelp: |
| 3590 docFile = self.__helpEngine.documentationFileName(namespace) | 3591 for namespace in self.__helpEngine.registeredDocumentations(): |
| 3591 if not os.path.exists(docFile): | 3592 docFile = self.__helpEngine.documentationFileName(namespace) |
| 3592 self.__helpEngine.unregisterDocumentation(namespace) | 3593 if not os.path.exists(docFile): |
| 3594 self.__helpEngine.unregisterDocumentation(namespace) | |
| 3593 | 3595 |
| 3594 def __lookForNewDocumentation(self): | 3596 def __lookForNewDocumentation(self): |
| 3595 """ | 3597 """ |
| 3596 Private slot to look for new documentation to be loaded into the | 3598 Private slot to look for new documentation to be loaded into the |
| 3597 help database. | 3599 help database. |
