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

VCS: Introduce message style

Browse Source 
Similar to compile and app output panes

Change-Id: Ib9ac6d8be880739ae78d0a39f7051cbe616e46c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-11 22:36:21 +03:00
committed by Orgad Shaneh
parent f9c4889a7f
commit a9095ee104
6 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/vcsbase/vcsbaseoutputwindow.cpp
View File

@@ -92,6 +92,8 @@ public:
void appendWarning(const QString &text);
// Append a bold command "10:00 " + "Executing: vcs -diff"
void appendCommand(const QString &text);
// Append a message text (e.g. "command has finished successfully") and pop up.
void appendMessage(const QString &text);
protected:
virtual void contextMenuEvent(QContextMenuEvent *event);
@@ -103,6 +105,7 @@ private:
QTextCharFormat m_errorFormat;
QTextCharFormat m_warningFormat;
QTextCharFormat m_commandFormat;
QTextCharFormat m_messageFormat;
};
OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) :
@@ -110,13 +113,15 @@ OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) :
m_defaultFormat(currentCharFormat()),
m_errorFormat(m_defaultFormat),
m_warningFormat(m_defaultFormat),
m_commandFormat(m_defaultFormat)
m_commandFormat(m_defaultFormat),
m_messageFormat(m_defaultFormat)
{
setReadOnly(true);
setFrameStyle(QFrame::NoFrame);
m_errorFormat.setForeground(Qt::red);
m_warningFormat.setForeground(Qt::darkYellow);
m_commandFormat.setFontWeight(QFont::Bold);
m_messageFormat.setForeground(Qt::blue);
}
// Search back for beginning of word
@@ -239,6 +244,13 @@ void OutputWindowPlainTextEdit::appendCommand(const QString &text)
setCurrentCharFormat(m_defaultFormat);
}
void OutputWindowPlainTextEdit::appendMessage(const QString &text)
{
setCurrentCharFormat(m_messageFormat);
appendLines(text);
setCurrentCharFormat(m_defaultFormat);
}
} // namespace Internal
// ------------------- VcsBaseOutputWindowPrivate
@@ -433,6 +445,11 @@ void VcsBaseOutputWindow::appendCommand(const QString &workingDirectory,
appendCommand(msgExecutionLogEntry(workingDirectory, binary, args));
}
void VcsBaseOutputWindow::appendMessage(const QString &text)
{
d->plainTextEdit()->appendMessage(text);
}
VcsBaseOutputWindow *VcsBaseOutputWindow::instance()
{
if (!VcsBaseOutputWindowPrivate::instance) {