Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py
Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py
- changeset 221
- 38689444e922
- parent 178
- dd9f0bca5e2f
- child 417
- 459855d3066e
- child 792
- a13346916170
equal
deleted
inserted
replaced
| 220:92b796009140 | 221:38689444e922 |
|---|---|
| 125 self.process.state() != QProcess.NotRunning: | 125 self.process.state() != QProcess.NotRunning: |
| 126 self.process.terminate() | 126 self.process.terminate() |
| 127 QTimer.singleShot(2000, self.process.kill) | 127 QTimer.singleShot(2000, self.process.kill) |
| 128 self.process.waitForFinished(3000) | 128 self.process.waitForFinished(3000) |
| 129 | 129 |
| 130 self.inputGroup.setEnabled(False) | |
| 131 self.inputGroup.hide() | |
| 132 | |
| 130 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) | 133 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
| 131 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) | 134 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
| 132 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) | 135 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
| 133 | 136 self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) |
| 134 self.inputGroup.setEnabled(False) | |
| 135 self.inputGroup.hide() | |
| 136 | 137 |
| 137 self.process = None | 138 self.process = None |
| 138 | 139 |
| 139 self.annotateList.doItemsLayout() | 140 self.annotateList.doItemsLayout() |
| 140 self.__resizeColumns() | 141 self.__resizeColumns() |
