diff -r 92b796009140 -r 38689444e922 Plugins/VcsPlugins/vcsMercurial/HgDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sun May 02 15:44:42 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sun May 02 16:01:15 2010 +0000 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import QProcess, QTimer, SIGNAL, pyqtSlot +from PyQt4.QtCore import QProcess, QTimer, SIGNAL, pyqtSlot, Qt from PyQt4.QtGui import QDialog, QDialogButtonBox, QMessageBox, QLineEdit from .Ui_HgDialog import Ui_HgDialog @@ -53,15 +53,16 @@ QTimer.singleShot(2000, self.proc.kill) self.proc.waitForFinished(3000) - self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - self.inputGroup.setEnabled(False) self.inputGroup.hide() self.proc = None + self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) + if Preferences.getVCS("AutoClose") and \ self.normal and \ self.errors.toPlainText() == "":