--- a/WebBrowser/WebBrowserWindow.py Mon Mar 28 16:34:22 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py Mon Mar 28 17:04:18 2016 +0200
@@ -1247,23 +1247,6 @@
self.__showFlashCookiesManagement)
self.__actions.append(self.flashCookiesAct)
- # TODO: Offline Storage
-## self.offlineStorageAct = E5Action(
-## self.tr('Offline Storage'),
-## UI.PixmapCache.getIcon("preferences-html5.png"),
-## self.tr('Offline &Storage...'), 0, 0,
-## self, 'webbrowser_offline_storage')
-## self.offlineStorageAct.setStatusTip(self.tr(
-## 'Configure offline storage'))
-## self.offlineStorageAct.setWhatsThis(self.tr(
-## """<b>Offline Storage</b>"""
-## """<p>Opens a dialog to configure offline storage.</p>"""
-## ))
-## if not self.__initShortcutsOnly:
-## self.offlineStorageAct.triggered.connect(
-## self.__showOfflineStorageConfiguration)
-## self.__actions.append(self.offlineStorageAct)
-
self.personalDataAct = E5Action(
self.tr('Personal Information'),
UI.PixmapCache.getIcon("pim.png"),
@@ -1541,47 +1524,6 @@
self.adblockAct.triggered.connect(self.__showAdBlockDialog)
self.__actions.append(self.adblockAct)
- # TODO: Click2Flash (?)
-## self.flashblockAct = E5Action(
-## self.tr('ClickToFlash'),
-## UI.PixmapCache.getIcon("flashBlock.png"),
-## self.tr('&ClickToFlash...'),
-## 0, 0,
-## self, 'webbrowser_flashblock')
-## self.flashblockAct.setStatusTip(self.tr(
-## 'Configure ClickToFlash whitelist'))
-## self.flashblockAct.setWhatsThis(self.tr(
-## """<b>ClickToFlash...</b>"""
-## """<p>Opens a dialog to configure the ClickToFlash"""
-## """ whitelist.</p>"""
-## ))
-## if not self.__initShortcutsOnly:
-## self.flashblockAct.triggered.connect(
-## self.__showClickToFlashDialog)
-## self.__actions.append(self.flashblockAct)
-
- # TODO: Certificates
-##
-## from .Network.NetworkManager import SSL_AVAILABLE
-## if SSL_AVAILABLE:
-## self.certificatesAct = E5Action(
-## self.tr('Manage SSL Certificates'),
-## UI.PixmapCache.getIcon("certificates.png"),
-## self.tr('Manage SSL Certificates...'),
-## 0, 0,
-## self, 'webbrowser_manage_certificates')
-## self.certificatesAct.setStatusTip(self.tr(
-## 'Manage the saved SSL certificates'))
-## self.certificatesAct.setWhatsThis(self.tr(
-## """<b>Manage SSL Certificates...</b>"""
-## """<p>Opens a dialog to manage the saved SSL"""
-## """ certificates.</p>"""
-## ))
-## if not self.__initShortcutsOnly:
-## self.certificatesAct.triggered.connect(
-## self.__showCertificatesDialog)
-## self.__actions.append(self.certificatesAct)
-
self.certificateErrorsAct = E5Action(
self.tr('Manage SSL Certificate Errors'),
UI.PixmapCache.getIcon("certificates.png"),
@@ -1600,23 +1542,6 @@
self.__showCertificateErrorsDialog)
self.__actions.append(self.certificateErrorsAct)
- # TODO: Network Monitor (?)
-## self.toolsMonitorAct = E5Action(
-## self.tr('Network Monitor'),
-## self.tr('&Network Monitor...'),
-## 0, 0,
-## self, 'webbrowser_tools_network_monitor')
-## self.toolsMonitorAct.setStatusTip(self.tr(
-## 'Show the network monitor dialog'))
-## self.toolsMonitorAct.setWhatsThis(self.tr(
-## """<b>Network Monitor...</b>"""
-## """<p>Shows the network monitor dialog.</p>"""
-## ))
-## if not self.__initShortcutsOnly:
-## self.toolsMonitorAct.triggered.connect(
-## self.__showNetworkMonitor)
-## self.__actions.append(self.toolsMonitorAct)
-
self.showDownloadManagerAct = E5Action(
self.tr('Downloads'),
self.tr('Downloads'),
@@ -1847,7 +1772,6 @@
menu.addAction(self.acceptedLanguagesAct)
menu.addAction(self.cookiesAct)
menu.addAction(self.flashCookiesAct)
-## menu.addAction(self.offlineStorageAct)
menu.addAction(self.personalDataAct)
menu.addAction(self.greaseMonkeyAct)
menu.addAction(self.featurePermissionAct)
@@ -1857,22 +1781,18 @@
menu.addAction(self.searchEnginesAct)
menu.addSeparator()
menu.addAction(self.passwordsAct)
- # TODO: Certificates
-## from .Network.NetworkManager import SSL_AVAILABLE
-## if SSL_AVAILABLE:
-## menu.addAction(self.certificatesAct)
menu.addAction(self.certificateErrorsAct)
menu.addSeparator()
menu.addAction(self.zoomValuesAct)
menu.addAction(self.manageIconsAct)
menu.addSeparator()
menu.addAction(self.adblockAct)
-## menu.addAction(self.flashblockAct)
-## menu.addSeparator()
+ menu.addSeparator()
self.__settingsMenu = menu
self.__settingsMenu.aboutToShow.connect(
self.__aboutToShowSettingsMenu)
+ # TODO: UserAgents
## from .UserAgent.UserAgentMenu import UserAgentMenu
## self.__userAgentMenu = UserAgentMenu(self.tr("Global User Agent"))
## menu.addMenu(self.__userAgentMenu)
@@ -1893,9 +1813,6 @@
menu.addAction(self.siteInfoAct)
menu.addSeparator()
menu.addAction(self.synchronizationAct)
- # TODO: Network Monitor
-## menu.addSeparator()
-## menu.addAction(self.toolsMonitorAct)
menu = mb.addMenu(self.tr("&Window"))
menu.setTearOffEnabled(True)
@@ -1995,7 +1912,6 @@
settingstb.addAction(self.acceptedLanguagesAct)
settingstb.addAction(self.cookiesAct)
settingstb.addAction(self.flashCookiesAct)
-## settingstb.addAction(self.offlineStorageAct)
settingstb.addAction(self.personalDataAct)
settingstb.addAction(self.greaseMonkeyAct)
settingstb.addAction(self.featurePermissionAct)
@@ -2487,9 +2403,6 @@
self.downloadManager().shutdown()
- # TODO: Network Monitor
-## self.__closeNetworkMonitor()
-##
self.cookieJar().close()
self.bookmarksToolBar.setModel(None)
@@ -2834,17 +2747,6 @@
"""
self.flashCookieManager().showFlashCookieManagerDialog()
-## def __showOfflineStorageConfiguration(self):
-## """
-## Private slot to configure the offline storage.
-## """
-## from .OfflineStorage.OfflineStorageConfigDialog import \
-## OfflineStorageConfigDialog
-## dlg = OfflineStorageConfigDialog(self)
-## if dlg.exec_() == QDialog.Accepted:
-## dlg.storeData()
-## self.__initWebEngineSettings()
-
@classmethod
def setUseQtHelp(cls, use):
"""
@@ -3331,16 +3233,6 @@
dlg = PasswordsDialog(self)
dlg.exec_()
- # TODO: Certificates
-## def __showCertificatesDialog(self):
-## """
-## Private slot to show the certificates management dialog.
-## """
-## from E5Network.E5SslCertificatesDialog import E5SslCertificatesDialog
-##
-## dlg = E5SslCertificatesDialog(self)
-## dlg.exec_()
-##
def __showCertificateErrorsDialog(self):
"""
Private slot to show the certificate errors management dialog.
@@ -3353,14 +3245,6 @@
"""
self.adBlockManager().showDialog()
- # TODO: Click2Flash
-## def __showClickToFlashDialog(self):
-## """
-## Private slot to open the ClickToFlash whitelist configuration dialog.
-## """
-## from .HelpBrowserWV import HelpWebPage
-## HelpWebPage.webPluginFactory().plugin("ClickToFlash").configure()
-##
def __showPersonalInformationDialog(self):
"""
Private slot to show the Personal Information configuration dialog.
@@ -3388,29 +3272,12 @@
dlg = ZoomValuesDialog(self)
dlg.exec_()
- # TODO: Network Monitor
-## def __showNetworkMonitor(self):
-## """
-## Private slot to show the network monitor dialog.
-## """
-## from E5Network.E5NetworkMonitor import E5NetworkMonitor
-## monitor = E5NetworkMonitor.instance(self.networkManager())
-## monitor.show()
-##
def __showDownloadsWindow(self):
"""
Private slot to show the downloads dialog.
"""
self.downloadManager().show()
- # TODO: Network Monitor
-## def __closeNetworkMonitor(self):
-## """
-## Private slot to close the network monitor dialog.
-## """
-## from E5Network.E5NetworkMonitor import E5NetworkMonitor
-## E5NetworkMonitor.closeMonitor()
-##
def __showPageSource(self):
"""
Private slot to show the source of the current page in an editor.
