diff -r a22eee00b052 -r ab0a91b82b37 eric6/Preferences/ConfigurationDialog.py
--- a/eric6/Preferences/ConfigurationDialog.py Sat Aug 31 12:58:11 2019 +0200
+++ b/eric6/Preferences/ConfigurationDialog.py Sun Sep 01 17:43:03 2019 +0200
@@ -358,10 +358,11 @@
"webBrowserPage":
[self.tr("eric6 Web Browser"), "ericWeb.png",
"WebBrowserPage", "0webBrowserPage", None],
- "helpFlashCookieManagerPage":
+ "webBrowserFlashCookieManagerPage":
[self.tr("Flash Cookie Manager"),
"flashCookie16.png",
- "HelpFlashCookieManagerPage", "0webBrowserPage", None],
+ "WebBrowserFlashCookieManagerPage", "0webBrowserPage",
+ None],
"webBrowserVirusTotalPage":
[self.tr("VirusTotal Interface"), "virustotal.png",
"WebBrowserVirusTotalPage", "0webBrowserPage", None],
@@ -374,80 +375,10 @@
"WebBrowserSpellCheckingPage", "0webBrowserPage",
None],
})
- else:
- try:
- from PyQt5 import QtWebKit # __IGNORE_WARNING__
- self.configItems.update({
- "0helpBrowserPage":
- [self.tr("Web Browser"), "ericWeb.png",
- None, None, None],
- "helpAppearancePage":
- [self.tr("Appearance"), "preferences-styles.png",
- "HelpAppearancePage", "0helpBrowserPage", None],
- "helpWebBrowserPage":
- [self.tr("eric6 Web Browser"), "ericWeb.png",
- "HelpWebBrowserPage", "0helpBrowserPage", None],
- "helpFlashCookieManagerPage":
- [self.tr("Flash Cookie Manager"),
- "flashCookie16.png",
- "HelpFlashCookieManagerPage", "0helpBrowserPage",
- None],
- "helpVirusTotalPage":
- [self.tr("VirusTotal Interface"), "virustotal.png",
- "HelpVirusTotalPage", "0helpBrowserPage", None],
- })
- except ImportError:
- pass
self.configItems.update(
e5App().getObject("PluginManager").getPluginConfigData())
- elif displayMode == ConfigurationWidget.HelpBrowserMode:
- self.configItems = {
- # key : [display string, pixmap name, dialog module name or
- # page creation function, parent key,
- # reference to configuration page (must always be last)]
- # The dialog module must have the module function 'create' to
- # create the configuration page. This must have the method
- # 'save' to save the settings.
- "interfacePage":
- [self.tr("Interface"), "preferences-interface.png",
- "HelpInterfacePage", None, None],
- "networkPage":
- [self.tr("Network"), "preferences-network.png",
- "NetworkPage", None, None],
- "printerPage":
- [self.tr("Printer"), "preferences-printer.png",
- "PrinterPage", None, None],
- "securityPage":
- [self.tr("Security"), "preferences-security.png",
- "SecurityPage", None, None],
-
- "helpDocumentationPage":
- [self.tr("Help Documentation"),
- "preferences-helpdocumentation.png",
- "HelpDocumentationPage", None, None],
- }
- try:
- from PyQt5 import QtWebKit # __IGNORE_WARNING__
- self.configItems.update({
- "helpAppearancePage":
- [self.tr("Appearance"), "preferences-styles.png",
- "HelpAppearancePage", None, None],
- "helpFlashCookieManagerPage":
- [self.tr("Flash Cookie Manager"),
- "flashCookie16.png",
- "HelpFlashCookieManagerPage", None, None],
- "helpVirusTotalPage":
- [self.tr("VirusTotal Interface"), "virustotal.png",
- "HelpVirusTotalPage", None, None],
- "helpWebBrowserPage":
- [self.tr("eric6 Web Browser"), "ericWeb.png",
- "HelpWebBrowserPage", None, None],
- })
- except ImportError:
- pass
-
elif displayMode == ConfigurationWidget.WebBrowserMode:
self.configItems = {
# key : [display string, pixmap name, dialog module name or
@@ -481,10 +412,10 @@
[self.tr("eric6 Web Browser"), "ericWeb.png",
"WebBrowserPage", None, None],
- "helpFlashCookieManagerPage":
+ "webBrowserFlashCookieManagerPage":
[self.tr("Flash Cookie Manager"),
"flashCookie16.png",
- "HelpFlashCookieManagerPage", None, None],
+ "WebBrowserFlashCookieManagerPage", None, None],
"webBrowserVirusTotalPage":
[self.tr("VirusTotal Interface"), "virustotal.png",
"WebBrowserVirusTotalPage", None, None],
