Mercurial Repositories > eric / file comparison
comparison: UI/DiffDialog.py
UI/DiffDialog.py
- changeset 500
- c3abc7895a01
- parent 432
- 497e188ee86e
- child 537
- 72b32daeb8d6
equal
deleted
inserted
replaced
| 499:622ab17a68d5 | 500:c3abc7895a01 |
|---|---|
| 228 self.cReplacedFormat.setBackground(QBrush(QColor(190, 190, 237))) | 228 self.cReplacedFormat.setBackground(QBrush(QColor(190, 190, 237))) |
| 229 self.cLineNoFormat = self.contents.currentCharFormat() | 229 self.cLineNoFormat = self.contents.currentCharFormat() |
| 230 self.cLineNoFormat.setBackground(QBrush(QColor(255, 220, 168))) | 230 self.cLineNoFormat.setBackground(QBrush(QColor(255, 220, 168))) |
| 231 | 231 |
| 232 # connect some of our widgets explicitly | 232 # connect some of our widgets explicitly |
| 233 self.connect(self.file1Edit, SIGNAL("textChanged(const QString &)"), | 233 self.file1Edit.textChanged.connect(self.__fileChanged) |
| 234 self.__fileChanged) | 234 self.file2Edit.textChanged.connect(self.__fileChanged) |
| 235 self.connect(self.file2Edit, SIGNAL("textChanged(const QString &)"), | |
| 236 self.__fileChanged) | |
| 237 | 235 |
| 238 def show(self, filename = None): | 236 def show(self, filename = None): |
| 239 """ | 237 """ |
| 240 Public slot to show the dialog. | 238 Public slot to show the dialog. |
| 241 | 239 |
