Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- branch
- QtWebEngine
- changeset 4845
- 2d22ff71c005
- parent 4826
- aa752e6e9eba
- child 4847
- a1a8eac81b54
equal
deleted
inserted
replaced
| 4840:69ee7965ba27 | 4845:2d22ff71c005 |
|---|---|
| 82 UseQtHelp = QTHELP_AVAILABLE | 82 UseQtHelp = QTHELP_AVAILABLE |
| 83 _isPrivate = False | 83 _isPrivate = False |
| 84 | 84 |
| 85 _webProfile = None | 85 _webProfile = None |
| 86 _networkManager = None | 86 _networkManager = None |
| 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 |
| 1263 if not self.__initShortcutsOnly: | 1263 if not self.__initShortcutsOnly: |
| 1264 self.acceptedLanguagesAct.triggered.connect( | 1264 self.acceptedLanguagesAct.triggered.connect( |
| 1265 self.__showAcceptedLanguages) | 1265 self.__showAcceptedLanguages) |
| 1266 self.__actions.append(self.acceptedLanguagesAct) | 1266 self.__actions.append(self.acceptedLanguagesAct) |
| 1267 | 1267 |
| 1268 # TODO: Cookies | 1268 self.cookiesAct = E5Action( |
| 1269 ## self.cookiesAct = E5Action( | 1269 self.tr('Cookies'), |
| 1270 ## self.tr('Cookies'), | 1270 UI.PixmapCache.getIcon("cookie.png"), |
| 1271 ## UI.PixmapCache.getIcon("cookie.png"), | 1271 self.tr('C&ookies...'), 0, 0, self, 'webbrowser_cookies') |
| 1272 ## self.tr('C&ookies...'), 0, 0, self, 'webbrowser_cookies') | 1272 self.cookiesAct.setStatusTip(self.tr( |
| 1273 ## self.cookiesAct.setStatusTip(self.tr( | 1273 'Configure cookies handling')) |
| 1274 ## 'Configure cookies handling')) | 1274 self.cookiesAct.setWhatsThis(self.tr( |
| 1275 ## self.cookiesAct.setWhatsThis(self.tr( | 1275 """<b>Cookies</b>""" |
| 1276 ## """<b>Cookies</b>""" | 1276 """<p>Configure cookies handling.</p>""" |
| 1277 ## """<p>Configure cookies handling.</p>""" | 1277 )) |
| 1278 ## )) | 1278 if not self.__initShortcutsOnly: |
| 1279 ## if not self.__initShortcutsOnly: | 1279 self.cookiesAct.triggered.connect( |
| 1280 ## self.cookiesAct.triggered.connect( | 1280 self.__showCookiesConfiguration) |
| 1281 ## self.__showCookiesConfiguration) | 1281 self.__actions.append(self.cookiesAct) |
| 1282 ## self.__actions.append(self.cookiesAct) | |
| 1283 | 1282 |
| 1284 self.flashCookiesAct = E5Action( | 1283 self.flashCookiesAct = E5Action( |
| 1285 self.tr('Flash Cookies'), | 1284 self.tr('Flash Cookies'), |
| 1286 UI.PixmapCache.getIcon("flashCookie.png"), | 1285 UI.PixmapCache.getIcon("flashCookie.png"), |
| 1287 self.tr('&Flash Cookies...'), 0, 0, self, | 1286 self.tr('&Flash Cookies...'), 0, 0, self, |
| 1896 | 1895 |
| 1897 menu = mb.addMenu(self.tr('&Settings')) | 1896 menu = mb.addMenu(self.tr('&Settings')) |
| 1898 menu.setTearOffEnabled(True) | 1897 menu.setTearOffEnabled(True) |
| 1899 menu.addAction(self.prefAct) | 1898 menu.addAction(self.prefAct) |
| 1900 menu.addAction(self.acceptedLanguagesAct) | 1899 menu.addAction(self.acceptedLanguagesAct) |
| 1901 ## menu.addAction(self.cookiesAct) | 1900 menu.addAction(self.cookiesAct) |
| 1902 menu.addAction(self.flashCookiesAct) | 1901 menu.addAction(self.flashCookiesAct) |
| 1903 ## menu.addAction(self.offlineStorageAct) | 1902 ## menu.addAction(self.offlineStorageAct) |
| 1904 menu.addAction(self.personalDataAct) | 1903 menu.addAction(self.personalDataAct) |
| 1905 menu.addAction(self.greaseMonkeyAct) | 1904 menu.addAction(self.greaseMonkeyAct) |
| 1906 menu.addAction(self.featurePermissionAct) | 1905 menu.addAction(self.featurePermissionAct) |
| 2046 settingstb = self.addToolBar(self.tr("Settings")) | 2045 settingstb = self.addToolBar(self.tr("Settings")) |
| 2047 settingstb.setObjectName("SettingsToolBar") | 2046 settingstb.setObjectName("SettingsToolBar") |
| 2048 settingstb.setIconSize(UI.Config.ToolBarIconSize) | 2047 settingstb.setIconSize(UI.Config.ToolBarIconSize) |
| 2049 settingstb.addAction(self.prefAct) | 2048 settingstb.addAction(self.prefAct) |
| 2050 settingstb.addAction(self.acceptedLanguagesAct) | 2049 settingstb.addAction(self.acceptedLanguagesAct) |
| 2051 ## settingstb.addAction(self.cookiesAct) | 2050 settingstb.addAction(self.cookiesAct) |
| 2052 settingstb.addAction(self.flashCookiesAct) | 2051 settingstb.addAction(self.flashCookiesAct) |
| 2053 ## settingstb.addAction(self.offlineStorageAct) | 2052 ## settingstb.addAction(self.offlineStorageAct) |
| 2054 settingstb.addAction(self.personalDataAct) | 2053 settingstb.addAction(self.personalDataAct) |
| 2055 settingstb.addAction(self.greaseMonkeyAct) | 2054 settingstb.addAction(self.greaseMonkeyAct) |
| 2056 settingstb.addAction(self.featurePermissionAct) | 2055 settingstb.addAction(self.featurePermissionAct) |
| 2543 self.downloadManager().shutdown() | 2542 self.downloadManager().shutdown() |
| 2544 | 2543 |
| 2545 # TODO: Network Monitor | 2544 # TODO: Network Monitor |
| 2546 ## self.__closeNetworkMonitor() | 2545 ## self.__closeNetworkMonitor() |
| 2547 ## | 2546 ## |
| 2548 # TODO: Cookies | 2547 self.cookieJar().close() |
| 2549 ## self.cookieJar().close() | 2548 |
| 2550 ## | |
| 2551 self.bookmarksToolBar.setModel(None) | 2549 self.bookmarksToolBar.setModel(None) |
| 2552 self.bookmarksManager().close() | 2550 self.bookmarksManager().close() |
| 2553 | 2551 |
| 2554 self.historyManager().close() | 2552 self.historyManager().close() |
| 2555 | 2553 |
| 2870 from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog | 2868 from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog |
| 2871 dlg = WebBrowserLanguagesDialog(self) | 2869 dlg = WebBrowserLanguagesDialog(self) |
| 2872 dlg.exec_() | 2870 dlg.exec_() |
| 2873 self.networkManager().languagesChanged() | 2871 self.networkManager().languagesChanged() |
| 2874 | 2872 |
| 2875 # TODO: Cookies | 2873 def __showCookiesConfiguration(self): |
| 2876 ## def __showCookiesConfiguration(self): | 2874 """ |
| 2877 ## """ | 2875 Private slot to configure the cookies handling. |
| 2878 ## Private slot to configure the cookies handling. | 2876 """ |
| 2879 ## """ | 2877 from .CookieJar.CookiesConfigurationDialog import \ |
| 2880 ## from .CookieJar.CookiesConfigurationDialog import \ | 2878 CookiesConfigurationDialog |
| 2881 ## CookiesConfigurationDialog | 2879 dlg = CookiesConfigurationDialog(self) |
| 2882 ## dlg = CookiesConfigurationDialog(self) | 2880 dlg.exec_() |
| 2883 ## dlg.exec_() | |
| 2884 | 2881 |
| 2885 def __showFlashCookiesManagement(self): | 2882 def __showFlashCookiesManagement(self): |
| 2886 """ | 2883 """ |
| 2887 Private slot to show the flash cookies management dialog. | 2884 Private slot to show the flash cookies management dialog. |
| 2888 """ | 2885 """ |
| 2939 from .Network.NetworkManager import NetworkManager | 2936 from .Network.NetworkManager import NetworkManager |
| 2940 cls._networkManager = NetworkManager() | 2937 cls._networkManager = NetworkManager() |
| 2941 | 2938 |
| 2942 return cls._networkManager | 2939 return cls._networkManager |
| 2943 | 2940 |
| 2944 # TODO: Cookies | 2941 @classmethod |
| 2945 ## @classmethod | 2942 def cookieJar(cls): |
| 2946 ## def cookieJar(cls): | 2943 """ |
| 2947 ## """ | 2944 Class method to get a reference to the cookie jar. |
| 2948 ## Class method to get a reference to the cookie jar. | 2945 |
| 2949 ## | 2946 @return reference to the cookie jar (CookieJar) |
| 2950 ## @return reference to the cookie jar (CookieJar) | 2947 """ |
| 2951 ## """ | 2948 if cls._cookieJar is None: |
| 2952 ## from .CookieJar.CookieJar import CookieJar | 2949 from .CookieJar.CookieJar import CookieJar |
| 2953 ## cls._cookieJar = CookieJar() | 2950 cls._cookieJar = CookieJar() |
| 2954 ## return cls.networkManager().cookieJar() | 2951 |
| 2955 ## | 2952 return cls._cookieJar |
| 2953 | |
| 2956 def __clearIconsDatabase(self): | 2954 def __clearIconsDatabase(self): |
| 2957 """ | 2955 """ |
| 2958 Private slot to clear the favicons databse. | 2956 Private slot to clear the favicons databse. |
| 2959 """ | 2957 """ |
| 2960 WebIconProvider.instance().clear() | 2958 WebIconProvider.instance().clear() |
| 3346 self.__clearIconsDatabase() | 3344 self.__clearIconsDatabase() |
| 3347 if cache: | 3345 if cache: |
| 3348 cachePath = self.webProfile().cachePath() | 3346 cachePath = self.webProfile().cachePath() |
| 3349 if cachePath: | 3347 if cachePath: |
| 3350 shutil.rmtree(cachePath) | 3348 shutil.rmtree(cachePath) |
| 3351 # TODO: Cookies | 3349 if cookies: |
| 3352 ## if cookies: | 3350 self.cookieJar().clear() |
| 3353 ## self.cookieJar().clear() | |
| 3354 if passwords: | 3351 if passwords: |
| 3355 self.passwordManager().clear() | 3352 self.passwordManager().clear() |
| 3356 # TODO: Web Databases | 3353 # TODO: Web Databases |
| 3357 ## if databases: | 3354 ## if databases: |
| 3358 ## if hasattr(QWebDatabase, "removeAllDatabases"): | 3355 ## if hasattr(QWebDatabase, "removeAllDatabases"): |
