Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
- changeset 7759
- 51aa6c6b66f7
- parent 7360
- 9190402e4505
- child 7771
- 787a6b3f8c9f
equal
deleted
inserted
replaced
| 7758:dd54d33d21d2 | 7759:51aa6c6b66f7 |
|---|---|
| 66 cursor = QApplication.overrideCursor() | 66 cursor = QApplication.overrideCursor() |
| 67 if cursor is not None: | 67 if cursor is not None: |
| 68 QApplication.restoreOverrideCursor() | 68 QApplication.restoreOverrideCursor() |
| 69 parent = isinstance(self, QWidget) and self or None | 69 parent = isinstance(self, QWidget) and self or None |
| 70 dlg = SvnLoginDialog(realm, username, may_save, parent) | 70 dlg = SvnLoginDialog(realm, username, may_save, parent) |
| 71 res = dlg.exec_() | 71 res = dlg.exec() |
| 72 if cursor is not None: | 72 if cursor is not None: |
| 73 QApplication.setOverrideCursor(Qt.WaitCursor) | 73 QApplication.setOverrideCursor(Qt.WaitCursor) |
| 74 if res == QDialog.Accepted: | 74 if res == QDialog.Accepted: |
| 75 loginData = dlg.getData() | 75 loginData = dlg.getData() |
| 76 return (True, loginData[0], loginData[1], loginData[2]) | 76 return (True, loginData[0], loginData[1], loginData[2]) |
| 116 permButton = msgBox.addButton(self.tr("&Permanent accept"), | 116 permButton = msgBox.addButton(self.tr("&Permanent accept"), |
| 117 E5MessageBox.AcceptRole) | 117 E5MessageBox.AcceptRole) |
| 118 tempButton = msgBox.addButton(self.tr("&Temporary accept"), | 118 tempButton = msgBox.addButton(self.tr("&Temporary accept"), |
| 119 E5MessageBox.AcceptRole) | 119 E5MessageBox.AcceptRole) |
| 120 msgBox.addButton(self.tr("&Reject"), E5MessageBox.RejectRole) | 120 msgBox.addButton(self.tr("&Reject"), E5MessageBox.RejectRole) |
| 121 msgBox.exec_() | 121 msgBox.exec() |
| 122 if cursor is not None: | 122 if cursor is not None: |
| 123 QApplication.setOverrideCursor(Qt.WaitCursor) | 123 QApplication.setOverrideCursor(Qt.WaitCursor) |
| 124 if msgBox.clickedButton() == permButton: | 124 if msgBox.clickedButton() == permButton: |
| 125 return (True, trust_dict["failures"], True) | 125 return (True, trust_dict["failures"], True) |
| 126 elif msgBox.clickedButton() == tempButton: | 126 elif msgBox.clickedButton() == tempButton: |
| 138 if self.logMessage: | 138 if self.logMessage: |
| 139 return True, self.logMessage | 139 return True, self.logMessage |
| 140 else: | 140 else: |
| 141 # call CommitDialog and get message from there | 141 # call CommitDialog and get message from there |
| 142 dlg = SvnCommitDialog(self) | 142 dlg = SvnCommitDialog(self) |
| 143 if dlg.exec_() == QDialog.Accepted: | 143 if dlg.exec() == QDialog.Accepted: |
| 144 msg = dlg.logMessage() | 144 msg = dlg.logMessage() |
| 145 if msg: | 145 if msg: |
| 146 return True, msg | 146 return True, msg |
| 147 else: | 147 else: |
| 148 return True, "***" # always supply a valid log message | 148 return True, "***" # always supply a valid log message |
