Mercurial Repositories > eric / changeset

--- a/eric6/E5Gui/E5ErrorMessage.py	Mon Mar 08 16:58:34 2021 +0100
+++ b/eric6/E5Gui/E5ErrorMessage.py	Sat Mar 13 11:52:01 2021 +0100
@@ -39,6 +39,7 @@
     "QXcbClipboard:",
     "QXcbConnection: XCB error",
     "libpng warning: iCCP:",
+    "Uncaught ReferenceError: $ is not defined",
 ]
 
 
@@ -52,7 +53,7 @@
     @rtype bool
     """
     for filterStr in Globals.toList(_filterSettings.value(
-            "MessageFilters", _defaultFilters)):
+            "MessageFilters", [])) + _defaultFilters:
         if filterStr in message:
             return True
     
@@ -94,8 +95,8 @@
         from .E5ErrorMessageFilterDialog import E5ErrorMessageFilterDialog
         dlg = E5ErrorMessageFilterDialog(
             Globals.toList(_filterSettings.value(
-                "MessageFilters", _defaultFilters)),
-            _defaultFilters)
+                "MessageFilters", [])))
+##            _defaultFilters)
         if dlg.exec() == QDialog.DialogCode.Accepted:
             filters = dlg.getFilters()
             _filterSettings.setValue("MessageFilters", filters)

--- a/eric6/E5Gui/E5ErrorMessageFilterDialog.py	Mon Mar 08 16:58:34 2021 +0100
+++ b/eric6/E5Gui/E5ErrorMessageFilterDialog.py	Sat Mar 13 11:52:01 2021 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the list of messages to be ignored.
 """
 
-from PyQt5.QtCore import pyqtSlot
+##from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QDialog
 
 from .Ui_E5ErrorMessageFilterDialog import Ui_E5ErrorMessageFilterDialog
@@ -17,38 +17,38 @@
     """
     Class implementing a dialog to manage the list of messages to be ignored.
     """
-    def __init__(self, messageFilters, defaultFilters, parent=None):
+    def __init__(self, messageFilters, parent=None):
         """
         Constructor
         
         @param messageFilters list of message filters to be edited
         @type list of str
-        @param defaultFilters list of default message filters
-        @type list of str
         @param parent reference to the parent widget
         @type QWidget
         """
         super(E5ErrorMessageFilterDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.__defaultFilters = defaultFilters[:]
-        
+##        self.__defaultFilters = defaultFilters[:]
+##        
         self.filtersEditWidget.setList(messageFilters)
         self.filtersEditWidget.setListWhatsThis(self.tr(
             "<b>Error Message Filters</b>"
             "<p>This list shows the configured message filters used to"
             " suppress error messages from within Qt.</p>"
+            "<p>A default list of message filters is added to this"
+            " user list.</p>"
         ))
-        
-        self.filtersEditWidget.setDefaultVisible(True)
-        self.filtersEditWidget.setToDefault.connect(self.__setToDefault)
-    
-    @pyqtSlot()
-    def __setToDefault(self):
-        """
-        Private slot to set the message list to the default values.
-        """
-        self.filtersEditWidget.setList(self.__defaultFilters)
+##        
+##        self.filtersEditWidget.setDefaultVisible(True)
+##        self.filtersEditWidget.setToDefault.connect(self.__setToDefault)
+##    
+##    @pyqtSlot()
+##    def __setToDefault(self):
+##        """
+##        Private slot to set the message list to the default values.
+##        """
+##        self.filtersEditWidget.setList(self.__defaultFilters)
     
     def getFilters(self):
         """