From 6263a58ef34208b1e7e063ccb22892e4679caf7a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 17 Dec 2020 09:20:20 +0100 Subject: [PATCH] Devices: Do not pop up general messages pane That should only happen on direct user interaction. Also use new message manager API. Task-number: QTCREATORBUG-24430 Change-Id: I87297b2ec7191b88210d3a2037afe27b8a3f40e9 Reviewed-by: Christian Kandeler --- src/plugins/boot2qt/qdbutils.cpp | 7 ++++--- src/plugins/remotelinux/linuxdevice.cpp | 8 +++----- src/plugins/winrt/winrtdevice.cpp | 7 +++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/plugins/boot2qt/qdbutils.cpp b/src/plugins/boot2qt/qdbutils.cpp index b4880fa28cc..fe04dc22610 100644 --- a/src/plugins/boot2qt/qdbutils.cpp +++ b/src/plugins/boot2qt/qdbutils.cpp @@ -87,9 +87,10 @@ const char *overridingEnvironmentVariable(QdbTool tool) void showMessage(const QString &message, bool important) { const QString fullMessage = QCoreApplication::translate("Boot2Qt", "Boot2Qt: %1").arg(message); - const Core::MessageManager::PrintToOutputPaneFlags flags = important - ? Core::MessageManager::ModeSwitch : Core::MessageManager::Silent; - Core::MessageManager::write(fullMessage, flags); + if (important) + Core::MessageManager::writeFlashing(fullMessage); + else + Core::MessageManager::writeSilently(fullMessage); } QString settingsGroupKey() diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index 1292e4fbbba..1b70bdd6ccd 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -193,15 +193,13 @@ LinuxDevice::LinuxDevice() DeviceProcess * const proc = createProcess(nullptr); QObject::connect(proc, &DeviceProcess::finished, [proc] { if (!proc->errorString().isEmpty()) { - Core::MessageManager::write(tr("Error running remote shell: %1") - .arg(proc->errorString()), - Core::MessageManager::ModeSwitch); + Core::MessageManager::writeDisrupting( + tr("Error running remote shell: %1").arg(proc->errorString())); } proc->deleteLater(); }); QObject::connect(proc, &DeviceProcess::error, [proc] { - Core::MessageManager::write(tr("Error starting remote shell."), - Core::MessageManager::ModeSwitch); + Core::MessageManager::writeDisrupting(tr("Error starting remote shell.")); proc->deleteLater(); }); Runnable runnable; diff --git a/src/plugins/winrt/winrtdevice.cpp b/src/plugins/winrt/winrtdevice.cpp index 1a77ca68467..9172b155399 100644 --- a/src/plugins/winrt/winrtdevice.cpp +++ b/src/plugins/winrt/winrtdevice.cpp @@ -176,8 +176,8 @@ void WinRtDeviceFactory::onPrerequisitesLoaded() void WinRtDeviceFactory::onProcessError() { - MessageManager::write(tr("Error while executing winrtrunner: %1") - .arg(m_process->errorString()), MessageManager::Flash); + MessageManager::writeDisrupting( + tr("Error while executing winrtrunner: %1").arg(m_process->errorString())); } void WinRtDeviceFactory::onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) @@ -190,8 +190,7 @@ void WinRtDeviceFactory::onProcessFinished(int exitCode, QProcess::ExitStatus ex } if (exitCode != 0) { - MessageManager::write(tr("winrtrunner returned with exit code %1.") - .arg(exitCode), MessageManager::Flash); + MessageManager::writeFlashing(tr("winrtrunner returned with exit code %1.").arg(exitCode)); return; }