--- a/ProjectDjango/DjangoLoaddataDataDialog.py Fri Dec 31 13:17:55 2021 +0100 +++ b/ProjectDjango/DjangoLoaddataDataDialog.py Wed Sep 21 16:42:20 2022 +0200 @@ -24,10 +24,11 @@ """ Class implementing a dialog to enter the data for the 'loaddata' command. """ + def __init__(self, project, parent=None): """ Constructor - + @param project reference to the Django project object @type Project @param parent reference to the parent widget @@ -35,27 +36,25 @@ """ super().__init__(parent) self.setupUi(self) - + self.fixtureFileButton.setIcon(UI.PixmapCache.getIcon("open")) - + self.__project = project - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(False) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) - + @pyqtSlot(str) def on_fixturesEdit_textChanged(self, txt): """ Private slot to handle a change of the fixtures text. - + @param txt text of the line edit (string) """ - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(bool(txt)) - + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(bool(txt)) + @pyqtSlot() def on_fixtureFileButton_clicked(self): """ @@ -63,24 +62,27 @@ """ fileFilters = self.tr("JSON Files (*.json);;XML Files (*.xml);;") with contextlib.suppress(ImportError): - import yaml # __IGNORE_WARNING__ + import yaml # __IGNORE_WARNING__ + fileFilters += self.tr("YAML Files (*.yaml);;") fileFilters += self.tr("All Files (*)") - + fixtureFiles = EricFileDialog.getOpenFileNames( self, self.tr("Select fixture file"), self.__project.getProjectPath(), - fileFilters) - + fileFilters, + ) + if fixtureFiles: - self.fixturesEdit.setText(" ".join( - [Utilities.toNativeSeparators(f) for f in fixtureFiles])) - + self.fixturesEdit.setText( + " ".join([Utilities.toNativeSeparators(f) for f in fixtureFiles]) + ) + def getData(self): """ Public method to get the data entered into the dialog. - + @return tuple containing the list of fixtures, list of apps to exclude, application to search in and a flag indicating to ignore non-existing fields and models @@ -88,9 +90,13 @@ """ fixturesStr = self.fixturesEdit.text() fixtures = fixturesStr.split() - + excludeStr = self.excludeEdit.text() excludes = excludeStr.split() - - return (fixtures, excludes, self.appEdit.text(), - self.ignoreCheckBox.isChecked()) + + return ( + fixtures, + excludes, + self.appEdit.text(), + self.ignoreCheckBox.isChecked(), + )