--- a/src/eric7/Tasks/TaskFilterConfigDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Tasks/TaskFilterConfigDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -18,16 +18,17 @@ """ Class implementing the task filter configuration dialog. """ + def __init__(self, taskFilter, parent=None): """ Constructor - + @param taskFilter the task filter object to be configured @param parent the parent widget (QWidget) """ super().__init__(parent) self.setupUi(self) - + self.typeCombo.addItem("", TaskType.NONE) self.typeCombo.addItem(self.tr("Bugfix"), TaskType.FIXME) self.typeCombo.addItem(self.tr("Warning"), TaskType.WARNING) @@ -35,32 +36,30 @@ self.typeCombo.addItem(self.tr("Note"), TaskType.NOTE) self.typeCombo.addItem(self.tr("Test"), TaskType.TEST) self.typeCombo.addItem(self.tr("Documentation"), TaskType.DOCU) - - if ( - taskFilter.summaryFilter is None or - not taskFilter.summaryFilter.pattern - ): + + if taskFilter.summaryFilter is None or not taskFilter.summaryFilter.pattern: self.summaryGroup.setChecked(False) self.summaryEdit.clear() else: self.summaryGroup.setChecked(True) self.summaryEdit.setText(taskFilter.summaryFilter.pattern) - + if not taskFilter.filenameFilter: self.filenameGroup.setChecked(False) self.filenameEdit.clear() else: self.filenameGroup.setChecked(True) self.filenameEdit.setText(taskFilter.filenameFilter) - + if taskFilter.typeFilter == TaskType.NONE: self.typeGroup.setChecked(False) self.typeCombo.setCurrentIndex(0) else: self.typeGroup.setChecked(True) self.typeCombo.setCurrentIndex( - self.typeCombo.findData(taskFilter.typeFilter)) - + self.typeCombo.findData(taskFilter.typeFilter) + ) + if taskFilter.scopeFilter is None: self.scopeGroup.setChecked(False) self.globalRadioButton.setChecked(True) @@ -70,7 +69,7 @@ self.projectRadioButton.setChecked(True) else: self.globalRadioButton.setChecked(True) - + if taskFilter.statusFilter is None: self.statusGroup.setChecked(False) self.uncompletedRadioButton.setChecked(True) @@ -80,7 +79,7 @@ self.completedRadioButton.setChecked(True) else: self.uncompletedRadioButton.setChecked(True) - + if taskFilter.prioritiesFilter is None: self.priorityGroup.setChecked(False) self.priorityHighCheckBox.setChecked(False) @@ -89,40 +88,41 @@ else: self.priorityGroup.setChecked(True) self.priorityHighCheckBox.setChecked( - TaskPriority.HIGH in taskFilter.prioritiesFilter) + TaskPriority.HIGH in taskFilter.prioritiesFilter + ) self.priorityNormalCheckBox.setChecked( - TaskPriority.NORMAL in taskFilter.prioritiesFilter) + TaskPriority.NORMAL in taskFilter.prioritiesFilter + ) self.priorityLowCheckBox.setChecked( - TaskPriority.LOW in taskFilter.prioritiesFilter) - + TaskPriority.LOW in taskFilter.prioritiesFilter + ) + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) - + def configureTaskFilter(self, taskFilter): """ Public method to set the parameters of the task filter object. - + @param taskFilter the task filter object to be configured """ if self.summaryGroup.isChecked(): taskFilter.setSummaryFilter(self.summaryEdit.text()) else: taskFilter.setSummaryFilter(None) - + if self.filenameGroup.isChecked(): taskFilter.setFileNameFilter(self.filenameEdit.text()) else: taskFilter.setFileNameFilter("") - + if self.typeGroup.isChecked(): taskFilter.setTypeFilter( - TaskType( - self.typeCombo.itemData(self.typeCombo.currentIndex()) - ) + TaskType(self.typeCombo.itemData(self.typeCombo.currentIndex())) ) else: taskFilter.setTypeFilter(TaskType.NONE) - + if self.scopeGroup.isChecked(): if self.projectRadioButton.isChecked(): taskFilter.setScopeFilter(True) @@ -130,7 +130,7 @@ taskFilter.setScopeFilter(False) else: taskFilter.setScopeFilter(None) - + if self.statusGroup.isChecked(): if self.completedRadioButton.isChecked(): taskFilter.setStatusFilter(True) @@ -138,7 +138,7 @@ taskFilter.setStatusFilter(False) else: taskFilter.setStatusFilter(None) - + if self.priorityGroup.isChecked(): priorities = [] if self.priorityHighCheckBox.isChecked():