Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Sat May 07 13:37:58 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Sat May 07 17:56:31 2011 +0200
@@ -17,26 +17,85 @@
     """
     Class implementing a dialog to enter the data for a backout operation.
     """
-    def __init__(self, tagsList, branchesList, parent=None):
+    def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None):
         """
         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)
         """
         QDialog.__init__(self, parent)
         self.setupUi(self)
         
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        
         self.tagCombo.addItems(sorted(tagsList))
         self.branchCombo.addItems(["default"] + sorted(branchesList))
-        
-        self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
-        self.okButton.setEnabled(False)
+        if bookmarksList is not None:
+            self.bookmarkCombo.addItems(sorted(bookmarksList))
+        else:
+            self.bookmarkButton.setHidden(True)
+            self.bookmarkCombo.setHidden(True)
         
         self.__initDateTime = QDateTime.currentDateTime()
         self.dateEdit.setDateTime(self.__initDateTime)
     
+    def __updateOK(self):
+        """
+        Private slot to update the OK button.
+        """
+        enabled = True
+        if self.noneButton.isChecked():
+            enabled = False
+        elif self.idButton.isChecked():
+            enabled = self.idEdit.text() != ""
+        elif self.tagButton.isChecked():
+            enabled = self.tagCombo.currentText() != ""
+        elif self.branchButton.isChecked():
+            enabled = self.branchCombo.currentText() != ""
+        elif self.bookmarkButton.isChecked():
+            enabled = self.bookmarkCombo.currentText() != ""
+        
+        self.buttonBox.button(QDialogButtonBox.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(bool)
     def on_noneButton_toggled(self, checked):
         """
@@ -44,7 +103,43 @@
         
         @param checked flag indicating the checked state (boolean)
         """
-        self.okButton.setEnabled(not checked)
+        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):
         """
@@ -62,6 +157,8 @@
             rev = self.tagCombo.currentText()
         elif self.branchButton.isChecked():
             rev = self.branchCombo.currentText()
+        elif self.bookmarkButton.isChecked():
+            rev = self.bookmarkCombo.currentText()
         else:
             rev = ""