Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- branch
- safe_browsing
- changeset 5820
- b610cb5b501a
- parent 5793
- 4ff73b969ab1
- child 5842
- c3f41b959a65
equal
deleted
inserted
replaced
| 5819:69fa45e95673 | 5820:b610cb5b501a |
|---|---|
| 106 _flashCookieManager = None | 106 _flashCookieManager = None |
| 107 _imageSearchEngine = None | 107 _imageSearchEngine = None |
| 108 _autoScroller = None | 108 _autoScroller = None |
| 109 _tabManager = None | 109 _tabManager = None |
| 110 _sessionManager = None | 110 _sessionManager = None |
| 111 _safeBrowsingManager = None | |
| 111 | 112 |
| 112 _performingStartup = True | 113 _performingStartup = True |
| 113 _performingShutdown = False | 114 _performingShutdown = False |
| 114 _lastActiveWindow = None | 115 _lastActiveWindow = None |
| 115 | 116 |
| 1754 )) | 1755 )) |
| 1755 if not self.__initShortcutsOnly: | 1756 if not self.__initShortcutsOnly: |
| 1756 self.certificateErrorsAct.triggered.connect( | 1757 self.certificateErrorsAct.triggered.connect( |
| 1757 self.__showCertificateErrorsDialog) | 1758 self.__showCertificateErrorsDialog) |
| 1758 self.__actions.append(self.certificateErrorsAct) | 1759 self.__actions.append(self.certificateErrorsAct) |
| 1760 | |
| 1761 self.safeBrowsingAct = E5Action( | |
| 1762 self.tr('Manage Safe Browsing'), | |
| 1763 UI.PixmapCache.getIcon("safeBrowsing.png"), | |
| 1764 self.tr('Manage Safe Browsing...'), 0, 0, self, | |
| 1765 'webbrowser_manage_safe_browsing') | |
| 1766 self.safeBrowsingAct.setStatusTip(self.tr( | |
| 1767 'Configure Safe Browsing and manage local cache')) | |
| 1768 self.safeBrowsingAct.setWhatsThis(self.tr( | |
| 1769 """<b>Manage Safe Browsing</b>""" | |
| 1770 """<p>This opens a dialog to configure Safe Browsing and""" | |
| 1771 """ to manage the local cache.</p>""" | |
| 1772 )) | |
| 1773 if not self.__initShortcutsOnly: | |
| 1774 self.safeBrowsingAct.triggered.connect( | |
| 1775 self.__showSafeBrowsingDialog) | |
| 1776 self.__actions.append(self.safeBrowsingAct) | |
| 1759 | 1777 |
| 1760 self.showDownloadManagerAct = E5Action( | 1778 self.showDownloadManagerAct = E5Action( |
| 1761 self.tr('Downloads'), | 1779 self.tr('Downloads'), |
| 1762 self.tr('Downloads'), | 1780 self.tr('Downloads'), |
| 1763 0, 0, self, 'webbrowser_show_downloads') | 1781 0, 0, self, 'webbrowser_show_downloads') |
| 2082 menu.addAction(self.zoomValuesAct) | 2100 menu.addAction(self.zoomValuesAct) |
| 2083 menu.addAction(self.manageIconsAct) | 2101 menu.addAction(self.manageIconsAct) |
| 2084 menu.addSeparator() | 2102 menu.addSeparator() |
| 2085 menu.addAction(self.adblockAct) | 2103 menu.addAction(self.adblockAct) |
| 2086 menu.addSeparator() | 2104 menu.addSeparator() |
| 2105 menu.addAction(self.safeBrowsingAct) | |
| 2106 menu.addSeparator() | |
| 2087 self.__settingsMenu = menu | 2107 self.__settingsMenu = menu |
| 2088 self.__settingsMenu.aboutToShow.connect( | 2108 self.__settingsMenu.aboutToShow.connect( |
| 2089 self.__aboutToShowSettingsMenu) | 2109 self.__aboutToShowSettingsMenu) |
| 2090 | 2110 |
| 2091 from .UserAgent.UserAgentMenu import UserAgentMenu | 2111 from .UserAgent.UserAgentMenu import UserAgentMenu |
| 2202 menu.addSeparator() | 2222 menu.addSeparator() |
| 2203 menu.addAction(self.zoomValuesAct) | 2223 menu.addAction(self.zoomValuesAct) |
| 2204 menu.addAction(self.manageIconsAct) | 2224 menu.addAction(self.manageIconsAct) |
| 2205 menu.addSeparator() | 2225 menu.addSeparator() |
| 2206 menu.addAction(self.adblockAct) | 2226 menu.addAction(self.adblockAct) |
| 2227 menu.addSeparator() | |
| 2228 menu.addAction(self.safeBrowsingAct) | |
| 2207 menu.addSeparator() | 2229 menu.addSeparator() |
| 2208 menu.addMenu(self.__userAgentMenu) | 2230 menu.addMenu(self.__userAgentMenu) |
| 2209 menu.addAction(self.userAgentManagerAct) | 2231 menu.addAction(self.userAgentManagerAct) |
| 2210 menu.addSeparator() | 2232 menu.addSeparator() |
| 2211 if WebBrowserWindow._useQtHelp: | 2233 if WebBrowserWindow._useQtHelp: |
| 2943 if len(WebBrowserWindow.BrowserWindows) == 1: | 2965 if len(WebBrowserWindow.BrowserWindows) == 1: |
| 2944 # it is the last window | 2966 # it is the last window |
| 2945 self.tabManager().close() | 2967 self.tabManager().close() |
| 2946 | 2968 |
| 2947 self.networkManager().shutdown() | 2969 self.networkManager().shutdown() |
| 2970 | |
| 2971 self.safeBrowsingManager().close() | |
| 2948 | 2972 |
| 2949 for browser in WebBrowserWindow.BrowserWindows: | 2973 for browser in WebBrowserWindow.BrowserWindows: |
| 2950 if browser != self: | 2974 if browser != self: |
| 2951 browser.close() | 2975 browser.close() |
| 2952 self.close() | 2976 self.close() |
| 4831 def __showSessionManagerDialog(self): | 4855 def __showSessionManagerDialog(self): |
| 4832 """ | 4856 """ |
| 4833 Private slot to show the session manager dialog. | 4857 Private slot to show the session manager dialog. |
| 4834 """ | 4858 """ |
| 4835 self.sessionManager().showSessionManagerDialog() | 4859 self.sessionManager().showSessionManagerDialog() |
| 4860 | |
| 4861 ########################################################## | |
| 4862 ## Methods below implement safe browsing related functions | |
| 4863 ########################################################## | |
| 4864 | |
| 4865 @classmethod | |
| 4866 def safeBrowsingManager(cls): | |
| 4867 """ | |
| 4868 Class method to get a reference to the safe browsing interface. | |
| 4869 | |
| 4870 @return reference to the safe browsing manager | |
| 4871 @rtype SafeBrowsingManager | |
| 4872 """ | |
| 4873 if cls._safeBrowsingManager is None: | |
| 4874 from .SafeBrowsing.SafeBrowsingManager import SafeBrowsingManager | |
| 4875 cls._safeBrowsingManager = SafeBrowsingManager() | |
| 4876 | |
| 4877 return cls._safeBrowsingManager | |
| 4878 | |
| 4879 def __showSafeBrowsingDialog(self): | |
| 4880 """ | |
| 4881 Private slot to show the safe browsing management dialog. | |
| 4882 """ | |
| 4883 self.safeBrowsingManager().showSafeBrowsingDialog() |
