Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- branch
- QtWebEngine
- changeset 4907
- 1e3d61349671
- parent 4906
- 939ff20f712d
- child 4908
- f1859c36d564
equal
deleted
inserted
replaced
| 4906:939ff20f712d | 4907:1e3d61349671 |
|---|---|
| 138 | 138 |
| 139 self.__eventMouseButtons = Qt.NoButton | 139 self.__eventMouseButtons = Qt.NoButton |
| 140 self.__eventKeyboardModifiers = Qt.NoModifier | 140 self.__eventKeyboardModifiers = Qt.NoModifier |
| 141 | 141 |
| 142 if self.__initShortcutsOnly: | 142 if self.__initShortcutsOnly: |
| 143 WebBrowserWindow.setUseQtHelp( | |
| 144 self.__fromEric or qthelp or bool(searchWord)) | |
| 143 self.__initActions() | 145 self.__initActions() |
| 144 else: | 146 else: |
| 145 if Preferences.getWebBrowser("WebInspectorEnabled"): | 147 if Preferences.getWebBrowser("WebInspectorEnabled"): |
| 146 os.putenv( | 148 os.putenv( |
| 147 "QTWEBENGINE_REMOTE_DEBUGGING", | 149 "QTWEBENGINE_REMOTE_DEBUGGING", |
| 167 | 169 |
| 168 if not self.__fromEric: | 170 if not self.__fromEric: |
| 169 self.setStyle(Preferences.getUI("Style"), | 171 self.setStyle(Preferences.getUI("Style"), |
| 170 Preferences.getUI("StyleSheet")) | 172 Preferences.getUI("StyleSheet")) |
| 171 | 173 |
| 172 # TODO: Check if this is needed with QtWebEngine | |
| 173 # initialize some SSL stuff | 174 # initialize some SSL stuff |
| 174 ## from E5Network.E5SslUtilities import initSSL | 175 from E5Network.E5SslUtilities import initSSL |
| 175 ## initSSL() | 176 initSSL() |
| 176 | 177 |
| 177 if WebBrowserWindow.useQtHelp: | 178 if WebBrowserWindow.useQtHelp: |
| 178 self.__helpEngine = QHelpEngine( | 179 self.__helpEngine = QHelpEngine( |
| 179 os.path.join(Utilities.getConfigDir(), | 180 os.path.join(Utilities.getConfigDir(), |
| 180 "web_browser", "eric6help.qhc"), | 181 "web_browser", "eric6help.qhc"), |
