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

Implement ReplaceSelection output handling.

Browse Source 
External 'sort' now works as it should.
This commit is contained in:
con
2010-12-09 15:53:43 +01:00
parent 10b6b2936b
commit a22a30cf60
5 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,6 +356,10 @@ void ExternalToolRunner::started()
void ExternalToolRunner::finished()
{
if (m_tool->outputHandling() == ExternalTool::ReplaceSelection
|| m_tool->errorHandling() == ExternalTool::ReplaceSelection) {
emit ExternalToolManager::instance()->replaceSelectionRequested(m_processOutput);
}
ICore::instance()->messageManager()->printToOutputPane(
tr("'%1' finished").arg(m_resolvedExecutable), false);
// TODO handle the ReplaceSelection and ReloadDocument flags
@@ -379,6 +383,8 @@ void ExternalToolRunner::readStandardOutput()
// TODO handle the ReplaceSelection flag
if (m_tool->outputHandling() == ExternalTool::ShowInPane) {
ICore::instance()->messageManager()->printToOutputPane(output, true);
} else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection) {
m_processOutput.append(output);
}
}
@@ -391,14 +397,19 @@ void ExternalToolRunner::readStandardError()
// TODO handle the ReplaceSelection flag
if (m_tool->errorHandling() == ExternalTool::ShowInPane) {
ICore::instance()->messageManager()->printToOutputPane(output, true);
} else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection) {
m_processOutput.append(output);
}
}
// #pragma mark -- ExternalToolManager
ExternalToolManager *ExternalToolManager::m_instance = 0;
ExternalToolManager::ExternalToolManager(Core::ICore *core)
: QObject(core), m_core(core)
{
m_instance = this;
initialize();
}