Mercurial Repositories > eric / file comparison
comparison: UI/CompareDialog.py
UI/CompareDialog.py
- changeset 3034
- 7ce719013078
- parent 3030
- 4a0a82ddd9d2
- child 3039
- 8dd0165d805d
equal
deleted
inserted
replaced
| 3033:58fe260e7469 | 3034:7ce719013078 |
|---|---|
| 272 self.file2Edit.setText(name2) | 272 self.file2Edit.setText(name2) |
| 273 self.file2Edit.setReadOnly(True) | 273 self.file2Edit.setReadOnly(True) |
| 274 self.diffButton.setEnabled(False) | 274 self.diffButton.setEnabled(False) |
| 275 self.diffButton.hide() | 275 self.diffButton.hide() |
| 276 | 276 |
| 277 if type(lines1) == type(""): | 277 if isinstance(lines1, str): |
| 278 lines1 = lines1.splitlines(True) | 278 lines1 = lines1.splitlines(True) |
| 279 if type(lines2) == type(""): | 279 if isinstance(lines2, str): |
| 280 lines2 = lines2.splitlines(True) | 280 lines2 = lines2.splitlines(True) |
| 281 | 281 |
| 282 self.__compare(lines1, lines2) | 282 self.__compare(lines1, lines2) |
| 283 | 283 |
| 284 def __compare(self, lines1, lines2): | 284 def __compare(self, lines1, lines2): |
| 340 self.vsb1.setValue(0) | 340 self.vsb1.setValue(0) |
| 341 self.vsb2.setValue(0) | 341 self.vsb2.setValue(0) |
| 342 self.firstButton.setEnabled(False) | 342 self.firstButton.setEnabled(False) |
| 343 self.upButton.setEnabled(False) | 343 self.upButton.setEnabled(False) |
| 344 self.downButton.setEnabled( | 344 self.downButton.setEnabled( |
| 345 len(self.diffParas) > 0 and | 345 len(self.diffParas) > 0 and |
| 346 (self.vsb1.isVisible() or self.vsb2.isVisible())) | 346 (self.vsb1.isVisible() or self.vsb2.isVisible())) |
| 347 self.lastButton.setEnabled( | 347 self.lastButton.setEnabled( |
| 348 len(self.diffParas) > 0 and | 348 len(self.diffParas) > 0 and |
| 349 (self.vsb1.isVisible() or self.vsb2.isVisible())) | 349 (self.vsb1.isVisible() or self.vsb2.isVisible())) |
| 350 | 350 |
| 351 self.totalLabel.setText(self.trUtf8('Total: {0}')\ | 351 self.totalLabel.setText(self.trUtf8('Total: {0}') |
| 352 .format(added + deleted + changed)) | 352 .format(added + deleted + changed)) |
| 353 self.changedLabel.setText(self.trUtf8('Changed: {0}').format(changed)) | 353 self.changedLabel.setText(self.trUtf8('Changed: {0}').format(changed)) |
| 354 self.addedLabel.setText(self.trUtf8('Added: {0}').format(added)) | 354 self.addedLabel.setText(self.trUtf8('Added: {0}').format(added)) |
| 355 self.deletedLabel.setText(self.trUtf8('Deleted: {0}').format(deleted)) | 355 self.deletedLabel.setText(self.trUtf8('Deleted: {0}').format(deleted)) |
| 356 | 356 |
