Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnDialog.py
- changeset 3009
- bf5ae5d7477d
- parent 2771
- 281c9b30dd91
- child 3020
- 542e97d4ecb3
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 3008:7848489bcb92 | 3009:bf5ae5d7477d |
|---|---|
| 46 | 46 |
| 47 self.outputGroup.setTitle(text) | 47 self.outputGroup.setTitle(text) |
| 48 | 48 |
| 49 def __finish(self): | 49 def __finish(self): |
| 50 """ | 50 """ |
| 51 Private slot called when the process finished or the user pressed the button. | 51 Private slot called when the process finished or the user pressed the |
| 52 button. | |
| 52 """ | 53 """ |
| 53 if self.proc is not None and \ | 54 if self.proc is not None and \ |
| 54 self.proc.state() != QProcess.NotRunning: | 55 self.proc.state() != QProcess.NotRunning: |
| 55 self.proc.terminate() | 56 self.proc.terminate() |
| 56 QTimer.singleShot(2000, self.proc.kill) | 57 QTimer.singleShot(2000, self.proc.kill) |
| 66 self.proc = None | 67 self.proc = None |
| 67 | 68 |
| 68 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) | 69 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
| 69 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) | 70 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
| 70 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) | 71 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
| 71 self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) | 72 self.buttonBox.button(QDialogButtonBox.Close).setFocus( |
| 73 Qt.OtherFocusReason) | |
| 72 | 74 |
| 73 if Preferences.getVCS("AutoClose") and \ | 75 if Preferences.getVCS("AutoClose") and \ |
| 74 self.normal and \ | 76 self.normal and \ |
| 75 self.errors.toPlainText() == "": | 77 self.errors.toPlainText() == "": |
| 76 self.accept() | 78 self.accept() |
