From 1f4b424073ed89263ca69b782617b70207cbd7e2 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 15 Apr 2015 10:28:24 +0200 Subject: b2qt-flashing-wizard: Script standard error in red color Change-Id: I40893222a5ea999eca3f73b05e39e7e1ab53a9a1 Reviewed-by: Alessandro Portale --- src/b2qt-flashing-wizard/progress_page.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/b2qt-flashing-wizard/progress_page.cpp') diff --git a/src/b2qt-flashing-wizard/progress_page.cpp b/src/b2qt-flashing-wizard/progress_page.cpp index d518b44..e9203b3 100644 --- a/src/b2qt-flashing-wizard/progress_page.cpp +++ b/src/b2qt-flashing-wizard/progress_page.cpp @@ -111,13 +111,32 @@ void ProgressPage::setActor(Actor *actor) connect(actor, &Actor::finished, this, &ProgressPage::finished); connect(actor, &Actor::failed, this, &ProgressPage::failed); connect(actor, &Actor::details, this, &ProgressPage::addDetails); + connect(actor, &Actor::errorDetails, this, &ProgressPage::addErrorDetails); connect(actor, &Actor::progress, this, &ProgressPage::progress); } +static void commonDetailReplacements(QByteArray &data) +{ + data.replace(0x08 /* backspace */, ' '); +} + void ProgressPage::addDetails(QByteArray newData) { - newData.replace(0x08 /* backspace */, ' '); - mTextEdit->append(QString::fromLocal8Bit(newData)); + commonDetailReplacements(newData); + mTextEdit->insertPlainText(QString::fromLocal8Bit(newData)); +} + +void ProgressPage::addErrorDetails(QByteArray newData) +{ + if (newData.startsWith('+')) { + addDetails(newData); + return; + } + commonDetailReplacements(newData); + QColor c = mTextEdit->textColor(); + mTextEdit->setTextColor(Qt::red); + mTextEdit->insertPlainText(QString::fromLocal8Bit(newData)); + mTextEdit->setTextColor(c); } void ProgressPage::showDetails() -- cgit v1.2.3