eric: comparison src/eric7/Project/FiletypeAssociationDialog.py

-:275334bc9607
+:0f023e61a9b5
 #
 """
 Module implementing a dialog to enter filetype associations for the project.
 """
-import contextlib
 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QHeaderView, QTreeWidgetItem
 from .Ui_FiletypeAssociationDialog import Ui_FiletypeAssociationDialog
 )
 self.filetypeAssociationList.header().setSortIndicator(
 0, Qt.SortOrder.AscendingOrder
 )
-# keep these lists in sync
+self.__project = project
-self.filetypes = [
-"SOURCES",
-"FORMS",
-"TRANSLATIONS",
-"RESOURCES",
-"INTERFACES",
-"PROTOCOLS",
-"OTHERS",
-"__IGNORE__",
-]
-self.filetypeStrings = [
-self.tr("Sources"),
-self.tr("Forms"),
-self.tr("Translations"),
-self.tr("Resources"),
-self.tr("Interfaces"),
-self.tr("Protocols"),
-self.tr("Others"),
-self.tr("Ignore"),
-]
-self.filetypeCombo.addItems(self.filetypeStrings)
-self.project = project
+self.filetypeCombo.addItem("", "")
-for pattern, filetype in list(
+for fileCategory in sorted(self.__project.getFileCategories()):
-self.project.getProjectData(dataKey="FILETYPES").items()
+self.filetypeCombo.addItem(
-):
+self.__project.getFileCategoryType(fileCategory), fileCategory
-with contextlib.suppress(ValueError):
+)
-index = self.filetypes.index(filetype)
+self.filetypeCombo.addItem(self.tr("Ignore"), "__IGNORE__")
-self.__createItem(pattern, self.filetypeStrings[index])
+for pattern, filetype in self.__project.getProjectData(
+dataKey="FILETYPES"
+).items():
+try:
+self.__createItem(
+pattern, self.__project.getFileCategoryType(filetype), filetype
+)
+except KeyError:
+if filetype == "__IGNORE__":
+self.__createItem(pattern, self.tr("Ignore"), "__IGNORE__")
+else:
+raise  # re-raise the error if the type is not __IGNORE__
 self.__resort()
 self.__reformat()
 def __resort(self):
 self.filetypeAssociationList.header().resizeSections(
 QHeaderView.ResizeMode.ResizeToContents
 )
 self.filetypeAssociationList.header().setStretchLastSection(True)
-def __createItem(self, pattern, filetype):
+def __createItem(self, pattern, filetypeStr, fileCategory):
 """
 Private slot to create a new entry in the association list.
-@param pattern pattern of the entry (string)
+@param pattern pattern of the entry
-@param filetype file type of the entry (string)
+@type str
-@return reference to the newly generated entry (QTreeWidgetItem)
+@param filetypeStr file type user string of the entry
+@type str
+@param fileCategory category of the file
+@type str
+@return reference to the newly generated entry
+@rtype QTreeWidgetItem
 """
-itm = QTreeWidgetItem(self.filetypeAssociationList, [pattern, filetype])
+itm = QTreeWidgetItem(self.filetypeAssociationList, [pattern, filetypeStr])
+itm.setData(1, Qt.ItemDataRole.UserRole, fileCategory)
 return itm
 def on_filetypeAssociationList_currentItemChanged(self, itm, prevItm):
 """
 Private slot to handle the currentItemChanged signal of the
 self.filePatternEdit.clear()
 self.filetypeCombo.setCurrentIndex(0)
 self.deleteAssociationButton.setEnabled(False)
 else:
 self.filePatternEdit.setText(itm.text(0))
-self.filetypeCombo.setCurrentIndex(self.filetypeCombo.findText(itm.text(1)))
+self.filetypeCombo.setCurrentText(itm.text(1))
 self.deleteAssociationButton.setEnabled(True)
 @pyqtSlot()
 def on_addAssociationButton_clicked(self):
 """
 Private slot to add the association displayed to the list.
 """
 pattern = self.filePatternEdit.text()
 filetype = self.filetypeCombo.currentText()
+fileCategory = self.filetypeCombo.currentData()
 if pattern:
 items = self.filetypeAssociationList.findItems(
 pattern, Qt.MatchFlag.MatchExactly, 0
 )
 for itm in items:
 itm = self.filetypeAssociationList.takeTopLevelItem(
 self.filetypeAssociationList.indexOfTopLevelItem(itm)
 )
 del itm
-itm = self.__createItem(pattern, filetype)
+itm = self.__createItem(pattern, filetype, fileCategory)
 self.__resort()
 self.__reformat()
 self.filePatternEdit.clear()
 self.filetypeCombo.setCurrentIndex(0)
 self.filetypeAssociationList.setCurrentItem(itm)
 def on_filePatternEdit_textChanged(self, txt):
 """
 Private slot to handle the textChanged signal of the pattern lineedit.
-@param txt text of the lineedit (string)
+@param txt text of the line edit (string)
 """
 if not txt:
-self.addAssociationButton.setEnabled(False)
 self.deleteAssociationButton.setEnabled(False)
 else:
-self.addAssociationButton.setEnabled(True)
 if len(self.filetypeAssociationList.selectedItems()) == 0:
 self.deleteAssociationButton.setEnabled(False)
 else:
 self.deleteAssociationButton.setEnabled(
 self.filetypeAssociationList.selectedItems()[0].text(0) == txt
 )
+self.__updateAddButton()
+@pyqtSlot(int)
+def on_filetypeCombo_currentIndexChanged(self, index):
+"""
+Private slot handling the selection of a file type.
+@param index index of the selected entry
+@type int
+"""
+self.__updateAddButton()
+def __updateAddButton(self):
+"""
+Private method to update the enabled state of the 'add' button.
+"""
+self.addAssociationButton.setEnabled(
+bool(self.filePatternEdit.text()) and bool(self.filetypeCombo.currentText())
+)
 def transferData(self):
 """
 Public slot to transfer the associations into the projects data
 structure.
 """
-self.project.setProjectData({}, dataKey="FILETYPES")
+fileTypes = {}
 for index in range(self.filetypeAssociationList.topLevelItemCount()):
 itm = self.filetypeAssociationList.topLevelItem(index)
-pattern = itm.text(0)
+fileTypes[itm.text(0)] = itm.data(1, Qt.ItemDataRole.UserRole)
-index = self.filetypeStrings.index(itm.text(1))
+self.__project.setProjectData(fileTypes, dataKey="FILETYPES")
-fileTypes = self.project.getProjectData(dataKey="FILETYPES")
-fileTypes[pattern] = self.filetypes[index]
-self.project.setProjectData(fileTypes, dataKey="FILETYPES")

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Project/FiletypeAssociationDialog.py

src/eric7/Project/FiletypeAssociationDialog.py