diff -r f795d68d8e09 -r 8db0328580d7 src/eric7/UI/FindFileWidget.py
--- a/src/eric7/UI/FindFileWidget.py Wed Jan 10 09:44:42 2024 +0100
+++ b/src/eric7/UI/FindFileWidget.py Wed Jan 10 10:42:39 2024 +0100
@@ -186,16 +186,22 @@
# add standard entries
self.filterComboBox.addItem("")
- self.filterComboBox.addItem(self.tr("All Files"), "*")
+ self.filterComboBox.addItem(self.tr("All Files"), ["*"])
# add configured entries
- # filters is a dictionary with the filter text as key and the pattern as value
+ # FileFilters is a dictionary with the filter name as key and
+ # a list of file name patterns as value
self.__filters = json.loads(
Preferences.getSettings().value("FindFileWidget/FileFilters", "{}")
# noqa: M613
)
for fileFilter in sorted(self.__filters):
- self.filterComboBox.addItem(fileFilter, self.__filters[filter])
+ self.filterComboBox.addItem(
+ self.tr("{0} ({1})").format(
+ fileFilter, " ".join(self.__filters[fileFilter])
+ ),
+ self.__filters[fileFilter],
+ )
# reselect the current entry
index = self.filterComboBox.findText(currentFilter)
@@ -556,10 +562,10 @@
if self.filterCheckBox.isChecked():
fileFilter = self.filterComboBox.currentData()
- fileFilterList = [
- self.__buildReFileFilter(filter) for filter in fileFilter.split(";")
- ]
- filterRe = re.compile("|".join(fileFilterList))
+ fileFilterPattern = "|".join(
+ self.__buildReFileFilter(filter) for filter in fileFilter
+ )
+ filterRe = re.compile(fileFilterPattern)
if self.projectButton.isChecked():
if self.filterCheckBox.isChecked():
