Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
- changeset 3034
- 7ce719013078
- parent 3020
- 542e97d4ecb3
- child 3036
- 30c81c9e88b8
equal
deleted
inserted
replaced
| 3033:58fe260e7469 | 3034:7ce719013078 |
|---|---|
| 75 self, | 75 self, |
| 76 self.trUtf8("Unsaved Changes"), | 76 self.trUtf8("Unsaved Changes"), |
| 77 self.trUtf8("""The guards list has been changed.""" | 77 self.trUtf8("""The guards list has been changed.""" |
| 78 """ Shall the changes be applied?"""), | 78 """ Shall the changes be applied?"""), |
| 79 E5MessageBox.StandardButtons( | 79 E5MessageBox.StandardButtons( |
| 80 E5MessageBox.Apply | \ | 80 E5MessageBox.Apply | |
| 81 E5MessageBox.Discard), | 81 E5MessageBox.Discard), |
| 82 E5MessageBox.Apply) | 82 E5MessageBox.Apply) |
| 83 if res == E5MessageBox.Apply: | 83 if res == E5MessageBox.Apply: |
| 84 self.__applyGuards() | 84 self.__applyGuards() |
| 85 else: | 85 else: |
| 118 self, | 118 self, |
| 119 self.trUtf8("Unsaved Changes"), | 119 self.trUtf8("Unsaved Changes"), |
| 120 self.trUtf8("""The guards list has been changed.""" | 120 self.trUtf8("""The guards list has been changed.""" |
| 121 """ Shall the changes be applied?"""), | 121 """ Shall the changes be applied?"""), |
| 122 E5MessageBox.StandardButtons( | 122 E5MessageBox.StandardButtons( |
| 123 E5MessageBox.Apply | \ | 123 E5MessageBox.Apply | |
| 124 E5MessageBox.Discard), | 124 E5MessageBox.Discard), |
| 125 E5MessageBox.Apply) | 125 E5MessageBox.Apply) |
| 126 if res == E5MessageBox.Apply: | 126 if res == E5MessageBox.Apply: |
| 127 self.__applyGuards() | 127 self.__applyGuards() |
| 128 else: | 128 else: |
| 310 if error: | 310 if error: |
| 311 E5MessageBox.warning( | 311 E5MessageBox.warning( |
| 312 self, | 312 self, |
| 313 self.trUtf8("Apply Guard Definitions"), | 313 self.trUtf8("Apply Guard Definitions"), |
| 314 self.trUtf8("""<p>The defined guards could not be""" | 314 self.trUtf8("""<p>The defined guards could not be""" |
| 315 """ applied.</p><p>Reason: {0}</p>""")\ | 315 """ applied.</p><p>Reason: {0}</p>""") |
| 316 .format(error)) | 316 .format(error)) |
| 317 else: | 317 else: |
| 318 self.__dirtyList = False | 318 self.__dirtyList = False |
| 319 self.on_patchSelector_activated( | 319 self.on_patchSelector_activated( |
| 320 self.patchNameLabel.text()) | 320 self.patchNameLabel.text()) |
