diff options
author | Alexander Kondratskiy <kholdstare0.0@gmail.com> | 2014-02-11 19:57:24 -0500 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-02-19 18:14:38 +0100 |
commit | 7f7b8f0ef723f6695389442a261666ba76fcc566 (patch) | |
tree | 6bb400bf93432f2fb28e921a4f5bf179062adfdd /src/plugins/vcsbase/vcsbaseoutputwindow.h | |
parent | 9310b652ebbfca345c33ec554d73be8d10bdec19 (diff) |
VCS: Auto open for edit by Perforce no longer steals focus.
Refactoring appendLines to use MessageStyle enum.
Task-number: QTCREATORBUG-8289
Change-Id: I3a023724e6616d1b60640cb4d70ce7dd8fe30338
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseoutputwindow.h')
-rw-r--r-- | src/plugins/vcsbase/vcsbaseoutputwindow.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.h b/src/plugins/vcsbase/vcsbaseoutputwindow.h index 5213d95da0..8e2636a2ae 100644 --- a/src/plugins/vcsbase/vcsbaseoutputwindow.h +++ b/src/plugins/vcsbase/vcsbaseoutputwindow.h @@ -76,6 +76,14 @@ public: const QString &executable, const QStringList &arguments); + enum MessageStyle { + None, + Error, // Red error text + Warning, // Dark yellow warning text + Command, // A bold command with timetamp "10:00 " + "Executing: vcs -diff" + Message, // A blue message text (e.g. "command has finished successfully") + }; + public slots: void setRepository(const QString &); void clearRepository(); @@ -85,8 +93,9 @@ public slots: // Set text from QProcess' output data using the Locale's converter. void setData(const QByteArray &data); - // Append text and pop up. - void append(const QString &text); + // Append text with a certain style (none by default), + // and maybe pop up (silent by default) + void append(const QString &text, enum MessageStyle style = None, bool silently = false); // Silently append text, do not pop up. void appendSilently(const QString &text); |