Mercurial Repositories > eric / file comparison
comparison: eric6/UI/DiffDialog.py
eric6/UI/DiffDialog.py
- changeset 8218
- 7c09585bd960
- parent 8143
- 2c730d5fd177
- child 8220
- 006ee31b4835
equal
deleted
inserted
replaced
| 8217:385f60c94548 | 8218:7c09585bd960 |
|---|---|
| 35 """ | 35 """ |
| 36 Constructor | 36 Constructor |
| 37 | 37 |
| 38 @param parent reference to the parent widget (QWidget) | 38 @param parent reference to the parent widget (QWidget) |
| 39 """ | 39 """ |
| 40 super(DiffDialog, self).__init__(parent) | 40 super().__init__(parent) |
| 41 self.setupUi(self) | 41 self.setupUi(self) |
| 42 | 42 |
| 43 self.file1Picker.setMode(E5PathPickerModes.OpenFileMode) | 43 self.file1Picker.setMode(E5PathPickerModes.OpenFileMode) |
| 44 self.file2Picker.setMode(E5PathPickerModes.OpenFileMode) | 44 self.file2Picker.setMode(E5PathPickerModes.OpenFileMode) |
| 45 | 45 |
| 77 | 77 |
| 78 @param filename name of a file to use as the first file (string) | 78 @param filename name of a file to use as the first file (string) |
| 79 """ | 79 """ |
| 80 if filename: | 80 if filename: |
| 81 self.file1Picker.setText(filename) | 81 self.file1Picker.setText(filename) |
| 82 super(DiffDialog, self).show() | 82 super().show() |
| 83 | 83 |
| 84 def on_buttonBox_clicked(self, button): | 84 def on_buttonBox_clicked(self, button): |
| 85 """ | 85 """ |
| 86 Private slot called by a button of the button box clicked. | 86 Private slot called by a button of the button box clicked. |
| 87 | 87 |
| 284 """ | 284 """ |
| 285 Constructor | 285 Constructor |
| 286 | 286 |
| 287 @param parent reference to the parent widget (QWidget) | 287 @param parent reference to the parent widget (QWidget) |
| 288 """ | 288 """ |
| 289 super(DiffWindow, self).__init__(parent) | 289 super().__init__(parent) |
| 290 | 290 |
| 291 self.setStyle(Preferences.getUI("Style"), | 291 self.setStyle(Preferences.getUI("Style"), |
| 292 Preferences.getUI("StyleSheet")) | 292 Preferences.getUI("StyleSheet")) |
| 293 | 293 |
| 294 self.cw = DiffDialog(self) | 294 self.cw = DiffDialog(self) |
