--- a/eric6/WebBrowser/WebBrowserWindow.py Mon Feb 01 10:38:43 2021 +0100
+++ b/eric6/WebBrowser/WebBrowserWindow.py Tue Mar 02 17:12:08 2021 +0100
@@ -98,7 +98,6 @@
_greaseMonkeyManager = None
_notification = None
_featurePermissionManager = None
- _flashCookieManager = None
_imageSearchEngine = None
_autoScroller = None
_tabManager = None
@@ -439,8 +438,6 @@
self.__virusTotal.fileScanReport.connect(
self.__virusTotalFileScanReport)
- self.flashCookieManager()
-
e5App().focusChanged.connect(self.__appFocusChanged)
self.__toolbarStates = self.saveState()
@@ -1371,21 +1368,6 @@
self.__showCookiesConfiguration)
self.__actions.append(self.cookiesAct)
- self.flashCookiesAct = E5Action(
- self.tr('Flash Cookies'),
- UI.PixmapCache.getIcon("flashCookie"),
- self.tr('&Flash Cookies...'), 0, 0, self,
- 'webbrowser_flash_cookies')
- self.flashCookiesAct.setStatusTip(self.tr(
- 'Manage flash cookies'))
- self.flashCookiesAct.setWhatsThis(self.tr(
- """<b>Flash Cookies</b>"""
- """<p>Show a dialog to manage the flash cookies.</p>"""
- ))
- self.flashCookiesAct.triggered.connect(
- self.__showFlashCookiesManagement)
- self.__actions.append(self.flashCookiesAct)
-
self.personalDataAct = E5Action(
self.tr('Personal Information'),
UI.PixmapCache.getIcon("pim"),
@@ -2038,7 +2020,6 @@
menu.addSeparator()
menu.addAction(self.acceptedLanguagesAct)
menu.addAction(self.cookiesAct)
- menu.addAction(self.flashCookiesAct)
menu.addAction(self.personalDataAct)
menu.addAction(self.greaseMonkeyAct)
menu.addAction(self.featurePermissionAct)
@@ -2165,7 +2146,6 @@
menu.addSeparator()
menu.addAction(self.acceptedLanguagesAct)
menu.addAction(self.cookiesAct)
- menu.addAction(self.flashCookiesAct)
menu.addAction(self.personalDataAct)
menu.addAction(self.greaseMonkeyAct)
menu.addAction(self.featurePermissionAct)
@@ -2335,7 +2315,6 @@
settingstb.addAction(self.shortcutsAct)
settingstb.addAction(self.acceptedLanguagesAct)
settingstb.addAction(self.cookiesAct)
- settingstb.addAction(self.flashCookiesAct)
settingstb.addAction(self.personalDataAct)
settingstb.addAction(self.greaseMonkeyAct)
settingstb.addAction(self.featurePermissionAct)
@@ -2924,8 +2903,6 @@
WebIconProvider.instance().close()
- self.flashCookieManager().shutdown()
-
if len(WebBrowserWindow.BrowserWindows) == 1:
# it is the last window
self.tabManager().close()
@@ -3292,12 +3269,6 @@
dlg = CookiesConfigurationDialog(self)
dlg.exec()
- def __showFlashCookiesManagement(self):
- """
- Private slot to show the flash cookies management dialog.
- """
- self.flashCookieManager().showFlashCookieManagerDialog()
-
@classmethod
def setUseQtHelp(cls, use):
"""
@@ -3654,9 +3625,10 @@
dlg = WebBrowserClearPrivateDataDialog(self)
if dlg.exec() == QDialog.Accepted:
# browsing history, search history, favicons, disk cache, cookies,
- # passwords, web databases, downloads, Flash cookies
+ # passwords, web databases, downloads, zoom values, SSL error
+ # exceptions, history period
(history, searches, favicons, cache, cookies,
- passwords, databases, downloads, flashCookies, zoomValues,
+ passwords, databases, downloads, zoomValues,
sslExceptions, historyPeriod) = dlg.getData()
if history:
self.historyManager().clear(historyPeriod)
@@ -3681,8 +3653,6 @@
self.webProfile().cookieStore().deleteAllCookies()
if passwords:
self.passwordManager().clear()
- if flashCookies:
- self.flashCookieManager().removeAllCookies()
if zoomValues:
ZoomManager.instance().clear()
if sslExceptions:
@@ -3980,22 +3950,6 @@
return cls._featurePermissionManager
@classmethod
- def flashCookieManager(cls):
- """
- Class method to get a reference to the flash cookies manager.
-
- @return reference to the flash cookies manager
- @rtype FlashCookieManager
- """
- if cls._flashCookieManager is None:
- from .FlashCookieManager.FlashCookieManager import (
- FlashCookieManager
- )
- cls._flashCookieManager = FlashCookieManager()
-
- return cls._flashCookieManager
-
- @classmethod
def imageSearchEngine(cls):
"""
Class method to get a reference to the image search engine.
@@ -5019,7 +4973,8 @@
None,
self.tr("Export Keyboard Shortcuts"),
"",
- self.tr("Keyboard shortcut file (*.e4k)"),
+ self.tr("Keyboard Shortcuts File (*.ekj);;"
+ "XML Keyboard Shortcuts File (*.e4k)"),
"",
E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
@@ -5032,8 +4987,18 @@
if ex:
fn += ex
- from Preferences import Shortcuts
- Shortcuts.exportShortcuts(fn, helpViewer=self)
+ if os.path.exists(fn):
+ ok = E5MessageBox.yesNo(
+ self,
+ self.tr("Export Keyboard Shortcuts"),
+ self.tr("""<p>The keyboard shortcuts file <b>{0}</b> exists"""
+ """ already. Overwrite it?</p>""").format(fn))
+ else:
+ ok = True
+
+ if ok:
+ from Preferences import Shortcuts
+ Shortcuts.exportShortcuts(fn, helpViewer=self)
def __importShortcuts(self):
"""
@@ -5043,7 +5008,8 @@
None,
self.tr("Import Keyboard Shortcuts"),
"",
- self.tr("Keyboard shortcut file (*.e4k)"))
+ self.tr("Keyboard Shortcuts File (*.ekj);;"
+ "XML Keyboard shortcut file (*.e4k)"))
if fn:
from Preferences import Shortcuts
