--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -21,10 +21,11 @@ """ Class implementing a dialog to enter data for the Mercurial export command. """ + def __init__(self, bookmarksList, bookmarkAvailable, parent=None): """ Constructor - + @param bookmarksList list of defined bookmarks @type list of str @param bookmarkAvailable flag indicating the availability of the @@ -35,66 +36,66 @@ """ super().__init__(parent) self.setupUi(self) - + self.directoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE) - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(False) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) + # set default values for directory and pattern self.patternEdit.setText("%b_%r_%h_%n_of_%N.diff") self.directoryPicker.setText(QDir.tempPath()) - + self.bookmarkCombo.addItem("") self.bookmarkCombo.addItems(sorted(bookmarksList)) self.bookmarkCombo.setEnabled(bookmarkAvailable) - + def __updateOK(self): """ Private slot to update the OK button. """ enabled = True - + if ( - self.directoryPicker.text() == "" or - self.patternEdit.text() == "" or - (self.changesetsEdit.toPlainText() == "" and - self.bookmarkCombo.currentText() == "") + self.directoryPicker.text() == "" + or self.patternEdit.text() == "" + or ( + self.changesetsEdit.toPlainText() == "" + and self.bookmarkCombo.currentText() == "" + ) ): enabled = False - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) + @pyqtSlot(str) def on_directoryPicker_textChanged(self, txt): """ Private slot to react on changes of the export directory edit. - + @param txt contents of the line edit (string) """ self.__updateOK() - + @pyqtSlot(str) def on_patternEdit_textChanged(self, txt): """ Private slot to react on changes of the export file name pattern edit. - + @param txt contents of the line edit (string) """ self.__updateOK() - + @pyqtSlot() def on_changesetsEdit_textChanged(self): """ Private slot to react on changes of the changesets edit. """ self.__updateOK() - + def getParameters(self): """ Public method to retrieve the export data. - + @return tuple naming the output file name, the list of revisions to export, the name of a bookmarked branch and flags indicating to compare against the second parent, to treat all files as text, @@ -103,13 +104,11 @@ @rtype tuple of (str, list of str, str, bool, bool, bool, bool) """ return ( - os.path.join( - self.directoryPicker.text(), - self.patternEdit.text()), + os.path.join(self.directoryPicker.text(), self.patternEdit.text()), self.changesetsEdit.toPlainText().splitlines(), self.bookmarkCombo.currentText(), self.switchParentCheckBox.isChecked(), self.textCheckBox.isChecked(), self.datesCheckBox.isChecked(), - self.gitCheckBox.isChecked() + self.gitCheckBox.isChecked(), )