Mercurial Repositories > eric / file comparison
comparison: E5Gui/E5ErrorMessage.py
E5Gui/E5ErrorMessage.py
- changeset 2742
- bf0560b035bf
- parent 2697
- 1cd7fa670b05
- child 2770
- fd5ee85f0450
equal
deleted
inserted
replaced
| 2741:d0d7836d0c01 | 2742:bf0560b035bf |
|---|---|
| 103 elif msgType == QtFatalMsg: | 103 elif msgType == QtFatalMsg: |
| 104 messageType = QCoreApplication.translate( | 104 messageType = QCoreApplication.translate( |
| 105 "E5ErrorMessage", "Fatal Error:") | 105 "E5ErrorMessage", "Fatal Error:") |
| 106 if isinstance(message, bytes): | 106 if isinstance(message, bytes): |
| 107 message = message.decode() | 107 message = message.decode() |
| 108 message = message.replace("\r\n", "<br/>")\ | |
| 109 .replace("\n", "<br/>")\ | |
| 110 .replace("\r", "<br/>") | |
| 108 msg = "<p><b>{0}</b></p><p>{1}</p>".format( | 111 msg = "<p><b>{0}</b></p><p>{1}</p>".format( |
| 109 messageType, Utilities.html_uencode(message)) | 112 messageType, Utilities.html_uencode(message)) |
| 110 if QThread.currentThread() == qApp.thread(): | 113 if QThread.currentThread() == qApp.thread(): |
| 111 __msgHandlerDialog.showMessage(msg) | 114 __msgHandlerDialog.showMessage(msg) |
| 112 else: | 115 else: |
