Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- branch
- QtWebEngine
- changeset 4754
- 1ff6d0ecb2fd
- parent 4753
- 8d2ea02ed785
- child 4758
- c973eef8fef1
equal
deleted
inserted
replaced
| 4753:8d2ea02ed785 | 4754:1ff6d0ecb2fd |
|---|---|
| 1237 )) | 1237 )) |
| 1238 if not self.__initShortcutsOnly: | 1238 if not self.__initShortcutsOnly: |
| 1239 self.prefAct.triggered.connect(self.__showPreferences) | 1239 self.prefAct.triggered.connect(self.__showPreferences) |
| 1240 self.__actions.append(self.prefAct) | 1240 self.__actions.append(self.prefAct) |
| 1241 | 1241 |
| 1242 # TODO: Languages | 1242 self.acceptedLanguagesAct = E5Action( |
| 1243 ## self.acceptedLanguagesAct = E5Action( | 1243 self.tr('Languages'), |
| 1244 ## self.tr('Languages'), | 1244 UI.PixmapCache.getIcon("flag.png"), |
| 1245 ## UI.PixmapCache.getIcon("flag.png"), | 1245 self.tr('&Languages...'), 0, 0, |
| 1246 ## self.tr('&Languages...'), 0, 0, | 1246 self, 'webbrowser_accepted_languages') |
| 1247 ## self, 'webbrowser_accepted_languages') | 1247 self.acceptedLanguagesAct.setStatusTip(self.tr( |
| 1248 ## self.acceptedLanguagesAct.setStatusTip(self.tr( | 1248 'Configure the accepted languages for web pages')) |
| 1249 ## 'Configure the accepted languages for web pages')) | 1249 self.acceptedLanguagesAct.setWhatsThis(self.tr( |
| 1250 ## self.acceptedLanguagesAct.setWhatsThis(self.tr( | 1250 """<b>Languages</b>""" |
| 1251 ## """<b>Languages</b>""" | 1251 """<p>Configure the accepted languages for web pages.</p>""" |
| 1252 ## """<p>Configure the accepted languages for web pages.</p>""" | 1252 )) |
| 1253 ## )) | 1253 if not self.__initShortcutsOnly: |
| 1254 ## if not self.__initShortcutsOnly: | 1254 self.acceptedLanguagesAct.triggered.connect( |
| 1255 ## self.acceptedLanguagesAct.triggered.connect( | 1255 self.__showAcceptedLanguages) |
| 1256 ## self.__showAcceptedLanguages) | 1256 self.__actions.append(self.acceptedLanguagesAct) |
| 1257 ## self.__actions.append(self.acceptedLanguagesAct) | |
| 1258 | 1257 |
| 1259 # TODO: Cookies | 1258 # TODO: Cookies |
| 1260 ## self.cookiesAct = E5Action( | 1259 ## self.cookiesAct = E5Action( |
| 1261 ## self.tr('Cookies'), | 1260 ## self.tr('Cookies'), |
| 1262 ## UI.PixmapCache.getIcon("cookie.png"), | 1261 ## UI.PixmapCache.getIcon("cookie.png"), |
| 1273 ## self.__actions.append(self.cookiesAct) | 1272 ## self.__actions.append(self.cookiesAct) |
| 1274 | 1273 |
| 1275 self.flashCookiesAct = E5Action( | 1274 self.flashCookiesAct = E5Action( |
| 1276 self.tr('Flash Cookies'), | 1275 self.tr('Flash Cookies'), |
| 1277 UI.PixmapCache.getIcon("flashCookie.png"), | 1276 UI.PixmapCache.getIcon("flashCookie.png"), |
| 1278 self.tr('&Flash Cookies...'), 0, 0, self, 'webbrowser_flash_cookies') | 1277 self.tr('&Flash Cookies...'), 0, 0, self, |
| 1278 'webbrowser_flash_cookies') | |
| 1279 self.flashCookiesAct.setStatusTip(self.tr( | 1279 self.flashCookiesAct.setStatusTip(self.tr( |
| 1280 'Manage flash cookies')) | 1280 'Manage flash cookies')) |
| 1281 self.flashCookiesAct.setWhatsThis(self.tr( | 1281 self.flashCookiesAct.setWhatsThis(self.tr( |
| 1282 """<b>Flash Cookies</b>""" | 1282 """<b>Flash Cookies</b>""" |
| 1283 """<p>Show a dialog to manage the flash cookies.</p>""" | 1283 """<p>Show a dialog to manage the flash cookies.</p>""" |
| 1840 self.bookmarksMenu.setInitialActions(bookmarksActions) | 1840 self.bookmarksMenu.setInitialActions(bookmarksActions) |
| 1841 | 1841 |
| 1842 menu = mb.addMenu(self.tr('&Settings')) | 1842 menu = mb.addMenu(self.tr('&Settings')) |
| 1843 menu.setTearOffEnabled(True) | 1843 menu.setTearOffEnabled(True) |
| 1844 menu.addAction(self.prefAct) | 1844 menu.addAction(self.prefAct) |
| 1845 ## menu.addAction(self.acceptedLanguagesAct) | 1845 menu.addAction(self.acceptedLanguagesAct) |
| 1846 ## menu.addAction(self.cookiesAct) | 1846 ## menu.addAction(self.cookiesAct) |
| 1847 menu.addAction(self.flashCookiesAct) | 1847 menu.addAction(self.flashCookiesAct) |
| 1848 ## menu.addAction(self.offlineStorageAct) | 1848 ## menu.addAction(self.offlineStorageAct) |
| 1849 menu.addAction(self.personalDataAct) | 1849 menu.addAction(self.personalDataAct) |
| 1850 ## menu.addAction(self.greaseMonkeyAct) | 1850 ## menu.addAction(self.greaseMonkeyAct) |
| 1982 | 1982 |
| 1983 settingstb = self.addToolBar(self.tr("Settings")) | 1983 settingstb = self.addToolBar(self.tr("Settings")) |
| 1984 settingstb.setObjectName("SettingsToolBar") | 1984 settingstb.setObjectName("SettingsToolBar") |
| 1985 settingstb.setIconSize(UI.Config.ToolBarIconSize) | 1985 settingstb.setIconSize(UI.Config.ToolBarIconSize) |
| 1986 settingstb.addAction(self.prefAct) | 1986 settingstb.addAction(self.prefAct) |
| 1987 ## settingstb.addAction(self.acceptedLanguagesAct) | 1987 settingstb.addAction(self.acceptedLanguagesAct) |
| 1988 ## settingstb.addAction(self.cookiesAct) | 1988 ## settingstb.addAction(self.cookiesAct) |
| 1989 settingstb.addAction(self.flashCookiesAct) | 1989 settingstb.addAction(self.flashCookiesAct) |
| 1990 ## settingstb.addAction(self.offlineStorageAct) | 1990 ## settingstb.addAction(self.offlineStorageAct) |
| 1991 settingstb.addAction(self.personalDataAct) | 1991 settingstb.addAction(self.personalDataAct) |
| 1992 ## settingstb.addAction(self.greaseMonkeyAct) | 1992 ## settingstb.addAction(self.greaseMonkeyAct) |
| 2820 if self.__fromEric and isinstance(self.sender(), ConfigurationDialog): | 2820 if self.__fromEric and isinstance(self.sender(), ConfigurationDialog): |
| 2821 # we were called from our local configuration dialog | 2821 # we were called from our local configuration dialog |
| 2822 Preferences.convertPasswords(oldPassword, newPassword) | 2822 Preferences.convertPasswords(oldPassword, newPassword) |
| 2823 Utilities.crypto.changeRememberedMaster(newPassword) | 2823 Utilities.crypto.changeRememberedMaster(newPassword) |
| 2824 | 2824 |
| 2825 ## def __showAcceptedLanguages(self): | 2825 def __showAcceptedLanguages(self): |
| 2826 ## """ | 2826 """ |
| 2827 ## Private slot to configure the accepted languages for web pages. | 2827 Private slot to configure the accepted languages for web pages. |
| 2828 ## """ | 2828 """ |
| 2829 ## from .HelpLanguagesDialog import HelpLanguagesDialog | 2829 from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog |
| 2830 ## dlg = HelpLanguagesDialog(self) | 2830 dlg = WebBrowserLanguagesDialog(self) |
| 2831 ## dlg.exec_() | 2831 dlg.exec_() |
| 2832 ## self.networkAccessManager().languagesChanged() | 2832 self.networkManager().languagesChanged() |
| 2833 | 2833 |
| 2834 ## def __showCookiesConfiguration(self): | 2834 ## def __showCookiesConfiguration(self): |
| 2835 ## """ | 2835 ## """ |
| 2836 ## Private slot to configure the cookies handling. | 2836 ## Private slot to configure the cookies handling. |
| 2837 ## """ | 2837 ## """ |
