Mercurial Repositories > eric / file comparison
comparison: eric6/UI/CompareDialog.py
eric6/UI/CompareDialog.py
- changeset 8218
- 7c09585bd960
- parent 8143
- 2c730d5fd177
- child 8220
- 006ee31b4835
equal
deleted
inserted
replaced
| 8217:385f60c94548 | 8218:7c09585bd960 |
|---|---|
| 93 | 93 |
| 94 @param files list of files to compare and their label | 94 @param files list of files to compare and their label |
| 95 (list of two tuples of two strings) | 95 (list of two tuples of two strings) |
| 96 @param parent parent widget (QWidget) | 96 @param parent parent widget (QWidget) |
| 97 """ | 97 """ |
| 98 super(CompareDialog, self).__init__(parent) | 98 super().__init__(parent) |
| 99 self.setupUi(self) | 99 self.setupUi(self) |
| 100 | 100 |
| 101 if files is None: | 101 if files is None: |
| 102 files = [] | 102 files = [] |
| 103 | 103 |
| 184 | 184 |
| 185 @param filename name of a file to use as the first file (string) | 185 @param filename name of a file to use as the first file (string) |
| 186 """ | 186 """ |
| 187 if filename: | 187 if filename: |
| 188 self.file1Picker.setText(filename) | 188 self.file1Picker.setText(filename) |
| 189 super(CompareDialog, self).show() | 189 super().show() |
| 190 | 190 |
| 191 def __appendText(self, pane, linenumber, line, charFormat, | 191 def __appendText(self, pane, linenumber, line, charFormat, |
| 192 interLine=False): | 192 interLine=False): |
| 193 """ | 193 """ |
| 194 Private method to append text to the end of the contents pane. | 194 Private method to append text to the end of the contents pane. |
| 468 | 468 |
| 469 @param files list of files to compare and their label | 469 @param files list of files to compare and their label |
| 470 (list of two tuples of two strings) | 470 (list of two tuples of two strings) |
| 471 @param parent reference to the parent widget (QWidget) | 471 @param parent reference to the parent widget (QWidget) |
| 472 """ | 472 """ |
| 473 super(CompareWindow, self).__init__(parent) | 473 super().__init__(parent) |
| 474 | 474 |
| 475 self.setStyle(Preferences.getUI("Style"), | 475 self.setStyle(Preferences.getUI("Style"), |
| 476 Preferences.getUI("StyleSheet")) | 476 Preferences.getUI("StyleSheet")) |
| 477 | 477 |
| 478 self.cw = CompareDialog(files, self) | 478 self.cw = CompareDialog(files, self) |
