aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetlana Abramenkova <sabramenkova@luxoft.com>2019-07-11 17:43:21 +0200
committerSvetlana Abramenkova <sabramenkova@luxoft.com>2019-08-19 11:00:36 +0200
commitfb153913437862c8969155fac100dbb9223ddf93 (patch)
treeb0d03a1f45345d0fae62b566589c26a9175ae52c
parent2164d5e006a967f260dd63fc6b76de363a213a79 (diff)
improve logs formatting
Change-Id: I2cc0b61d86dc8d7a15c2ec0cd5f0b32ef60726dc Fixes: AUTOSUITE-1116 Reviewed-by: Nikolay Zamotaev <nzamotaev@luxoft.com>
-rw-r--r--src/bench/mainwindow.cpp1
-rw-r--r--src/bench/runtimeprocess.cpp3
-rw-r--r--src/livenodeengine.cpp8
-rw-r--r--src/widgets/logview.cpp20
4 files changed, 22 insertions, 10 deletions
diff --git a/src/bench/mainwindow.cpp b/src/bench/mainwindow.cpp
index 0d0bf2e..1b22130 100644
--- a/src/bench/mainwindow.cpp
+++ b/src/bench/mainwindow.cpp
@@ -253,7 +253,6 @@ void MainWindow::setupLogView()
m_logDock->setFeatures(QDockWidget::AllDockWidgetFeatures);
addDockWidget(Qt::BottomDockWidgetArea, m_logDock);
- connect(m_node, &LiveNodeEngine::clearLog, m_log, &LogView::clear);
connect(m_node, &LiveNodeEngine::logIgnoreMessages, m_log, &LogView::setIgnoreMessages);
connect(m_node, &LiveNodeEngine::logErrors, m_log, &LogView::appendAllToLog);
}
diff --git a/src/bench/runtimeprocess.cpp b/src/bench/runtimeprocess.cpp
index 7c762c6..8d35a9c 100644
--- a/src/bench/runtimeprocess.cpp
+++ b/src/bench/runtimeprocess.cpp
@@ -124,7 +124,7 @@ void RuntimeProcess::onConnected()
void RuntimeProcess::onDisconnected()
{
- qInfo()<<"RuntimeProcess::onDisconnected ismater="<<m_ismaster;
+ qInfo()<<"RuntimeProcess::onDisconnected ismaster="<<m_ismaster;
if (m_ismaster){
connectToServer();
}
@@ -152,7 +152,6 @@ void RuntimeProcess::sendDocument(const LiveDocument &document)
void RuntimeProcess::updateErrors()
{
QByteArray log = readAllStandardError();
- qWarning() << "RuntimeProcess::updateErrors --> " << log.data();
emit remoteLog(QtCriticalMsg, log.data());
}
diff --git a/src/livenodeengine.cpp b/src/livenodeengine.cpp
index bff1f9c..7ed9fcb 100644
--- a/src/livenodeengine.cpp
+++ b/src/livenodeengine.cpp
@@ -433,9 +433,9 @@ void LiveNodeEngine::reloadDocument()
component->loadUrl(url);
m_object = component->create();
} else if (url == originalUrl) {
- logError(tr("LiveNodeEngine: Cannot display this file type"));
+ logError(tr("Warning: LiveNodeEngine: Cannot display this file type"));
} else {
- logError(tr("LiveNodeEngine: Internal error: Cannot display this file type"));
+ logError(tr("Warning: LiveNodeEngine: Internal error: Cannot display this file type"));
}
if (!component->isReady()) {
@@ -464,11 +464,11 @@ void LiveNodeEngine::reloadDocument()
m_fallbackView->setContent(url, component.take(), m_object);
m_activeWindow = m_fallbackView;
} else {
- logError(tr("LiveNodeEngine: Cannot display this component: "
+ logError(tr("Warning: LiveNodeEngine: Cannot display this component: "
"Root object is not a QQuickWindow and no LiveNodeEngine::fallbackView set."));
}
} else {
- logError(tr("LiveNodeEngine: Cannot display this component: "
+ logError(tr("Warning: LiveNodeEngine: Cannot display this component: "
"Root object is not a QQuickWindow nor a QQuickItem."));
if (m_fallbackView)
showErrorScreen();
diff --git a/src/widgets/logview.cpp b/src/widgets/logview.cpp
index 6edc8fb..52406df 100644
--- a/src/widgets/logview.cpp
+++ b/src/widgets/logview.cpp
@@ -64,22 +64,28 @@ void LogView::appendToLog(int type, const QString &msg, const QUrl &url, int lin
qreal baseValue = m_log->palette().color(QPalette::Base).valueF();
QColor color = m_log->palette().color(QPalette::Text);
+ bool bold = false;
switch (type) {
case QtWarningMsg: // yellow
color = baseValue < 0.5f ? QColor(255, 255, 128) : QColor(140, 140, 0);
+ bold = true;
break;
case QtCriticalMsg: // red
color = baseValue < 0.5f ? QColor(255, 64, 64) : QColor(165, 0, 0);
+ bold = true;
break;
case QtFatalMsg: // red
color = baseValue < 0.5f ? QColor(255, 64, 64) : QColor(165, 0, 0);
+ bold = true;
break;
case InternalInfo: // green
color = baseValue < 0.5f ? QColor(96, 255, 96) : QColor(128, 0, 0);
+ bold = true;
break;
case InternalError: // purple
color = baseValue < 0.5f ? QColor(196, 128, 196) : QColor(96, 0, 96);
+ bold = true;
break;
default:
break;
@@ -98,9 +104,17 @@ void LogView::appendToLog(int type, const QString &msg, const QUrl &url, int lin
if (!s.isEmpty())
s.append(QLatin1Char(' '));
- s.append(QString::fromLatin1("<b><font color=\"%2\">%1</font></b>")
- .arg(msg)
- .arg(color.name()));
+ QString formattedLog;
+ if (bold) {
+ formattedLog = QString::fromLatin1("<b><font color=\"%2\">%1</font></b>")
+ .arg(msg)
+ .arg(color.name());
+ } else {
+ formattedLog = QString::fromLatin1("<font color=\"%2\">%1</font>")
+ .arg(msg)
+ .arg(color.name());
+ }
+ s.append(formattedLog);
m_log->appendHtml(s);
}