Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
- branch
- eric7
- changeset 11006
- a671918232f3
- parent 10439
- 21c28b0f9e41
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 11005:b918c6c2736b | 11006:a671918232f3 |
|---|---|
| 70 @rtype tuple of (bool, str, str, bool) | 70 @rtype tuple of (bool, str, str, bool) |
| 71 """ | 71 """ |
| 72 from .SvnLoginDialog import SvnLoginDialog | 72 from .SvnLoginDialog import SvnLoginDialog |
| 73 | 73 |
| 74 with EricOverridenCursor(): | 74 with EricOverridenCursor(): |
| 75 parent = isinstance(self, QWidget) and self or None | 75 parent = self if isinstance(self, QWidget) else None |
| 76 dlg = SvnLoginDialog(realm, username, may_save, parent) | 76 dlg = SvnLoginDialog(realm, username, may_save, parent=parent) |
| 77 res = dlg.exec() | 77 res = dlg.exec() |
| 78 | 78 |
| 79 if res == QDialog.DialogCode.Accepted: | 79 if res == QDialog.DialogCode.Accepted: |
| 80 loginData = dlg.getData() | 80 loginData = dlg.getData() |
| 81 return (True, loginData[0], loginData[1], loginData[2]) | 81 return (True, loginData[0], loginData[1], loginData[2]) |
| 96 @rtype tuple of (bool, list of str, bool) | 96 @rtype tuple of (bool, list of str, bool) |
| 97 """ | 97 """ |
| 98 from eric7.EricWidgets import EricMessageBox | 98 from eric7.EricWidgets import EricMessageBox |
| 99 | 99 |
| 100 with EricOverridenCursor(): | 100 with EricOverridenCursor(): |
| 101 parent = isinstance(self, QWidget) and self or None | 101 parent = self if isinstance(self, QWidget) else None |
| 102 msgBox = EricMessageBox.EricMessageBox( | 102 msgBox = EricMessageBox.EricMessageBox( |
| 103 EricMessageBox.Question, | 103 EricMessageBox.Question, |
| 104 self.tr("Subversion SSL Server Certificate"), | 104 self.tr("Subversion SSL Server Certificate"), |
| 105 self.tr( | 105 self.tr( |
| 106 """<p>Accept the following SSL certificate?</p>""" | 106 """<p>Accept the following SSL certificate?</p>""" |
| 150 | 150 |
| 151 if self.logMessage: | 151 if self.logMessage: |
| 152 return True, self.logMessage | 152 return True, self.logMessage |
| 153 else: | 153 else: |
| 154 # call CommitDialog and get message from there | 154 # call CommitDialog and get message from there |
| 155 dlg = SvnCommitDialog(self) | 155 parent = self if isinstance(self, QWidget) else None |
| 156 dlg = SvnCommitDialog(self, parent=parent) | |
| 156 if dlg.exec() == QDialog.DialogCode.Accepted: | 157 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 157 msg = dlg.logMessage() | 158 msg = dlg.logMessage() |
| 158 if msg: | 159 if msg: |
| 159 return True, msg | 160 return True, msg |
| 160 else: | 161 else: |
