Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- branch
- eric7
- changeset 9473
- 3f23dbf37dbe
- parent 9413
- 80c06d472826
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9472:5798ee4a8807 | 9473:3f23dbf37dbe |
|---|---|
| 6 """ | 6 """ |
| 7 Module implementing a dialog to show a list of files which had or still have | 7 Module implementing a dialog to show a list of files which had or still have |
| 8 conflicts. | 8 conflicts. |
| 9 """ | 9 """ |
| 10 | 10 |
| 11 from PyQt6.QtCore import pyqtSlot, Qt, QPoint | 11 from PyQt6.QtCore import QPoint, Qt, pyqtSlot |
| 12 from PyQt6.QtWidgets import ( | 12 from PyQt6.QtWidgets import ( |
| 13 QAbstractButton, | 13 QAbstractButton, |
| 14 QApplication, | |
| 14 QDialogButtonBox, | 15 QDialogButtonBox, |
| 15 QHeaderView, | 16 QHeaderView, |
| 16 QTreeWidgetItem, | 17 QTreeWidgetItem, |
| 17 QApplication, | |
| 18 QWidget, | 18 QWidget, |
| 19 ) | 19 ) |
| 20 | 20 |
| 21 from eric7.EricWidgets.EricApplication import ericApp | 21 from eric7.EricWidgets.EricApplication import ericApp |
| 22 from eric7.Utilities import MimeTypes | |
| 22 | 23 |
| 23 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog | 24 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog |
| 24 | |
| 25 from eric7.Utilities import MimeTypes | |
| 26 | 25 |
| 27 | 26 |
| 28 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog): | 27 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog): |
| 29 """ | 28 """ |
| 30 Class implementing a dialog to show a list of files which had or still | 29 Class implementing a dialog to show a list of files which had or still |
