Mercurial Repositories > eric / file comparison
comparison: src/eric7/UI/DiffDialog.py
src/eric7/UI/DiffDialog.py
- branch
- eric7
- changeset 9473
- 3f23dbf37dbe
- parent 9413
- 80c06d472826
- child 9576
- be9f8e7e42e0
equal
deleted
inserted
replaced
| 9472:5798ee4a8807 | 9473:3f23dbf37dbe |
|---|---|
| 5 | 5 |
| 6 """ | 6 """ |
| 7 Module implementing a dialog to compare two files. | 7 Module implementing a dialog to compare two files. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 import contextlib | |
| 10 import os | 11 import os |
| 11 import pathlib | 12 import pathlib |
| 12 import time | 13 import time |
| 13 import contextlib | 14 |
| 14 from difflib import unified_diff, context_diff | 15 from difflib import context_diff, unified_diff |
| 15 | 16 |
| 16 from PyQt6.QtCore import QEvent, pyqtSlot | 17 from PyQt6.QtCore import QEvent, pyqtSlot |
| 17 from PyQt6.QtGui import QTextCursor | 18 from PyQt6.QtGui import QTextCursor |
| 18 from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox | 19 from PyQt6.QtWidgets import QApplication, QDialogButtonBox, QWidget |
| 19 | 20 |
| 20 from eric7.EricWidgets import EricMessageBox, EricFileDialog | 21 from eric7 import Preferences, Utilities |
| 22 from eric7.EricWidgets import EricFileDialog, EricMessageBox | |
| 21 from eric7.EricWidgets.EricMainWindow import EricMainWindow | 23 from eric7.EricWidgets.EricMainWindow import EricMainWindow |
| 22 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes | 24 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes |
| 23 | 25 |
| 26 from .DiffHighlighter import DiffHighlighter | |
| 24 from .Ui_DiffDialog import Ui_DiffDialog | 27 from .Ui_DiffDialog import Ui_DiffDialog |
| 25 from .DiffHighlighter import DiffHighlighter | |
| 26 | |
| 27 from eric7 import Preferences, Utilities | |
| 28 | 28 |
| 29 | 29 |
| 30 class DiffDialog(QWidget, Ui_DiffDialog): | 30 class DiffDialog(QWidget, Ui_DiffDialog): |
| 31 """ | 31 """ |
| 32 Class implementing a dialog to compare two files. | 32 Class implementing a dialog to compare two files. |
