summaryrefslogtreecommitdiffstats
path: root/src/b2qt-flashing-wizard/progress_page.cpp
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@theqtcompany.com>2015-04-15 10:28:24 +0200
committerRainer Keller <rainer.keller@theqtcompany.com>2015-04-20 15:05:23 +0300
commit1f4b424073ed89263ca69b782617b70207cbd7e2 (patch)
treeb2817cb8fc6383ad954092aa7081d11b9fc62411 /src/b2qt-flashing-wizard/progress_page.cpp
parentda66ed8ce7421506ddeb4e7feea13987c26620c7 (diff)
b2qt-flashing-wizard: Script standard error in red color
Change-Id: I40893222a5ea999eca3f73b05e39e7e1ab53a9a1 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'src/b2qt-flashing-wizard/progress_page.cpp')
-rw-r--r--src/b2qt-flashing-wizard/progress_page.cpp23
1 files changed, 21 insertions, 2 deletions
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()