Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 7771
- 787a6b3f8c9f
- parent 7370
- 5fb53279f2df
- child 7923
- 91e843545d9a
equal
deleted
inserted
replaced
| 7770:49f3377aebf1 | 7771:787a6b3f8c9f |
|---|---|
| 130 def __finish(self): | 130 def __finish(self): |
| 131 """ | 131 """ |
| 132 Private slot called when the process finished or the user pressed | 132 Private slot called when the process finished or the user pressed |
| 133 the button. | 133 the button. |
| 134 """ | 134 """ |
| 135 QApplication.restoreOverrideCursor() | |
| 136 | |
| 137 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) | 135 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
| 138 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) | 136 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
| 139 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) | 137 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
| 140 | 138 |
| 141 self.refreshButton.setEnabled(True) | 139 self.refreshButton.setEnabled(True) |
