Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 8218
- 7c09585bd960
- parent 8143
- 2c730d5fd177
equal
deleted
inserted
replaced
| 8217:385f60c94548 | 8218:7c09585bd960 |
|---|---|
| 34 Constructor | 34 Constructor |
| 35 | 35 |
| 36 @param vcs reference to the vcs object | 36 @param vcs reference to the vcs object |
| 37 @param parent parent widget (QWidget) | 37 @param parent parent widget (QWidget) |
| 38 """ | 38 """ |
| 39 super(HgConflictsListDialog, self).__init__(parent) | 39 super().__init__(parent) |
| 40 self.setupUi(self) | 40 self.setupUi(self) |
| 41 | 41 |
| 42 self.__position = QPoint() | 42 self.__position = QPoint() |
| 43 | 43 |
| 44 self.buttonBox.button( | 44 self.buttonBox.button( |
| 80 Public slot to show the dialog. | 80 Public slot to show the dialog. |
| 81 """ | 81 """ |
| 82 if not self.__position.isNull(): | 82 if not self.__position.isNull(): |
| 83 self.move(self.__position) | 83 self.move(self.__position) |
| 84 | 84 |
| 85 super(HgConflictsListDialog, self).show() | 85 super().show() |
| 86 | 86 |
| 87 def start(self): | 87 def start(self): |
| 88 """ | 88 """ |
| 89 Public slot to start the tags command. | 89 Public slot to start the tags command. |
| 90 """ | 90 """ |
