Mercurial Repositories > eric / file comparison
comparison: UI/CompareDialog.py
UI/CompareDialog.py
- changeset 55
- b5c84934de9c
- parent 45
- 9a18f4dbb493
- child 97
- c4086afea02b
equal
deleted
inserted
replaced
| 54:31463df17fd5 | 55:b5c84934de9c |
|---|---|
| 13 from difflib import _mdiff, IS_CHARACTER_JUNK | 13 from difflib import _mdiff, IS_CHARACTER_JUNK |
| 14 | 14 |
| 15 from PyQt4.QtCore import * | 15 from PyQt4.QtCore import * |
| 16 from PyQt4.QtGui import * | 16 from PyQt4.QtGui import * |
| 17 | 17 |
| 18 from E4Gui.E4Completers import E4FileCompleter | 18 from E5Gui.E5Completers import E5FileCompleter |
| 19 | 19 |
| 20 import UI.PixmapCache | 20 import UI.PixmapCache |
| 21 | 21 |
| 22 from .Ui_CompareDialog import Ui_CompareDialog | 22 from .Ui_CompareDialog import Ui_CompareDialog |
| 23 | 23 |
| 85 @param parent parent widget (QWidget) | 85 @param parent parent widget (QWidget) |
| 86 """ | 86 """ |
| 87 QWidget.__init__(self,parent) | 87 QWidget.__init__(self,parent) |
| 88 self.setupUi(self) | 88 self.setupUi(self) |
| 89 | 89 |
| 90 self.file1Completer = E4FileCompleter(self.file1Edit) | 90 self.file1Completer = E5FileCompleter(self.file1Edit) |
| 91 self.file2Completer = E4FileCompleter(self.file2Edit) | 91 self.file2Completer = E5FileCompleter(self.file2Edit) |
| 92 | 92 |
| 93 self.diffButton = \ | 93 self.diffButton = \ |
| 94 self.buttonBox.addButton(self.trUtf8("Compare"), QDialogButtonBox.ActionRole) | 94 self.buttonBox.addButton(self.trUtf8("Compare"), QDialogButtonBox.ActionRole) |
| 95 self.diffButton.setToolTip(\ | 95 self.diffButton.setToolTip(\ |
| 96 self.trUtf8("Press to perform the comparison of the two files")) | 96 self.trUtf8("Press to perform the comparison of the two files")) |
