Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- branch
- QtWebEngine
- changeset 4858
- 19dff9c9cf26
- parent 4847
- a1a8eac81b54
- child 4859
- 36c4b21c9f7b
equal
deleted
inserted
replaced
| 4857:8dba5fb92f12 | 4858:19dff9c9cf26 |
|---|---|
| 51 import UI.PixmapCache | 51 import UI.PixmapCache |
| 52 import UI.Config | 52 import UI.Config |
| 53 from UI.Info import Version | 53 from UI.Info import Version |
| 54 ## | 54 ## |
| 55 ##from .data import icons_rc # __IGNORE_WARNING__ | 55 ##from .data import icons_rc # __IGNORE_WARNING__ |
| 56 ##from .data import html_rc # __IGNORE_WARNING__ | 56 from .data import html_rc # __IGNORE_WARNING__ |
| 57 from .data import javascript_rc # __IGNORE_WARNING__ | 57 from .data import javascript_rc # __IGNORE_WARNING__ |
| 58 | 58 |
| 59 | 59 |
| 60 from .Tools import Scripts, WebBrowserTools, WebIconProvider | 60 from .Tools import Scripts, WebBrowserTools, WebIconProvider |
| 61 | 61 |
| 87 _cookieJar = None | 87 _cookieJar = None |
| 88 ## _helpEngine = None | 88 ## _helpEngine = None |
| 89 _bookmarksManager = None | 89 _bookmarksManager = None |
| 90 _historyManager = None | 90 _historyManager = None |
| 91 _passwordManager = None | 91 _passwordManager = None |
| 92 ## _adblockManager = None | 92 _adblockManager = None |
| 93 _downloadManager = None | 93 _downloadManager = None |
| 94 _feedsManager = None | 94 _feedsManager = None |
| 95 ## _userAgentsManager = None | 95 ## _userAgentsManager = None |
| 96 _syncManager = None | 96 _syncManager = None |
| 97 ## _speedDial = None | 97 ## _speedDial = None |
| 153 ## from .HelpTocWidget import HelpTocWidget | 153 ## from .HelpTocWidget import HelpTocWidget |
| 154 ## from .HelpIndexWidget import HelpIndexWidget | 154 ## from .HelpIndexWidget import HelpIndexWidget |
| 155 ## from .HelpSearchWidget import HelpSearchWidget | 155 ## from .HelpSearchWidget import HelpSearchWidget |
| 156 from .WebBrowserView import WebBrowserView | 156 from .WebBrowserView import WebBrowserView |
| 157 from .WebBrowserTabWidget import WebBrowserTabWidget | 157 from .WebBrowserTabWidget import WebBrowserTabWidget |
| 158 # TODO: AdBlock | 158 from .AdBlock.AdBlockIcon import AdBlockIcon |
| 159 ## from .AdBlock.AdBlockIcon import AdBlockIcon | |
| 160 from .VirusTotal.VirusTotalApi import VirusTotalAPI | 159 from .VirusTotal.VirusTotalApi import VirusTotalAPI |
| 161 | 160 |
| 162 # TODO: allow using Qt Help even if not called from eric6 | 161 # TODO: allow using Qt Help even if not called from eric6 |
| 163 WebBrowserWindow.setUseQtHelp(self.__fromEric) | 162 WebBrowserWindow.setUseQtHelp(self.__fromEric) |
| 164 | 163 |
| 284 syncMgr.syncError.connect(self.statusBar().showMessage) | 283 syncMgr.syncError.connect(self.statusBar().showMessage) |
| 285 | 284 |
| 286 self.__tabWidget.newBrowser(home) | 285 self.__tabWidget.newBrowser(home) |
| 287 self.__tabWidget.currentBrowser().setFocus() | 286 self.__tabWidget.currentBrowser().setFocus() |
| 288 | 287 |
| 289 # TODO: AdBlock | 288 self.__adBlockIcon = AdBlockIcon(self) |
| 290 ## self.__adBlockIcon = AdBlockIcon(self) | 289 self.statusBar().addPermanentWidget(self.__adBlockIcon) |
| 291 ## self.statusBar().addPermanentWidget(self.__adBlockIcon) | 290 self.__adBlockIcon.setEnabled( |
| 292 ## self.__adBlockIcon.setEnabled( | 291 Preferences.getWebBrowser("AdBlockEnabled")) |
| 293 ## Preferences.getWebBrowser("AdBlockEnabled")) | 292 self.__tabWidget.currentChanged[int].connect( |
| 294 ## self.__tabWidget.currentChanged[int].connect( | 293 self.__adBlockIcon.currentChanged) |
| 295 ## self.__adBlockIcon.currentChanged) | 294 self.__tabWidget.sourceChanged.connect( |
| 296 ## self.__tabWidget.sourceChanged.connect( | 295 self.__adBlockIcon.sourceChanged) |
| 297 ## self.__adBlockIcon.sourceChanged) | 296 |
| 298 ## | |
| 299 self.networkIcon = E5NetworkIcon(self) | 297 self.networkIcon = E5NetworkIcon(self) |
| 300 self.statusBar().addPermanentWidget(self.networkIcon) | 298 self.statusBar().addPermanentWidget(self.networkIcon) |
| 301 | 299 |
| 302 QDesktopServices.setUrlHandler("http", self.__linkActivated) | 300 QDesktopServices.setUrlHandler("http", self.__linkActivated) |
| 303 QDesktopServices.setUrlHandler("https", self.__linkActivated) | 301 QDesktopServices.setUrlHandler("https", self.__linkActivated) |
| 2551 | 2549 |
| 2552 self.historyManager().close() | 2550 self.historyManager().close() |
| 2553 | 2551 |
| 2554 self.passwordManager().close() | 2552 self.passwordManager().close() |
| 2555 | 2553 |
| 2556 # TODO: AdBlock | 2554 self.adBlockManager().close() |
| 2557 ## self.adBlockManager().close() | 2555 |
| 2558 ## | |
| 2559 # TODO: UserAgents | 2556 # TODO: UserAgents |
| 2560 ## self.userAgentsManager().close() | 2557 ## self.userAgentsManager().close() |
| 2561 ## | 2558 ## |
| 2562 # TODO: SpeedDial | 2559 # TODO: SpeedDial |
| 2563 ## self.speedDial().close() | 2560 ## self.speedDial().close() |
| 2631 | 2628 |
| 2632 def __reload(self): | 2629 def __reload(self): |
| 2633 """ | 2630 """ |
| 2634 Private slot called to handle the reload action. | 2631 Private slot called to handle the reload action. |
| 2635 """ | 2632 """ |
| 2636 self.currentBrowser().reloadBypassingCache() | 2633 ## self.currentBrowser().reloadBypassingCache() |
| 2634 self.currentBrowser().reload() | |
| 2637 | 2635 |
| 2638 def __stopLoading(self): | 2636 def __stopLoading(self): |
| 2639 """ | 2637 """ |
| 2640 Private slot called to handle loading of the current page. | 2638 Private slot called to handle loading of the current page. |
| 2641 """ | 2639 """ |
| 3575 from .Passwords.PasswordManager import PasswordManager | 3573 from .Passwords.PasswordManager import PasswordManager |
| 3576 cls._passwordManager = PasswordManager() | 3574 cls._passwordManager = PasswordManager() |
| 3577 | 3575 |
| 3578 return cls._passwordManager | 3576 return cls._passwordManager |
| 3579 | 3577 |
| 3580 # TODO: AdBlock | 3578 @classmethod |
| 3581 ## @classmethod | 3579 def adBlockManager(cls): |
| 3582 ## def adBlockManager(cls): | 3580 """ |
| 3583 ## """ | 3581 Class method to get a reference to the AdBlock manager. |
| 3584 ## Class method to get a reference to the AdBlock manager. | 3582 |
| 3585 ## | 3583 @return reference to the AdBlock manager (AdBlockManager) |
| 3586 ## @return reference to the AdBlock manager (AdBlockManager) | 3584 """ |
| 3587 ## """ | 3585 if cls._adblockManager is None: |
| 3588 ## if cls._adblockManager is None: | 3586 from .AdBlock.AdBlockManager import AdBlockManager |
| 3589 ## from .AdBlock.AdBlockManager import AdBlockManager | 3587 cls._adblockManager = AdBlockManager() |
| 3590 ## cls._adblockManager = AdBlockManager() | 3588 |
| 3591 ## | 3589 return cls._adblockManager |
| 3592 ## return cls._adblockManager | 3590 |
| 3593 ## | 3591 def adBlockIcon(self): |
| 3594 ## def adBlockIcon(self): | 3592 """ |
| 3595 ## """ | 3593 Public method to get a reference to the AdBlock icon. |
| 3596 ## Public method to get a reference to the AdBlock icon. | 3594 |
| 3597 ## | 3595 @return reference to the AdBlock icon (AdBlockIcon) |
| 3598 ## @return reference to the AdBlock icon (AdBlockIcon) | 3596 """ |
| 3599 ## """ | 3597 return self.__adBlockIcon |
| 3600 ## return self.__adBlockIcon | 3598 |
| 3601 ## | |
| 3602 @classmethod | 3599 @classmethod |
| 3603 def downloadManager(cls): | 3600 def downloadManager(cls): |
| 3604 """ | 3601 """ |
| 3605 Class method to get a reference to the download manager. | 3602 Class method to get a reference to the download manager. |
| 3606 | 3603 |
