Mercurial Repositories > eric / file comparison
comparison: eric6/E5Gui/E5ErrorMessage.py
eric6/E5Gui/E5ErrorMessage.py
- changeset 7761
- ed2c67d20328
- parent 7759
- 51aa6c6b66f7
- child 7780
- 41420f82c0ac
equal
deleted
inserted
replaced
| 7760:fcd3322bf6ed | 7761:ed2c67d20328 |
|---|---|
| 10 | 10 |
| 11 from PyQt5.QtCore import ( | 11 from PyQt5.QtCore import ( |
| 12 qInstallMessageHandler, QtDebugMsg, QtWarningMsg, QtCriticalMsg, | 12 qInstallMessageHandler, QtDebugMsg, QtWarningMsg, QtCriticalMsg, |
| 13 QtFatalMsg, QThread, QMetaObject, Qt, Q_ARG, QSettings | 13 QtFatalMsg, QThread, QMetaObject, Qt, Q_ARG, QSettings |
| 14 ) | 14 ) |
| 15 from PyQt5.QtWidgets import QErrorMessage, qApp, QDialog | 15 from PyQt5.QtWidgets import QErrorMessage, QDialog |
| 16 | |
| 17 from E5Gui.E5Application import e5App | |
| 16 | 18 |
| 17 import Globals | 19 import Globals |
| 18 import Utilities | 20 import Utilities |
| 19 import Preferences | 21 import Preferences |
| 20 | 22 |
| 142 ).format(messageType, Utilities.html_uencode(message), | 144 ).format(messageType, Utilities.html_uencode(message), |
| 143 context.file, context.line, context.function) | 145 context.file, context.line, context.function) |
| 144 else: | 146 else: |
| 145 msg = "<p><b>{0}</b></p><p>{1}</p>".format( | 147 msg = "<p><b>{0}</b></p><p>{1}</p>".format( |
| 146 messageType, Utilities.html_uencode(message)) | 148 messageType, Utilities.html_uencode(message)) |
| 147 if QThread.currentThread() == qApp.thread(): | 149 if QThread.currentThread() == e5App().thread(): |
| 148 _msgHandlerDialog.showMessage(msg) | 150 _msgHandlerDialog.showMessage(msg) |
| 149 else: | 151 else: |
| 150 QMetaObject.invokeMethod( | 152 QMetaObject.invokeMethod( |
| 151 _msgHandlerDialog, | 153 _msgHandlerDialog, |
| 152 "showMessage", | 154 "showMessage", |
