jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Encode error/warning messages when writing to console window.

Browse source
This commit is contained in:
Torsten Paul 2016-02-20 19:06:55 +01:00
parent 5cb40a2aee
commit b0c8c6761f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mainwin.cc
View file

@ -92,6 +92,13 @@
#include <QClipboard>
#include <QDesktopWidget>
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
#include <QTextDocument>
#define QT_HTML_ESCAPE(qstring) Qt::escape(qstring)
#else
#define QT_HTML_ESCAPE(qstring) (qstring).toHtmlEscaped()
#endif
#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))
// Set dummy for Qt versions that do not have QSaveFile
#define QT_FILE_SAVE_CLASS QFile
@ -2671,10 +2678,10 @@ void MainWindow::consoleOutput(const QString &msg)
QString qmsg;
if (msg.startsWith("WARNING:") || msg.startsWith("DEPRECATED:")) {
this->compileWarnings++;
qmsg = "<html><span style=\"color: black; background-color: #ffffb0;\">" + msg + "</span></html>\n";
qmsg = "<html><span style=\"color: black; background-color: #ffffb0;\">" + QT_HTML_ESCAPE(QString(msg)) + "</span></html>\n";
} else if (msg.startsWith("ERROR:")) {
this->compileErrors++;
qmsg = "<html><span style=\"color: black; background-color: #ffb0b0;\">" + msg + "</span></html>\n";
qmsg = "<html><span style=\"color: black; background-color: #ffb0b0;\">" + QT_HTML_ESCAPE(QString(msg)) + "</span></html>\n";
}
else {
qmsg = msg;