diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py --- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -19,13 +19,14 @@ """ Class implementing a dialog to get the data for a new patch. """ + NEW_MODE = 0 REFRESH_MODE = 1 - + def __init__(self, mode, message="", parent=None): """ Constructor - + @param mode mode of the dialog (HgQueuesNewPatchDialog.NEW_MODE, HgQueuesNewPatchDialog.REFRESH_MODE) @param message text to set as the commit message (string) @@ -34,95 +35,92 @@ """ super().__init__(parent) self.setupUi(self) - - if mode not in (HgQueuesNewPatchDialog.REFRESH_MODE, - HgQueuesNewPatchDialog.NEW_MODE): + + if mode not in ( + HgQueuesNewPatchDialog.REFRESH_MODE, + HgQueuesNewPatchDialog.NEW_MODE, + ): raise ValueError("invalid value for mode") - + self.__mode = mode if self.__mode == HgQueuesNewPatchDialog.REFRESH_MODE: self.nameLabel.hide() self.nameEdit.hide() - + project = ericApp().getObject("Project") pwl, pel = project.getProjectDictionaries() language = project.getProjectSpellLanguage() - self.messageEdit.setLanguageWithPWL( - language, pwl or None, pel or None) + self.messageEdit.setLanguageWithPWL(language, pwl or None, pel or None) if message: self.messageEdit.setPlainText(message) - + self.dateTimeEdit.setDateTime(QDateTime.currentDateTime()) - + self.__updateUI() - + def __updateUI(self): """ Private slot to update the UI. """ enable = ( self.messageEdit.toPlainText() != "" - if self.__mode == HgQueuesNewPatchDialog.REFRESH_MODE else - (self.nameEdit.text() != "" and - self.messageEdit.toPlainText() != "") + if self.__mode == HgQueuesNewPatchDialog.REFRESH_MODE + else (self.nameEdit.text() != "" and self.messageEdit.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(str) def on_nameEdit_textChanged(self, txt): """ Private slot to handle changes of the patch name. - + @param txt text of the edit (string) """ self.__updateUI() - + @pyqtSlot() def on_messageEdit_textChanged(self): """ Private slot to handle changes of the patch message. """ self.__updateUI() - + @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 (boolean) """ self.__updateUI() - + @pyqtSlot(bool) def on_currentUserCheckBox_toggled(self, checked): """ Private slot to handle changes of the currentuser state. - + @param checked flag giving the checked state (boolean) """ self.__updateUI() - + @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.__updateUI() - + def getData(self): """ Public method to retrieve the entered data. - + @return tuple giving the patch name and message, a tuple giving a flag indicating to set the user, a flag indicating to use the current user and the user name and another tuple giving a flag @@ -130,11 +128,19 @@ current date and the date (string, string, (boolean, boolean, string), (boolean, boolean, string)) """ - userData = (self.userGroup.isChecked(), - self.currentUserCheckBox.isChecked(), - self.userEdit.text()) - dateData = (self.dateGroup.isChecked(), - self.currentDateCheckBox.isChecked(), - self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm")) - return (self.nameEdit.text().replace(" ", "_"), - self.messageEdit.toPlainText(), userData, dateData) + userData = ( + self.userGroup.isChecked(), + self.currentUserCheckBox.isChecked(), + self.userEdit.text(), + ) + dateData = ( + self.dateGroup.isChecked(), + self.currentDateCheckBox.isChecked(), + self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm"), + ) + return ( + self.nameEdit.text().replace(" ", "_"), + self.messageEdit.toPlainText(), + userData, + dateData, + )