summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2020-02-20 13:38:43 +0100
committerAndré Hartmann <aha_1980@gmx.de>2020-02-20 19:39:29 +0000
commit32935591ddfeb347e11358ee4645eece06072316 (patch)
tree9822e76c33462f1cfcc95102c0969b2c6b7dd85f /src
parentb14351dab85b5112640ac4c5020be0b84cf2aff8 (diff)
downloadqt-creator-32935591ddfeb347e11358ee4645eece06072316.tar.gz
ExecuteFilter: Add timestamps to command outputs
By adding a new function to MessageManager. Change-Id: Ia70d781c0398e8ce0a055ae8fc4718a9081e688f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/coreplugin/locator/executefilter.cpp8
-rw-r--r--src/plugins/coreplugin/messagemanager.cpp7
-rw-r--r--src/plugins/coreplugin/messagemanager.h1
3 files changed, 12 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp
index f98beae687..ea983a34f5 100644
--- a/src/plugins/coreplugin/locator/executefilter.cpp
+++ b/src/plugins/coreplugin/locator/executefilter.cpp
@@ -134,7 +134,7 @@ void ExecuteFilter::finished(int exitCode, QProcess::ExitStatus status)
message = tr("Command \"%1\" finished.").arg(commandName);
else
message = tr("Command \"%1\" failed.").arg(commandName);
- MessageManager::write(message);
+ MessageManager::writeWithTime(message);
m_taskQueue.dequeue();
if (!m_taskQueue.isEmpty())
@@ -162,18 +162,18 @@ void ExecuteFilter::runHeadCommand()
const ExecuteData &d = m_taskQueue.head();
const Utils::FilePath fullPath = Utils::Environment::systemEnvironment().searchInPath(d.executable);
if (fullPath.isEmpty()) {
- MessageManager::write(tr("Could not find executable for \"%1\".").arg(d.executable));
+ MessageManager::writeWithTime(tr("Could not find executable for \"%1\".").arg(d.executable));
m_taskQueue.dequeue();
runHeadCommand();
return;
}
- MessageManager::write(tr("Starting command \"%1\".").arg(headCommand()));
+ MessageManager::writeWithTime(tr("Starting command \"%1\".").arg(headCommand()));
m_process->setWorkingDirectory(d.workingDirectory);
m_process->setCommand({fullPath, d.arguments, Utils::CommandLine::Raw});
m_process->start();
m_process->closeWriteChannel();
if (!m_process->waitForStarted(1000)) {
- MessageManager::write(tr("Could not start process: %1.").arg(m_process->errorString()));
+ MessageManager::writeWithTime(tr("Could not start process: %1.").arg(m_process->errorString()));
m_taskQueue.dequeue();
runHeadCommand();
}
diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp
index 75b2e81531..e5eadc40ec 100644
--- a/src/plugins/coreplugin/messagemanager.cpp
+++ b/src/plugins/coreplugin/messagemanager.cpp
@@ -32,6 +32,7 @@
#include <QFont>
#include <QThread>
+#include <QTime>
#include <QTimer>
using namespace Core;
@@ -106,6 +107,12 @@ void MessageManager::write(const QString &text, PrintToOutputPaneFlags flags)
QTimer::singleShot(0, instance(), [text, flags] { doWrite(text, flags); });
}
+void MessageManager::writeWithTime(const QString &text, PrintToOutputPaneFlags flags)
+{
+ const QString timeStamp = QTime::currentTime().toString("HH:mm:ss ");
+ write(timeStamp + text, flags);
+}
+
void MessageManager::doWrite(const QString &text, PrintToOutputPaneFlags flags)
{
QTC_ASSERT(m_messageOutputWindow, return);
diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h
index 386001bc43..b3efc99e86 100644
--- a/src/plugins/coreplugin/messagemanager.h
+++ b/src/plugins/coreplugin/messagemanager.h
@@ -65,6 +65,7 @@ public:
static void writeMessages(const QStringList &messages,
PrintToOutputPaneFlags flags = NoModeSwitch);
static void write(const QString &text, PrintToOutputPaneFlags flags = NoModeSwitch);
+ static void writeWithTime(const QString &text, PrintToOutputPaneFlags flags = NoModeSwitch);
private:
MessageManager();