Mercurial Repositories > eric / file comparison
comparison: src/eric7/UI/DiffDialog.py
src/eric7/UI/DiffDialog.py
- branch
- eric7
- changeset 10922
- 36a90a94765c
- parent 10692
- 9becf9ca115c
- child 10933
- 95a15b70f7bb
equal
deleted
inserted
replaced
| 10921:495f084a737e | 10922:36a90a94765c |
|---|---|
| 201 self.filename2 | 201 self.filename2 |
| 202 ), | 202 ), |
| 203 ) | 203 ) |
| 204 return | 204 return |
| 205 | 205 |
| 206 self.highlighter.regenerateRules( | |
| 207 { | |
| 208 "text": Preferences.getDiffColour("TextColor"), | |
| 209 "added": Preferences.getDiffColour("AddedColor"), | |
| 210 "removed": Preferences.getDiffColour("RemovedColor"), | |
| 211 "replaced": Preferences.getDiffColour("ReplacedColor"), | |
| 212 "context": Preferences.getDiffColour("ContextColor"), | |
| 213 "header": Preferences.getDiffColour("HeaderColor"), | |
| 214 "whitespace": Preferences.getDiffColour("BadWhitespaceColor"), | |
| 215 }, | |
| 216 Preferences.getEditorOtherFonts("MonospacedFont"), | |
| 217 ) | |
| 218 | |
| 206 self.contents.clear() | 219 self.contents.clear() |
| 207 self.highlighter.regenerateRules() | |
| 208 self.saveButton.setEnabled(False) | 220 self.saveButton.setEnabled(False) |
| 209 | 221 |
| 210 if self.unifiedRadioButton.isChecked(): | 222 if self.unifiedRadioButton.isChecked(): |
| 211 self.__generateUnifiedDiff( | 223 self.__generateUnifiedDiff( |
| 212 lines1, lines2, self.filename1, self.filename2, filemtime1, filemtime2 | 224 lines1, lines2, self.filename1, self.filename2, filemtime1, filemtime2 |
