--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Wed Apr 13 18:16:23 2022 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Wed Apr 13 19:49:25 2022 +0200
@@ -22,10 +22,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 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)
@@ -41,9 +45,24 @@
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)
+
msh = self.minimumSizeHint()
self.resize(max(self.width(), msh.width()), msh.height())
+ @pyqtSlot()
def __updateOK(self):
"""
Private slot to update the OK button.
@@ -57,88 +76,19 @@
enabled = self.branchCombo.currentText() != ""
elif self.bookmarkButton.isChecked():
enabled = 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 getParameters(self):
"""
Public method to retrieve the merge data.
@return tuple naming the revision and a flag indicating a
- forced merge (string, boolean)
+ forced merge
+ @rtype tuple of (str, bool)
"""
if self.numberButton.isChecked():
rev = "rev({0})".format(self.numberSpinBox.value())
@@ -150,6 +100,8 @@
rev = self.branchCombo.currentText()
elif self.bookmarkButton.isChecked():
rev = self.bookmarkCombo.currentText()
+ elif self.expressionButton.isChecked():
+ rev = self.expressionEdit.text()
else:
rev = ""
