Mercurial Repositories > eric / file comparison
comparison: UI/DiffDialog.py
UI/DiffDialog.py
- changeset 3039
- 8dd0165d805d
- parent 3030
- 4a0a82ddd9d2
- child 3060
- 5883ce99ee12
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3038:7fe9a53280bd | 3039:8dd0165d805d |
|---|---|
| 343 E5MessageBox.critical( | 343 E5MessageBox.critical( |
| 344 self, | 344 self, |
| 345 self.trUtf8("Compare Files"), | 345 self.trUtf8("Compare Files"), |
| 346 self.trUtf8( | 346 self.trUtf8( |
| 347 """<p>The file <b>{0}</b> could not be read.</p>""") | 347 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 348 .format(self.filename1)) | 348 .format(self.filename1)) |
| 349 return | 349 return |
| 350 | 350 |
| 351 self.filename2 = Utilities.toNativeSeparators(self.file2Edit.text()) | 351 self.filename2 = Utilities.toNativeSeparators(self.file2Edit.text()) |
| 352 try: | 352 try: |
| 353 filemtime2 = time.ctime(os.stat(self.filename2).st_mtime) | 353 filemtime2 = time.ctime(os.stat(self.filename2).st_mtime) |
| 361 E5MessageBox.critical( | 361 E5MessageBox.critical( |
| 362 self, | 362 self, |
| 363 self.trUtf8("Compare Files"), | 363 self.trUtf8("Compare Files"), |
| 364 self.trUtf8( | 364 self.trUtf8( |
| 365 """<p>The file <b>{0}</b> could not be read.</p>""") | 365 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 366 .format(self.filename2)) | 366 .format(self.filename2)) |
| 367 return | 367 return |
| 368 | 368 |
| 369 self.contents.clear() | 369 self.contents.clear() |
| 370 self.saveButton.setEnabled(False) | 370 self.saveButton.setEnabled(False) |
| 371 | 371 |
