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

VCS: Use OutputFormat in output window

Browse Source 
Change-Id: I232880ed713dd32674ac326d15f935392fe2f06d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2018-11-17 22:27:29 +02:00
committed by Orgad Shaneh
parent d6e0e7d2e9
commit 639017783a
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -104,6 +104,7 @@ private:
void setFormat(enum VcsOutputWindow::MessageStyle style); void setFormat(enum VcsOutputWindow::MessageStyle style);
QString identifierUnderCursor(const QPoint &pos, QString *repository = nullptr) const; QString identifierUnderCursor(const QPoint &pos, QString *repository = nullptr) const;
Utils::OutputFormat m_format;
const QTextCharFormat m_defaultFormat; const QTextCharFormat m_defaultFormat;
QTextCharFormat m_errorFormat; QTextCharFormat m_errorFormat;
QTextCharFormat m_warningFormat; QTextCharFormat m_warningFormat;
@@ -113,20 +114,11 @@ private:
}; };
OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) : OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) :
Core::OutputWindow(Core::Context(C_VCS_OUTPUT_PANE), parent), Core::OutputWindow(Core::Context(C_VCS_OUTPUT_PANE), parent)
m_defaultFormat(currentCharFormat()),
m_errorFormat(m_defaultFormat),
m_warningFormat(m_defaultFormat),
m_commandFormat(m_defaultFormat),
m_messageFormat(m_defaultFormat)
{ {
setReadOnly(true); setReadOnly(true);
setUndoRedoEnabled(false); setUndoRedoEnabled(false);
setFrameStyle(QFrame::NoFrame); setFrameStyle(QFrame::NoFrame);
m_errorFormat.setForeground(Utils::creatorTheme()->color(Theme::OutputPanes_ErrorMessageTextColor));
m_warningFormat.setForeground(Utils::creatorTheme()->color(Theme::OutputPanes_WarningMessageTextColor));
m_commandFormat.setFontWeight(QFont::Bold);
m_messageFormat.setForeground(Utils::creatorTheme()->color(Theme::OutputPanes_MessageOutput));
m_formatter = new OutputFormatter; m_formatter = new OutputFormatter;
m_formatter->setPlainTextEdit(this); m_formatter->setPlainTextEdit(this);
auto agg = new Aggregation::Aggregate; auto agg = new Aggregation::Aggregate;
@@ -226,7 +218,7 @@ void OutputWindowPlainTextEdit::appendLines(QString const& s, const QString &rep
const QChar newLine(QLatin1Char('\n')); const QChar newLine(QLatin1Char('\n'));
const QChar lastChar = s.at(s.size() - 1); const QChar lastChar = s.at(s.size() - 1);
const bool appendNewline = (lastChar != QLatin1Char('\r') && lastChar != newLine); const bool appendNewline = (lastChar != QLatin1Char('\r') && lastChar != newLine);
m_formatter->appendMessage(appendNewline ? s + newLine : s, currentCharFormat()); m_formatter->appendMessage(appendNewline ? s + newLine : s, m_format);
// Scroll down // Scroll down
moveCursor(QTextCursor::End); moveCursor(QTextCursor::End);
@@ -250,28 +242,26 @@ void OutputWindowPlainTextEdit::appendLinesWithStyle(QString const& s, enum VcsO
else { else {
appendLines(s, repository); appendLines(s, repository);
} }
setCurrentCharFormat(m_defaultFormat);
} }
void OutputWindowPlainTextEdit::setFormat(enum VcsOutputWindow::MessageStyle style) void OutputWindowPlainTextEdit::setFormat(enum VcsOutputWindow::MessageStyle style)
{ {
switch (style) { switch (style) {
case VcsOutputWindow::Warning: case VcsOutputWindow::Warning:
setCurrentCharFormat(m_warningFormat); m_format = LogMessageFormat;
break; break;
case VcsOutputWindow::Error: case VcsOutputWindow::Error:
setCurrentCharFormat(m_errorFormat); m_format = ErrorMessageFormat;
break; break;
case VcsOutputWindow::Message: case VcsOutputWindow::Message:
setCurrentCharFormat(m_messageFormat); m_format = NormalMessageFormat;
break; break;
case VcsOutputWindow::Command: case VcsOutputWindow::Command:
setCurrentCharFormat(m_commandFormat); m_format = NormalMessageFormat;
break; break;
default: default:
case VcsOutputWindow::None: case VcsOutputWindow::None:
setCurrentCharFormat(m_defaultFormat); m_format = OutputFormat::StdOutFormat;
break; break;
} }
} }