Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
- changeset 96
- 9624a110667d
- parent 13
- 1af94a91f439
- child 540
- 2631831b4052
- child 792
- a13346916170
equal
deleted
inserted
replaced
| 95:261bc03812fd | 96:9624a110667d |
|---|---|
| 112 parent) | 112 parent) |
| 113 permButton = msgBox.addButton(self.trUtf8("&Permanent accept"), | 113 permButton = msgBox.addButton(self.trUtf8("&Permanent accept"), |
| 114 QMessageBox.AcceptRole) | 114 QMessageBox.AcceptRole) |
| 115 tempButton = msgBox.addButton(self.trUtf8("&Temporary accept"), | 115 tempButton = msgBox.addButton(self.trUtf8("&Temporary accept"), |
| 116 QMessageBox.AcceptRole) | 116 QMessageBox.AcceptRole) |
| 117 rejectButton = msgBox.addButton(self.trUtf8("&Reject"), | 117 msgBox.addButton(self.trUtf8("&Reject"), QMessageBox.RejectRole) |
| 118 QMessageBox.RejectRole) | |
| 119 msgBox.exec_() | 118 msgBox.exec_() |
| 120 if cursor is not None: | 119 if cursor is not None: |
| 121 QApplication.setOverrideCursor(cursor) | 120 QApplication.setOverrideCursor(cursor) |
| 122 if msgBox.clickedButton() == permButton: | 121 if msgBox.clickedButton() == permButton: |
| 123 return (True, trust_dict["failures"], True) | 122 return (True, trust_dict["failures"], True) |
