Mercurial Repositories > eric / file comparison
comparison: eric6/UI/DiffDialog.py
eric6/UI/DiffDialog.py
- changeset 7779
- 757334671130
- parent 7770
- 49f3377aebf1
- child 7785
- 9978016560ec
equal
deleted
inserted
replaced
| 7778:eb01ab7aeb06 | 7779:757334671130 |
|---|---|
| 4 # | 4 # |
| 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 | |
| 10 | 9 |
| 11 import os | 10 import os |
| 12 import time | 11 import time |
| 13 | 12 |
| 14 from PyQt5.QtCore import QFileInfo, QEvent, pyqtSlot | 13 from PyQt5.QtCore import QFileInfo, QEvent, pyqtSlot |
| 62 self.filename2 = '' | 61 self.filename2 = '' |
| 63 | 62 |
| 64 self.updateInterval = 20 # update every 20 lines | 63 self.updateInterval = 20 # update every 20 lines |
| 65 | 64 |
| 66 font = Preferences.getEditorOtherFonts("MonospacedFont") | 65 font = Preferences.getEditorOtherFonts("MonospacedFont") |
| 67 self.contents.setFontFamily(font.family()) | 66 self.contents.document().setDefaultFont(font) |
| 68 self.contents.setFontPointSize(font.pointSize()) | |
| 69 | 67 |
| 70 self.highlighter = DiffHighlighter(self.contents.document()) | 68 self.highlighter = DiffHighlighter(self.contents.document()) |
| 71 | 69 |
| 72 # connect some of our widgets explicitly | 70 # connect some of our widgets explicitly |
| 73 self.file1Picker.textChanged.connect(self.__fileChanged) | 71 self.file1Picker.textChanged.connect(self.__fileChanged) |
