Mercurial Repositories > eric / file comparison
comparison: UI/DiffDialog.py
UI/DiffDialog.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3058
- 0a02c433f52d
- parent 3039
- 8dd0165d805d
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 345 E5MessageBox.critical( | 345 E5MessageBox.critical( |
| 346 self, | 346 self, |
| 347 self.trUtf8("Compare Files"), | 347 self.trUtf8("Compare Files"), |
| 348 self.trUtf8( | 348 self.trUtf8( |
| 349 """<p>The file <b>{0}</b> could not be read.</p>""") | 349 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 350 .format(self.filename1)) | 350 .format(self.filename1)) |
| 351 return | 351 return |
| 352 | 352 |
| 353 self.filename2 = Utilities.toNativeSeparators(self.file2Edit.text()) | 353 self.filename2 = Utilities.toNativeSeparators(self.file2Edit.text()) |
| 354 try: | 354 try: |
| 355 filemtime2 = time.ctime(os.stat(self.filename2).st_mtime) | 355 filemtime2 = time.ctime(os.stat(self.filename2).st_mtime) |
| 363 E5MessageBox.critical( | 363 E5MessageBox.critical( |
| 364 self, | 364 self, |
| 365 self.trUtf8("Compare Files"), | 365 self.trUtf8("Compare Files"), |
| 366 self.trUtf8( | 366 self.trUtf8( |
| 367 """<p>The file <b>{0}</b> could not be read.</p>""") | 367 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 368 .format(self.filename2)) | 368 .format(self.filename2)) |
| 369 return | 369 return |
| 370 | 370 |
| 371 self.contents.clear() | 371 self.contents.clear() |
| 372 self.saveButton.setEnabled(False) | 372 self.saveButton.setEnabled(False) |
| 373 | 373 |
