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

-:0f023e61a9b5
+:d73c3a1e432b
 from PyQt6.QtWidgets import (
 QApplication,
 QComboBox,
 QDialog,
 QDialogButtonBox,
+QListWidgetItem,
 QMenu,
 QTreeWidgetItem,
 QVBoxLayout,
 QWidget,
 )
 Preferences.toBool(
 Preferences.getSettings().value("FindFileWidget/ExcludeHidden", True)
 )
 )
+self.__project = project
+# populate the file type list
+for fileCategory in [
+c
+for c in self.__project.getFileCategories()
+if c not in ("TRANSLATIONS", "OTHERS")
+]:
+itm = QListWidgetItem(
+self.__project.getFileCategoryType(fileCategory), self.fileTypeList
+)
+itm.setData(Qt.ItemDataRole.UserRole, fileCategory)
+itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+itm.setCheckState(
+Qt.CheckState.Checked
+if fileCategory == "SOURCES"
+else Qt.CheckState.Unchecked
+)
 # ensure the file type tab is the current one
 self.fileOptionsWidget.setCurrentWidget(self.fileTypeTab)
-self.project = project
+self.__project.projectOpened.connect(self.__projectOpened)
-self.project.projectOpened.connect(self.__projectOpened)
+self.__project.projectClosed.connect(self.__projectClosed)
-self.project.projectClosed.connect(self.__projectClosed)
 self.__standardListFont = self.findList.font()
 self.findList.headerItem().setText(self.findList.columnCount(), "")
 self.findList.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder)
 self.__section0Size = self.findList.header().sectionSize(0)
 self.findList.setExpandsOnDoubleClick(False)
-# TODO: move these to a project browser file category repository
-# Qt Designer form files
-self.filterForms = r".*\.ui$"
-self.formsExt = ["*.ui"]
-# Corba interface files
-self.filterInterfaces = r".*\.idl$"
-self.interfacesExt = ["*.idl"]
-# Protobuf protocol files
-self.filterProtocols = r".*\.proto$"
-self.protocolsExt = ["*.proto"]
-# Qt resources files
-self.filterResources = r".*\.qrc$"
-self.resourcesExt = ["*.qrc"]
 self.__cancelSearch = False
 self.__lastFileItem = None
 self.__populating = False
 @type str (optional)
 @param openFiles flag indicating to operate on open files only
 (defaults to False)
 @type bool (optional)
 """
-if self.project.isOpen():
+if self.__project.isOpen():
 self.projectButton.setEnabled(True)
 self.projectButton.setChecked(True)
 else:
 self.projectButton.setEnabled(False)
 self.dirButton.setChecked(True)
 filterRe = re.compile("|".join(fileFilterList))
 if self.projectButton.isChecked():
 if self.filterCheckBox.isChecked():
 files = [
-self.project.getRelativePath(file)
+self.__project.getRelativePath(file)
 for file in self.__getFileList(
-self.project.getProjectPath(),
+self.__project.getProjectPath(),
 filterRe,
 excludeHiddenDirs=self.excludeHiddenCheckBox.isChecked(),
 )
 ]
 else:
 files = []
-# TODO: make this more generic (using fileCategory)
+for row in range(self.fileTypeList.count()):
-if self.sourcesCheckBox.isChecked():
+itm = self.fileTypeList.item(row)
-files += self.project.getProjectData(dataKey="SOURCES")
+if itm.checkState() == Qt.CheckState.Checked:
-if self.formsCheckBox.isChecked():
+files += self.__project.getProjectData(
-files += self.project.getProjectData("FORMS")
+dataKey=itm.data(Qt.ItemDataRole.UserRole)
-if self.interfacesCheckBox.isChecked():
+)
-files += self.project.getProjectData("INTERFACES")
-if self.protocolsCheckBox.isChecked():
-files += self.project.getProjectData("PROTOCOLS")
-if self.resourcesCheckBox.isChecked():
-files += self.project.getProjectData("RESOURCES")
 elif self.dirButton.isChecked():
 if not self.filterCheckBox.isChecked():
 filters = []
-if self.project.isOpen() and os.path.abspath(
+if self.__project.isOpen() and os.path.abspath(
 self.dirPicker.currentText()
-).startswith(self.project.getProjectPath()):
+).startswith(self.__project.getProjectPath()):
-if self.sourcesCheckBox.isChecked():
+for row in range(self.fileTypeList.count()):
-filters.extend(
+itm = self.fileTypeList.item(row)
-[
+if itm.checkState() == Qt.CheckState.Checked:
-"^{0}$".format(
+filters.extend(
-assoc.replace(".", r"\.").replace("*", ".*")
+[
+"^{0}$".format(
+assoc.replace(".", r"\.").replace("*", ".*")
+)
+for assoc in self.__project.getFiletypeAssociations(
+itm.data(Qt.ItemDataRole.UserRole)
+)
+]
+)
+else:
+for row in range(self.fileTypeList.count()):
+itm = self.fileTypeList.item(row)
+if itm.checkState() == Qt.CheckState.Checked:
+fileType = itm.data(Qt.ItemDataRole.UserRole)
+if fileType == "SOURCES":
+filters.extend(
+[
+"^{0}$".format(
+assoc.replace(".", r"\.").replace("*", ".*")
+)
+for assoc in list(
+Preferences.getEditorLexerAssocs().keys()
+)
+if assoc
+not in self.__project.getFileCategoryExtension(
+fileType, reverse=True
+)
+]
 )
-for assoc in self.project.getFiletypeAssociations(
+else:
-"SOURCES"
+filters.extend(
+[
+"^{0}$".format(
+ext.replace(".", r"\.").replace("*", ".*")
+)
+for ext in self.__project.getFileCategoryExtension(
+# __IGNORE_WARNING__
+fileType
+)
+]
 )
-]
-)
-if self.formsCheckBox.isChecked():
-filters.extend(
-[
-"^{0}$".format(
-assoc.replace(".", r"\.").replace("*", ".*")
-)
-for assoc in self.project.getFiletypeAssociations(
-"FORMS"
-)
-]
-)
-if self.interfacesCheckBox.isChecked():
-filters.extend(
-[
-"^{0}$".format(
-assoc.replace(".", r"\.").replace("*", ".*")
-)
-for assoc in self.project.getFiletypeAssociations(
-"INTERFACES"
-)
-]
-)
-if self.protocolsCheckBox.isChecked():
-filters.extend(
-[
-"^{0}$".format(
-assoc.replace(".", r"\.").replace("*", ".*")
-)
-for assoc in self.project.getFiletypeAssociations(
-"PROTOCOLS"
-)
-]
-)
-if self.resourcesCheckBox.isChecked():
-filters.extend(
-[
-"^{0}$".format(
-assoc.replace(".", r"\.").replace("*", ".*")
-)
-for assoc in self.project.getFiletypeAssociations(
-"RESOURCES"
-)
-]
-)
-else:
-# TODO: make this more generic (use project browser type repository
-if self.sourcesCheckBox.isChecked():
-filters.extend(
-[
-"^{0}$".format(
-assoc.replace(".", r"\.").replace("*", ".*")
-)
-for assoc in list(
-Preferences.getEditorLexerAssocs().keys()
-)
-if assoc
-not in self.formsExt
-+ self.interfacesExt
-+ self.protocolsExt
-+ self.resourcesExt
-]
-)
-if self.formsCheckBox.isChecked():
-filters.append(self.filterForms)
-if self.interfacesCheckBox.isChecked():
-filters.append(self.filterInterfaces)
-if self.protocolsCheckBox.isChecked():
-filters.append(self.filterProtocols)
-if self.resourcesCheckBox.isChecked():
-filters.append(self.filterResources)
 filterString = "|".join(filters)
 filterRe = re.compile(filterString)
 files = self.__getFileList(
 os.path.abspath(self.dirPicker.currentText()),
 filterRe,
 found = False
 if self.__cancelSearch:
 break
 fn = (
-os.path.join(self.project.getProjectPath(), file)
+os.path.join(self.__project.getProjectPath(), file)
 if self.projectButton.isChecked()
 else file
 )
 # read the file and split it into textlines
 try:
 line = 1
 start = 0
 end = 0
 fileName = (
-os.path.join(self.project.getProjectPath(), file)
+os.path.join(self.__project.getProjectPath(), file)
-if self.project.isOpen()
+if self.__project.isOpen()
 else file
 )
 fileExt = os.path.splitext(fileName)[1]
 if fileExt == ".ui":
 ]:
 file = itm.text(0)
 origHash = itm.data(0, self.md5Role)
 if self.projectButton.isChecked():
-fn = os.path.join(self.project.getProjectPath(), file)
+fn = os.path.join(self.__project.getProjectPath(), file)
 else:
 fn = file
 # read the file and split it into textlines
 try:

Mercurial Repositories > eric / file comparison

comparison: src/eric7/UI/FindFileWidget.py

src/eric7/UI/FindFileWidget.py