Mercurial Repositories > eric / file comparison
comparison: UI/CompareDialog.py
UI/CompareDialog.py
- branch
- Py2 comp.
- changeset 2677
- 3d4277929fb3
- parent 2525
- 8b507a9a2d40
- parent 2580
- 7403bc14ea26
- child 2847
- 1843ef6e2656
equal
deleted
inserted
replaced
| 2670:e60ea6cb8e11 | 2677:3d4277929fb3 |
|---|---|
| 120 self.vsb2 = self.contents_2.verticalScrollBar() | 120 self.vsb2 = self.contents_2.verticalScrollBar() |
| 121 self.hsb2 = self.contents_2.horizontalScrollBar() | 121 self.hsb2 = self.contents_2.horizontalScrollBar() |
| 122 | 122 |
| 123 self.on_synchronizeCheckBox_toggled(True) | 123 self.on_synchronizeCheckBox_toggled(True) |
| 124 | 124 |
| 125 if Utilities.isWindowsPlatform(): | 125 font = Preferences.getEditorOtherFonts("MonospacedFont") |
| 126 self.contents_1.setFontFamily("Lucida Console") | 126 self.contents_1.setFontFamily(font.family()) |
| 127 self.contents_2.setFontFamily("Lucida Console") | 127 self.contents_1.setFontPointSize(font.pointSize()) |
| 128 else: | 128 self.contents_2.setFontFamily(font.family()) |
| 129 self.contents_1.setFontFamily("Monospace") | 129 self.contents_2.setFontPointSize(font.pointSize()) |
| 130 self.contents_2.setFontFamily("Monospace") | |
| 131 self.fontHeight = QFontMetrics(self.contents_1.currentFont()).height() | 130 self.fontHeight = QFontMetrics(self.contents_1.currentFont()).height() |
| 132 | 131 |
| 133 self.cNormalFormat = self.contents_1.currentCharFormat() | 132 self.cNormalFormat = self.contents_1.currentCharFormat() |
| 134 self.cInsertedFormat = self.contents_1.currentCharFormat() | 133 self.cInsertedFormat = self.contents_1.currentCharFormat() |
| 135 self.cInsertedFormat.setBackground(QBrush(QColor(190, 237, 190))) | 134 self.cInsertedFormat.setBackground(QBrush(QColor(190, 237, 190))) |
