diff -r 49f3377aebf1 -r 787a6b3f8c9f eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py
--- a/eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py Fri Oct 09 17:19:29 2020 +0200
+++ b/eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py Sat Oct 10 12:20:51 2020 +0200
@@ -14,6 +14,7 @@
)
from E5Gui import E5MessageBox
+from E5Gui.E5OverrideCursor import E5OverrideCursor
from .Ui_FlashCookieManagerDialog import Ui_FlashCookieManagerDialog
@@ -336,58 +337,55 @@
"""
Private slot to refresh the cookies list.
"""
- QApplication.setOverrideCursor(Qt.WaitCursor)
-
- cookies = self.__manager.flashCookies()
- self.cookiesList.clear()
-
- counter = 0
- originDict = {}
- for cookie in cookies:
- cookieOrigin = cookie.origin
- if cookieOrigin.startswith("."):
- cookieOrigin = cookieOrigin[1:]
-
- if cookieOrigin in originDict:
- itm = QTreeWidgetItem(originDict[cookieOrigin])
- else:
- newParent = QTreeWidgetItem(self.cookiesList)
- newParent.setText(0, cookieOrigin)
- newParent.setIcon(0, UI.PixmapCache.getIcon("dirOpen"))
- self.cookiesList.addTopLevelItem(newParent)
- originDict[cookieOrigin] = newParent
-
- itm = QTreeWidgetItem(newParent)
+ with E5OverrideCursor():
+ cookies = self.__manager.flashCookies()
+ self.cookiesList.clear()
- suffix = ""
- if cookie.path.startswith(
- self.__manager.flashPlayerDataPath() +
- "/macromedia.com/support/flashplayer/sys"):
- suffix = self.tr(" (settings)")
-
- if cookie.path + "/" + cookie.name in (
- self.__manager.newCookiesList()
- ):
- suffix += self.tr(" [new]")
- font = itm.font(0)
- font.setBold(True)
- itm.setFont(font)
- itm.parent().setExpanded(True)
+ counter = 0
+ originDict = {}
+ for cookie in cookies:
+ cookieOrigin = cookie.origin
+ if cookieOrigin.startswith("."):
+ cookieOrigin = cookieOrigin[1:]
+
+ if cookieOrigin in originDict:
+ itm = QTreeWidgetItem(originDict[cookieOrigin])
+ else:
+ newParent = QTreeWidgetItem(self.cookiesList)
+ newParent.setText(0, cookieOrigin)
+ newParent.setIcon(0, UI.PixmapCache.getIcon("dirOpen"))
+ self.cookiesList.addTopLevelItem(newParent)
+ originDict[cookieOrigin] = newParent
+
+ itm = QTreeWidgetItem(newParent)
+
+ suffix = ""
+ if cookie.path.startswith(
+ self.__manager.flashPlayerDataPath() +
+ "/macromedia.com/support/flashplayer/sys"):
+ suffix = self.tr(" (settings)")
+
+ if cookie.path + "/" + cookie.name in (
+ self.__manager.newCookiesList()
+ ):
+ suffix += self.tr(" [new]")
+ font = itm.font(0)
+ font.setBold(True)
+ itm.setFont(font)
+ itm.parent().setExpanded(True)
+
+ itm.setText(0, self.tr("{0}{1}", "name and suffix").format(
+ cookie.name, suffix))
+ itm.setData(0, Qt.UserRole, cookie)
+
+ counter += 1
+ if counter > 100:
+ QApplication.processEvents()
+ counter = 0
- itm.setText(0, self.tr("{0}{1}", "name and suffix").format(
- cookie.name, suffix))
- itm.setData(0, Qt.UserRole, cookie)
-
- counter += 1
- if counter > 100:
- QApplication.processEvents()
- counter = 0
-
- self.removeAllButton.setEnabled(
- self.cookiesList.topLevelItemCount() > 0)
- self.removeButton.setEnabled(False)
-
- QApplication.restoreOverrideCursor()
+ self.removeAllButton.setEnabled(
+ self.cookiesList.topLevelItemCount() > 0)
+ self.removeButton.setEnabled(False)
@pyqtSlot()
def __refreshFilterLists(self):
