Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- branch
- QtWebEngine
- changeset 4880
- 561f2bd9cfb9
- parent 4875
- 4ee26909ac0d
- child 4884
- 6983af705a7f
equal
deleted
inserted
replaced
| 4875:4ee26909ac0d | 4880:561f2bd9cfb9 |
|---|---|
| 1566 )) | 1566 )) |
| 1567 if not self.__initShortcutsOnly: | 1567 if not self.__initShortcutsOnly: |
| 1568 self.passwordsAct.triggered.connect(self.__showPasswordsDialog) | 1568 self.passwordsAct.triggered.connect(self.__showPasswordsDialog) |
| 1569 self.__actions.append(self.passwordsAct) | 1569 self.__actions.append(self.passwordsAct) |
| 1570 | 1570 |
| 1571 # TODO: AdBlock | 1571 self.adblockAct = E5Action( |
| 1572 ## self.adblockAct = E5Action( | 1572 self.tr('Ad Block'), |
| 1573 ## self.tr('Ad Block'), | 1573 UI.PixmapCache.getIcon("adBlockPlus.png"), |
| 1574 ## UI.PixmapCache.getIcon("adBlockPlus.png"), | 1574 self.tr('&Ad Block...'), |
| 1575 ## self.tr('&Ad Block...'), | 1575 0, 0, |
| 1576 ## 0, 0, | 1576 self, 'webbrowser_adblock') |
| 1577 ## self, 'webbrowser_adblock') | 1577 self.adblockAct.setStatusTip(self.tr( |
| 1578 ## self.adblockAct.setStatusTip(self.tr( | 1578 'Configure AdBlock subscriptions and rules')) |
| 1579 ## 'Configure AdBlock subscriptions and rules')) | 1579 self.adblockAct.setWhatsThis(self.tr( |
| 1580 ## self.adblockAct.setWhatsThis(self.tr( | 1580 """<b>Ad Block...</b>""" |
| 1581 ## """<b>Ad Block...</b>""" | 1581 """<p>Opens a dialog to configure AdBlock subscriptions and""" |
| 1582 ## """<p>Opens a dialog to configure AdBlock subscriptions and""" | 1582 """ rules.</p>""" |
| 1583 ## """ rules.</p>""" | 1583 )) |
| 1584 ## )) | 1584 if not self.__initShortcutsOnly: |
| 1585 ## if not self.__initShortcutsOnly: | 1585 self.adblockAct.triggered.connect(self.__showAdBlockDialog) |
| 1586 ## self.adblockAct.triggered.connect(self.__showAdBlockDialog) | 1586 self.__actions.append(self.adblockAct) |
| 1587 ## self.__actions.append(self.adblockAct) | |
| 1588 | 1587 |
| 1589 # TODO: Click2Flash (?) | 1588 # TODO: Click2Flash (?) |
| 1590 ## self.flashblockAct = E5Action( | 1589 ## self.flashblockAct = E5Action( |
| 1591 ## self.tr('ClickToFlash'), | 1590 ## self.tr('ClickToFlash'), |
| 1592 ## UI.PixmapCache.getIcon("flashBlock.png"), | 1591 ## UI.PixmapCache.getIcon("flashBlock.png"), |
| 1909 menu.addAction(self.certificateErrorsAct) | 1908 menu.addAction(self.certificateErrorsAct) |
| 1910 menu.addSeparator() | 1909 menu.addSeparator() |
| 1911 menu.addAction(self.zoomValuesAct) | 1910 menu.addAction(self.zoomValuesAct) |
| 1912 menu.addAction(self.manageIconsAct) | 1911 menu.addAction(self.manageIconsAct) |
| 1913 menu.addSeparator() | 1912 menu.addSeparator() |
| 1914 ## menu.addAction(self.adblockAct) | 1913 menu.addAction(self.adblockAct) |
| 1915 ## menu.addAction(self.flashblockAct) | 1914 ## menu.addAction(self.flashblockAct) |
| 1916 ## menu.addSeparator() | 1915 ## menu.addSeparator() |
| 1917 self.__settingsMenu = menu | 1916 self.__settingsMenu = menu |
| 1918 self.__settingsMenu.aboutToShow.connect( | 1917 self.__settingsMenu.aboutToShow.connect( |
| 1919 self.__aboutToShowSettingsMenu) | 1918 self.__aboutToShowSettingsMenu) |
| 3392 """ | 3391 """ |
| 3393 Private slot to show the certificate errors management dialog. | 3392 Private slot to show the certificate errors management dialog. |
| 3394 """ | 3393 """ |
| 3395 self.networkManager().showSslErrorExceptionsDialog() | 3394 self.networkManager().showSslErrorExceptionsDialog() |
| 3396 | 3395 |
| 3397 # TODO: AdBlock | 3396 def __showAdBlockDialog(self): |
| 3398 ## def __showAdBlockDialog(self): | 3397 """ |
| 3399 ## """ | 3398 Private slot to show the AdBlock configuration dialog. |
| 3400 ## Private slot to show the AdBlock configuration dialog. | 3399 """ |
| 3401 ## """ | 3400 self.adBlockManager().showDialog() |
| 3402 ## self.adBlockManager().showDialog() | 3401 |
| 3403 ## | |
| 3404 # TODO: Click2Flash | 3402 # TODO: Click2Flash |
| 3405 ## def __showClickToFlashDialog(self): | 3403 ## def __showClickToFlashDialog(self): |
| 3406 ## """ | 3404 ## """ |
| 3407 ## Private slot to open the ClickToFlash whitelist configuration dialog. | 3405 ## Private slot to open the ClickToFlash whitelist configuration dialog. |
| 3408 ## """ | 3406 ## """ |
