Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3058
- 0a02c433f52d
- parent 3036
- 30c81c9e88b8
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 81 self, | 81 self, |
| 82 self.trUtf8("Unsaved Changes"), | 82 self.trUtf8("Unsaved Changes"), |
| 83 self.trUtf8("""The guards list has been changed.""" | 83 self.trUtf8("""The guards list has been changed.""" |
| 84 """ Shall the changes be applied?"""), | 84 """ Shall the changes be applied?"""), |
| 85 E5MessageBox.StandardButtons( | 85 E5MessageBox.StandardButtons( |
| 86 E5MessageBox.Apply | \ | 86 E5MessageBox.Apply | |
| 87 E5MessageBox.Discard), | 87 E5MessageBox.Discard), |
| 88 E5MessageBox.Apply) | 88 E5MessageBox.Apply) |
| 89 if res == E5MessageBox.Apply: | 89 if res == E5MessageBox.Apply: |
| 90 self.__applyGuards() | 90 self.__applyGuards() |
| 91 else: | 91 else: |
| 124 self, | 124 self, |
| 125 self.trUtf8("Unsaved Changes"), | 125 self.trUtf8("Unsaved Changes"), |
| 126 self.trUtf8("""The guards list has been changed.""" | 126 self.trUtf8("""The guards list has been changed.""" |
| 127 """ Shall the changes be applied?"""), | 127 """ Shall the changes be applied?"""), |
| 128 E5MessageBox.StandardButtons( | 128 E5MessageBox.StandardButtons( |
| 129 E5MessageBox.Apply | \ | 129 E5MessageBox.Apply | |
| 130 E5MessageBox.Discard), | 130 E5MessageBox.Discard), |
| 131 E5MessageBox.Apply) | 131 E5MessageBox.Apply) |
| 132 if res == E5MessageBox.Apply: | 132 if res == E5MessageBox.Apply: |
| 133 self.__applyGuards() | 133 self.__applyGuards() |
| 134 else: | 134 else: |
| 316 if error: | 316 if error: |
| 317 E5MessageBox.warning( | 317 E5MessageBox.warning( |
| 318 self, | 318 self, |
| 319 self.trUtf8("Apply Guard Definitions"), | 319 self.trUtf8("Apply Guard Definitions"), |
| 320 self.trUtf8("""<p>The defined guards could not be""" | 320 self.trUtf8("""<p>The defined guards could not be""" |
| 321 """ applied.</p><p>Reason: {0}</p>""")\ | 321 """ applied.</p><p>Reason: {0}</p>""") |
| 322 .format(error)) | 322 .format(error)) |
| 323 else: | 323 else: |
| 324 self.__dirtyList = False | 324 self.__dirtyList = False |
| 325 self.on_patchSelector_activated( | 325 self.on_patchSelector_activated( |
| 326 self.patchNameLabel.text()) | 326 self.patchNameLabel.text()) |
