feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Support \r handling in OutputFormatter

Browse Source 
Change-Id: Iae7ddc376cff86eef9d6873bdb6a6ed3f5f7022f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-03-18 20:23:08 +02:00
committed by Orgad Shaneh
parent 1c953f0ac0
commit 0960127ece
5 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/vcsbase/checkoutprogresswizardpage.cpp
View File

@@ -31,6 +31,7 @@
#include "command.h"
#include "vcsbaseplugin.h"
#include <utils/outputformatter.h>
#include <utils/qtcassert.h>
#include <QApplication>
@@ -61,7 +62,9 @@ CheckoutProgressWizardPage::CheckoutProgressWizardPage(QWidget *parent) :
resize(264, 200);
QVBoxLayout *verticalLayout = new QVBoxLayout(this);
m_logPlainTextEdit = new QPlainTextEdit;
m_formatter = new Utils::OutputFormatter;
m_logPlainTextEdit->setReadOnly(true);
m_formatter->setPlainTextEdit(m_logPlainTextEdit);
verticalLayout->addWidget(m_logPlainTextEdit);
@@ -74,6 +77,7 @@ CheckoutProgressWizardPage::~CheckoutProgressWizardPage()
{
if (m_state == Running) // Paranoia!
QApplication::restoreOverrideCursor();
delete m_formatter;
}
void CheckoutProgressWizardPage::setStartedStatus(const QString &startedStatus)
@@ -131,20 +135,7 @@ void CheckoutProgressWizardPage::slotFinished(bool ok, int exitCode, const QVari
void CheckoutProgressWizardPage::slotOutput(const QString &text)
{
int startPos = 0;
int crPos = -1;
const QString ansiEraseToEol = QLatin1String("\x1b[K");
while ((crPos = text.indexOf(QLatin1Char('\r'), startPos)) >= 0) {
QString part = text.mid(startPos, crPos - startPos);
// Discard ANSI erase-to-eol
if (part.endsWith(ansiEraseToEol))
part.chop(ansiEraseToEol.length());
outputText(part);
startPos = crPos + 1;
m_overwriteOutput = true;
}
if (startPos < text.count())
outputText(text.mid(startPos));
m_formatter->appendMessage(text, Utils::StdOutFormat);
}
void CheckoutProgressWizardPage::slotError(const QString &text)
@@ -152,18 +143,6 @@ void CheckoutProgressWizardPage::slotError(const QString &text)
m_error.append(text);
}
void CheckoutProgressWizardPage::outputText(const QString &text)
{
if (m_overwriteOutput) {
QTextCursor cursor = m_logPlainTextEdit->textCursor();
cursor.clearSelection();
cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
m_logPlainTextEdit->setTextCursor(cursor);
m_overwriteOutput = false;
}
m_logPlainTextEdit->insertPlainText(text);
}
void CheckoutProgressWizardPage::terminate()
{
if (m_command)