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

ExternalToolRunner: Adjust to MessageManager api change

Browse Source 
Note: The popup now no longer switches modes.

Change-Id: I855f393a8e97bddaff1471d3672a092c38c992f9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Daniel Teske
2013-03-12 16:41:24 +01:00
parent ceba2fc0e4
commit 05d90a6243
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/externaltool.cpp
View File

@@ -615,7 +615,7 @@ void ExternalToolRunner::run()
m_process->setWorkingDirectory(m_resolvedWorkingDirectory); m_process->setWorkingDirectory(m_resolvedWorkingDirectory);
m_process->setCommand(m_resolvedExecutable, m_resolvedArguments); m_process->setCommand(m_resolvedExecutable, m_resolvedArguments);
ICore::messageManager()->printToOutputPane( ICore::messageManager()->printToOutputPane(
tr("Starting external tool '%1' %2").arg(m_resolvedExecutable, m_resolvedArguments), false); tr("Starting external tool '%1' %2").arg(m_resolvedExecutable, m_resolvedArguments), MessageManager::Silent);
m_process->start(); m_process->start();
} }
@@ -637,7 +637,7 @@ void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status)
DocumentManager::unexpectFileChange(m_expectedFileName); DocumentManager::unexpectFileChange(m_expectedFileName);
} }
ICore::messageManager()->printToOutputPane( ICore::messageManager()->printToOutputPane(
tr("'%1' finished").arg(m_resolvedExecutable), false); tr("'%1' finished").arg(m_resolvedExecutable), MessageManager::Silent);
deleteLater(); deleteLater();
} }
@@ -657,7 +657,7 @@ void ExternalToolRunner::readStandardOutput()
QByteArray data = m_process->readAllStandardOutput(); QByteArray data = m_process->readAllStandardOutput();
QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_outputCodecState); QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_outputCodecState);
if (m_tool->outputHandling() == ExternalTool::ShowInPane) if (m_tool->outputHandling() == ExternalTool::ShowInPane)
ICore::messageManager()->printToOutputPane(output, true); ICore::messageManager()->printToOutputPane(output, MessageManager::NoModeSwitch);
else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection) else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection)
m_processOutput.append(output); m_processOutput.append(output);
} }
@@ -669,7 +669,7 @@ void ExternalToolRunner::readStandardError()
QByteArray data = m_process->readAllStandardError(); QByteArray data = m_process->readAllStandardError();
QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_errorCodecState); QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_errorCodecState);
if (m_tool->errorHandling() == ExternalTool::ShowInPane) if (m_tool->errorHandling() == ExternalTool::ShowInPane)
ICore::messageManager()->printToOutputPane(output, true); ICore::messageManager()->printToOutputPane(output, MessageManager::NoModeSwitch);
else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection) else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection)
m_processOutput.append(output); m_processOutput.append(output);
} }
@@ -771,7 +771,7 @@ void ExternalToolManager::menuActivated()
QTC_ASSERT(tool, return); QTC_ASSERT(tool, return);
ExternalToolRunner *runner = new ExternalToolRunner(tool); ExternalToolRunner *runner = new ExternalToolRunner(tool);
if (runner->hasError()) if (runner->hasError())
ICore::messageManager()->printToOutputPane(runner->errorString(), true); ICore::messageManager()->printToOutputPane(runner->errorString(), MessageManager::NoModeSwitch);
} }
QMap<QString, QList<Internal::ExternalTool *> > ExternalToolManager::toolsByCategory() const QMap<QString, QList<Internal::ExternalTool *> > ExternalToolManager::toolsByCategory() const