eric: comparison src/eric7/UI/FindFileWidget.py

-:acabc60b19a2
+:53eac4c7d10b
 """
 Module implementing a dialog to search for text in files.
 """
+import json
 import os
 import re
 import time
 from PyQt6.QtCore import QPoint, Qt, QUrl, pyqtSignal, pyqtSlot
 @type QWidget (optional)
 """
 super().__init__(parent)
 self.setupUi(self)
+self.__project = project
 self.layout().setContentsMargins(0, 3, 0, 0)
 self.caseToolButton.setIcon(EricPixmapCache.getIcon("caseSensitive"))
 self.wordToolButton.setIcon(EricPixmapCache.getIcon("wholeWord"))
 self.escapeToolButton.setIcon(EricPixmapCache.getIcon("esc-code"))
 self.regexpToolButton.setIcon(EricPixmapCache.getIcon("regexp"))
+self.filtersConfigButton.setIcon(EricPixmapCache.getIcon("edit"))
 self.dirPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
 self.dirPicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop)
 self.dirPicker.setSizeAdjustPolicy(
 QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon
 Preferences.toBool(
 Preferences.getSettings().value("FindFileWidget/ExcludeHidden", True)
 )
 )
-self.__project = project
+self.__populateFiltersSelector()
 self.populateFileCategories()
 # ensure the file type tab is the current one
 self.fileOptionsWidget.setCurrentWidget(self.fileTypeTab)
 self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
 self.customContextMenuRequested.connect(self.__contextMenuRequested)
 self.__replaceMode = True
 self.__toggleReplaceMode()
+def __populateFiltersSelector(self):
+"""
+Private method to (re-)populate the file filters selector.
+"""
+currentFilter = self.filterComboBox.currentText()
+self.filterComboBox.clear()
+# add standard entries
+self.filterComboBox.addItem("")
+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
+self.__filters = json.loads(
+Preferences.getSettings().value("FindFileWidget/FileFilters", "{}")
+# noqa: M613
+)
+for fileFilter in sorted(self.__filters):
+self.filterComboBox.addItem(fileFilter, self.__filters[filter])
+# reselect the current entry
+index = self.filterComboBox.findText(currentFilter)
+if index == -1:
+index = 0
+self.filterComboBox.setCurrentIndex(index)
 def populateFileCategories(self):
 """
 Public method to populate the search file categories list.
 """
 """
 if checked:
 # only one of regexp or escape can be selected
 self.escapeToolButton.setChecked(False)
+@pyqtSlot()
+def on_filtersConfigButton_clicked(self):
+"""
+Private slot to edit the list of defined file filter entries.
+"""
+from .FindFileFiltersEditDialog import FindFileFiltersEditDialog
+dlg = FindFileFiltersEditDialog(self.__filters, self)
+if dlg.exec() == QDialog.DialogCode.Accepted:
+filters = dlg.getFilters()
+Preferences.getSettings().setValue(
+"FindFileWidget/FileFilters", json.dumps(filters)
+)
+self.__populateFiltersSelector()
 @pyqtSlot(str)
 def on_findtextCombo_editTextChanged(self, text):
 """
 Private slot to handle the editTextChanged signal of the find
 text combo.
 """
 Private slot to handle the selection of the file filter check box.
 """
 self.__enableFindButton()
-@pyqtSlot(str)
+@pyqtSlot(int)
-def on_filterEdit_textEdited(self, text):
+def on_filterComboBox_currentIndexChanged(self, index):
 """
-Private slot to handle the textChanged signal of the file filter edit.
+Private slot to handle the selection of a file filter.
-@param text (ignored)
+@param index index of the selected entry
-@type str
+@type int
 """
 self.__enableFindButton()
 @pyqtSlot()
 def __enableFindButton(self):
 and (
 self.dirPicker.currentText() == ""
 or not os.path.exists(os.path.abspath(self.dirPicker.currentText()))
 )
 )
-or (self.filterCheckBox.isChecked() and self.filterEdit.text() == "")
+or (
+self.filterCheckBox.isChecked()
+and self.filterComboBox.currentText() == ""
+)
+or (self.projectButton.isChecked() and not self.__project.isOpen())
 ):
 self.findButton.setEnabled(False)
 else:
 self.findButton.setEnabled(True)
 @type str
 @return text with eol stripped
 @rtype str
 """
 return txt.rstrip("\n\r")
+def __buildReFileFilter(self, fileFilter):
+"""
+Private method to convert a file filter expression into a valid re search
+pattern.
+@param fileFilter file filter expression
+@type str
+@return re search pattern with dot, question mark and star converted
+@rtype str
+"""
+return "^{0}$".format(
+fileFilter.strip().replace(".", r"\.").replace("*", ".*").replace("?", ".")
+)
 @pyqtSlot()
 def __stopSearch(self):
 """
 Private slot to handle the stop button being pressed.
 return
 self.__cancelSearch = False
 if self.filterCheckBox.isChecked():
-fileFilter = self.filterEdit.text()
+fileFilter = self.filterComboBox.currentData()
 fileFilterList = [
-"^{0}$".format(filter.replace(".", r"\.").replace("*", ".*"))
+self.__buildReFileFilter(filter) for filter in fileFilter.split(";")
-for filter in fileFilter.split(";")
 ]
 filterRe = re.compile("|".join(fileFilterList))
 if self.projectButton.isChecked():
 if self.filterCheckBox.isChecked():
 for row in range(self.fileTypeList.count()):
 itm = self.fileTypeList.item(row)
 if itm.checkState() == Qt.CheckState.Checked:
 filters.extend(
 [
-"^{0}$".format(
+self.__buildReFileFilter(assoc)
-assoc.replace(".", r"\.").replace("*", ".*")
-)
 for assoc in self.__project.getFiletypeAssociations(
 itm.data(Qt.ItemDataRole.UserRole)
 )
 ]
 )
 if itm.checkState() == Qt.CheckState.Checked:
 fileType = itm.data(Qt.ItemDataRole.UserRole)
 if fileType == "SOURCES":
 filters.extend(
 [
-"^{0}$".format(
+self.__buildReFileFilter(assoc)
-assoc.replace(".", r"\.").replace("*", ".*")
-)
 for assoc in Preferences.getEditorLexerAssocs()
 if assoc
 not in self.__project.getFileCategoryExtension(
 fileType, reverse=True
 )
 ]
 )
 else:
 filters.extend(
 [
-"^{0}$".format(
+self.__buildReFileFilter(ext)
-ext.replace(".", r"\.").replace("*", ".*")
-)
 for ext in self.__project.getFileCategoryExtension(
 # __IGNORE_WARNING__
 fileType
 )
 ]

Mercurial Repositories > eric / file comparison

comparison: src/eric7/UI/FindFileWidget.py

src/eric7/UI/FindFileWidget.py