--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -17,10 +17,11 @@ """ Class implementing a dialog to enter the data for a graft session. """ + def __init__(self, vcs, revs=None, parent=None): """ Constructor - + @param vcs reference to the VCS object @type Hg @param revs list of revisions to show in the revisions pane @@ -30,71 +31,68 @@ """ super().__init__(parent) self.setupUi(self) - + self.dateTimeEdit.setDateTime(QDateTime.currentDateTime()) - + if revs: self.revisionsEdit.setPlainText("\n".join(sorted(revs))) - + self.noCommitCheckBox.setEnabled(vcs.version >= (4, 7, 0)) - + self.__updateOk() - + def __updateOk(self): """ Private slot to update the state of the OK button. """ enable = self.revisionsEdit.toPlainText() != "" if self.userGroup.isChecked(): - enable = ( - enable and - (self.currentUserCheckBox.isChecked() or - self.userEdit.text() != "") + enable = enable and ( + self.currentUserCheckBox.isChecked() or self.userEdit.text() != "" ) - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(enable) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enable) + @pyqtSlot() def on_revisionsEdit_textChanged(self): """ Private slot to react upon changes of revisions. """ self.__updateOk() - + @pyqtSlot(bool) def on_userGroup_toggled(self, checked): """ Private slot to handle changes of the user group state. - + @param checked flag giving the checked state @type bool """ self.__updateOk() - + @pyqtSlot(bool) def on_currentUserCheckBox_toggled(self, checked): """ Private slot to handle changes of the current user state. - + @param checked flag giving the checked state @type bool """ self.__updateOk() - + @pyqtSlot(str) def on_userEdit_textChanged(self, txt): """ Private slot to handle changes of the user name. - + @param txt text of the edit (string) """ self.__updateOk() - + def getData(self): """ Public method to retrieve the entered data. - + @return tuple with list of revisions, a tuple giving a flag indicating to set the user, a flag indicating to use the current user and the user name, another tuple giving a flag @@ -110,13 +108,13 @@ self.currentUserCheckBox.isChecked(), self.userEdit.text(), ) - + dateData = ( self.dateGroup.isChecked(), self.currentDateCheckBox.isChecked(), self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm"), ) - + return ( self.revisionsEdit.toPlainText().strip().splitlines(), userData,