Mercurial Repositories > eric / file comparison
comparison: UI/DiffDialog.py
UI/DiffDialog.py
- changeset 3186
- a05eff845522
- parent 3160
- 209a07d7e401
- child 3190
- a9a94491c4fd
equal
deleted
inserted
replaced
| 3185:d4fa462547bc | 3186:a05eff845522 |
|---|---|
| 20 | 20 |
| 21 from .Ui_DiffDialog import Ui_DiffDialog | 21 from .Ui_DiffDialog import Ui_DiffDialog |
| 22 | 22 |
| 23 import Utilities | 23 import Utilities |
| 24 import Preferences | 24 import Preferences |
| 25 import UI.PixmapCache | |
| 25 | 26 |
| 26 from difflib import SequenceMatcher | 27 from difflib import SequenceMatcher |
| 27 | 28 |
| 28 # This function is copied from python 2.3 and slightly modified. | 29 # This function is copied from python 2.3 and slightly modified. |
| 29 # The header lines contain a tab after the filename. | 30 # The header lines contain a tab after the filename. |
| 208 @param parent reference to the parent widget (QWidget) | 209 @param parent reference to the parent widget (QWidget) |
| 209 """ | 210 """ |
| 210 super().__init__(parent) | 211 super().__init__(parent) |
| 211 self.setupUi(self) | 212 self.setupUi(self) |
| 212 | 213 |
| 214 self.file1Button.setIcon(UI.PixmapCache.getIcon("open.png")) | |
| 215 self.file2Button.setIcon(UI.PixmapCache.getIcon("open.png")) | |
| 216 | |
| 213 self.file1Completer = E5FileCompleter(self.file1Edit) | 217 self.file1Completer = E5FileCompleter(self.file1Edit) |
| 214 self.file2Completer = E5FileCompleter(self.file2Edit) | 218 self.file2Completer = E5FileCompleter(self.file2Edit) |
| 215 | 219 |
| 216 self.diffButton = self.buttonBox.addButton( | 220 self.diffButton = self.buttonBox.addButton( |
| 217 self.trUtf8("Compare"), QDialogButtonBox.ActionRole) | 221 self.trUtf8("Compare"), QDialogButtonBox.ActionRole) |
