Mercurial Repositories > eric / file comparison
comparison: UI/DiffDialog.py
UI/DiffDialog.py
- branch
- Py2 comp.
- changeset 2677
- 3d4277929fb3
- parent 2525
- 8b507a9a2d40
- parent 2580
- 7403bc14ea26
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 2670:e60ea6cb8e11 | 2677:3d4277929fb3 |
|---|---|
| 224 self.filename1 = '' | 224 self.filename1 = '' |
| 225 self.filename2 = '' | 225 self.filename2 = '' |
| 226 | 226 |
| 227 self.updateInterval = 20 # update every 20 lines | 227 self.updateInterval = 20 # update every 20 lines |
| 228 | 228 |
| 229 if Utilities.isWindowsPlatform(): | 229 font = Preferences.getEditorOtherFonts("MonospacedFont") |
| 230 self.contents.setFontFamily("Lucida Console") | 230 self.contents.setFontFamily(font.family()) |
| 231 else: | 231 self.contents.setFontPointSize(font.pointSize()) |
| 232 self.contents.setFontFamily("Monospace") | |
| 233 | 232 |
| 234 self.cNormalFormat = self.contents.currentCharFormat() | 233 self.cNormalFormat = self.contents.currentCharFormat() |
| 235 self.cAddedFormat = self.contents.currentCharFormat() | 234 self.cAddedFormat = self.contents.currentCharFormat() |
| 236 self.cAddedFormat.setBackground(QBrush(QColor(190, 237, 190))) | 235 self.cAddedFormat.setBackground(QBrush(QColor(190, 237, 190))) |
| 237 self.cRemovedFormat = self.contents.currentCharFormat() | 236 self.cRemovedFormat = self.contents.currentCharFormat() |
