From 9a2814d64684d423cb0a373d029ba697d1bf9ba3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 11 May 2011 12:08:23 +0200
Subject: [PATCH] introduce separate output format for windows debug channel
---
src/libs/utils/outputformat.h | 1 +
src/libs/utils/outputformatter.cpp | 3 +++
src/plugins/debugger/debuggerconstants.h | 6 +++---
src/plugins/debugger/debuggerrunner.cpp | 2 +-
src/plugins/projectexplorer/applicationlauncher_win.cpp | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/libs/utils/outputformat.h b/src/libs/utils/outputformat.h
index 2a6cabfc2d7..4d4cb907a8b 100644
--- a/src/libs/utils/outputformat.h
+++ b/src/libs/utils/outputformat.h
@@ -39,6 +39,7 @@ enum OutputFormat
{
NormalMessageFormat,
ErrorMessageFormat,
+ DebugFormat,
StdOutFormat,
StdErrFormat,
StdOutFormatSameLine,
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index 4097de93d69..c1334807571 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -117,6 +117,9 @@ void OutputFormatter::initFormats()
m_formats[StdErrFormat].setFont(m_font);
m_formats[StdErrFormat].setForeground(mixColors(p.color(QPalette::Text), QColor(Qt::red)));
m_formats[StdErrFormatSameLine] = m_formats[StdErrFormat];
+
+ m_formats[DebugFormat].setFont(m_font);
+ m_formats[DebugFormat].setForeground(mixColors(p.color(QPalette::Text), QColor(Qt::magenta)));
}
void OutputFormatter::handleLink(const QString &href)
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index d72a8051bc0..7ff518a5b37 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -167,9 +167,9 @@ enum LogChannel
LogTime, // Used for time stamp messages
LogDebug,
LogMisc,
- AppOutput,
- AppError,
- AppStuff,
+ AppOutput, // stdout
+ AppError, // stderr
+ AppStuff, // (possibly) windows debug channel
StatusBar, // LogStatus and also put to the status bar
ScriptConsoleOutput
};
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index a87d1b9f5b1..89d4437a2e3 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -304,7 +304,7 @@ void DebuggerRunControl::showMessage(const QString &msg, int channel)
appendMessage(msg, Utils::StdErrFormatSameLine);
break;
case AppStuff:
- appendMessage(msg, Utils::NormalMessageFormat);
+ appendMessage(msg, Utils::DebugFormat);
break;
}
}
diff --git a/src/plugins/projectexplorer/applicationlauncher_win.cpp b/src/plugins/projectexplorer/applicationlauncher_win.cpp
index fac9abba095..b28cf138cb4 100644
--- a/src/plugins/projectexplorer/applicationlauncher_win.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_win.cpp
@@ -134,7 +134,7 @@ void ApplicationLauncher::appendProcessMessage(const QString &output, bool onStd
void ApplicationLauncher::readWinDebugOutput(const QString &output)
{
- emit appendMessage(output, Utils::StdErrFormat);
+ emit appendMessage(output, Utils::DebugFormat);
}
void ApplicationLauncher::processStopped()
--
GitLab