Skip to content
Snippets Groups Projects
Commit 9a2814d6 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

introduce separate output format for windows debug channel

parent 8a4a7b71
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,7 @@ enum OutputFormat ...@@ -39,6 +39,7 @@ enum OutputFormat
{ {
NormalMessageFormat, NormalMessageFormat,
ErrorMessageFormat, ErrorMessageFormat,
DebugFormat,
StdOutFormat, StdOutFormat,
StdErrFormat, StdErrFormat,
StdOutFormatSameLine, StdOutFormatSameLine,
......
...@@ -117,6 +117,9 @@ void OutputFormatter::initFormats() ...@@ -117,6 +117,9 @@ void OutputFormatter::initFormats()
m_formats[StdErrFormat].setFont(m_font); m_formats[StdErrFormat].setFont(m_font);
m_formats[StdErrFormat].setForeground(mixColors(p.color(QPalette::Text), QColor(Qt::red))); m_formats[StdErrFormat].setForeground(mixColors(p.color(QPalette::Text), QColor(Qt::red)));
m_formats[StdErrFormatSameLine] = m_formats[StdErrFormat]; 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) void OutputFormatter::handleLink(const QString &href)
......
...@@ -167,9 +167,9 @@ enum LogChannel ...@@ -167,9 +167,9 @@ enum LogChannel
LogTime, // Used for time stamp messages LogTime, // Used for time stamp messages
LogDebug, LogDebug,
LogMisc, LogMisc,
AppOutput, AppOutput, // stdout
AppError, AppError, // stderr
AppStuff, AppStuff, // (possibly) windows debug channel
StatusBar, // LogStatus and also put to the status bar StatusBar, // LogStatus and also put to the status bar
ScriptConsoleOutput ScriptConsoleOutput
}; };
......
...@@ -304,7 +304,7 @@ void DebuggerRunControl::showMessage(const QString &msg, int channel) ...@@ -304,7 +304,7 @@ void DebuggerRunControl::showMessage(const QString &msg, int channel)
appendMessage(msg, Utils::StdErrFormatSameLine); appendMessage(msg, Utils::StdErrFormatSameLine);
break; break;
case AppStuff: case AppStuff:
appendMessage(msg, Utils::NormalMessageFormat); appendMessage(msg, Utils::DebugFormat);
break; break;
} }
} }
......
...@@ -134,7 +134,7 @@ void ApplicationLauncher::appendProcessMessage(const QString &output, bool onStd ...@@ -134,7 +134,7 @@ void ApplicationLauncher::appendProcessMessage(const QString &output, bool onStd
void ApplicationLauncher::readWinDebugOutput(const QString &output) void ApplicationLauncher::readWinDebugOutput(const QString &output)
{ {
emit appendMessage(output, Utils::StdErrFormat); emit appendMessage(output, Utils::DebugFormat);
} }
void ApplicationLauncher::processStopped() void ApplicationLauncher::processStopped()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment