diff -r 640778fcd474 -r 9fe8cfa14542 eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Wed Apr 13 18:16:23 2022 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Wed Apr 13 19:49:25 2022 +0200
@@ -24,10 +24,14 @@
"""
Constructor
- @param tagsList list of tags (list of strings)
- @param branchesList list of branches (list of strings)
- @param bookmarksList list of bookmarks (list of strings)
- @param parent reference to the parent widget (QWidget)
+ @param tagsList list of tags
+ @type list of str
+ @param branchesList list of branches
+ @type list of str
+ @param bookmarksList list of bookmarks
+ @type list of str
+ @param parent parent widget
+ @type QWidget
"""
super().__init__(parent)
self.setupUi(self)
@@ -48,7 +52,22 @@
else:
self.bookmarkButton.setHidden(True)
self.bookmarkCombo.setHidden(True)
+
+ # connect various radio buttons and input fields
+ self.idButton.toggled.connect(self.__updateOK)
+ self.tagButton.toggled.connect(self.__updateOK)
+ self.branchButton.toggled.connect(self.__updateOK)
+ self.bookmarkButton.toggled.connect(self.__updateOK)
+ self.expressionButton.toggled.connect(self.__updateOK)
+
+ self.idEdit.textChanged.connect(self.__updateOK)
+ self.expressionEdit.textChanged.connect(self.__updateOK)
+
+ self.tagCombo.editTextChanged.connect(self.__updateOK)
+ self.branchCombo.editTextChanged.connect(self.__updateOK)
+ self.bookmarkCombo.editTextChanged.connect(self.__updateOK)
+ @pyqtSlot()
def __updateOK(self):
"""
Private slot to update the OK button.
@@ -62,82 +81,12 @@
enabled = enabled and self.branchCombo.currentText() != ""
elif self.bookmarkButton.isChecked():
enabled = enabled and self.bookmarkCombo.currentText() != ""
+ elif self.expressionButton.isChecked():
+ enabled = enabled and bool(self.expressionEdit.text())
self.buttonBox.button(
QDialogButtonBox.StandardButton.Ok).setEnabled(enabled)
- @pyqtSlot(bool)
- def on_idButton_toggled(self, checked):
- """
- Private slot to handle changes of the ID select button.
-
- @param checked state of the button (boolean)
- """
- self.__updateOK()
-
- @pyqtSlot(bool)
- def on_tagButton_toggled(self, checked):
- """
- Private slot to handle changes of the Tag select button.
-
- @param checked state of the button (boolean)
- """
- self.__updateOK()
-
- @pyqtSlot(bool)
- def on_branchButton_toggled(self, checked):
- """
- Private slot to handle changes of the Branch select button.
-
- @param checked state of the button (boolean)
- """
- self.__updateOK()
-
- @pyqtSlot(bool)
- def on_bookmarkButton_toggled(self, checked):
- """
- Private slot to handle changes of the Bookmark select button.
-
- @param checked state of the button (boolean)
- """
- self.__updateOK()
-
- @pyqtSlot(str)
- def on_idEdit_textChanged(self, txt):
- """
- Private slot to handle changes of the ID edit.
-
- @param txt text of the edit (string)
- """
- self.__updateOK()
-
- @pyqtSlot(str)
- def on_tagCombo_editTextChanged(self, txt):
- """
- Private slot to handle changes of the Tag combo.
-
- @param txt text of the combo (string)
- """
- self.__updateOK()
-
- @pyqtSlot(str)
- def on_branchCombo_editTextChanged(self, txt):
- """
- Private slot to handle changes of the Branch combo.
-
- @param txt text of the combo (string)
- """
- self.__updateOK()
-
- @pyqtSlot(str)
- def on_bookmarkCombo_editTextChanged(self, txt):
- """
- Private slot to handle changes of the Bookmark combo.
-
- @param txt text of the combo (string)
- """
- self.__updateOK()
-
def getData(self):
"""
Public method to retrieve the entered data.
@@ -145,7 +94,8 @@
@return tuple giving the revision, a flag indicating not to commit
the signature, a commit message, an ID of the key to be used,
a flag indicating a local signature and a flag indicating a forced
- signature (string, boolean, string, string, boolean, boolean)
+ signature
+ @rtype tuple of (str, bool, str, str, bool, bool)
"""
if self.numberButton.isChecked():
rev = str(self.numberSpinBox.value())
@@ -157,6 +107,8 @@
rev = self.branchCombo.currentText()
elif self.bookmarkButton.isChecked():
rev = self.bookmarkCombo.currentText()
+ elif self.expressionButton.isChecked():
+ rev = self.expressionEdit.text()
else:
rev = ""
