From 37a0ef29c0ae1b61f989f8320f98dd4db8dc6942 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 17 Dec 2020 10:30:03 +0100 Subject: [PATCH] QML: Use new message manager API That is more evocative. Also avoid some instances of popping up the general messages pane, which should preferably only happen on direct user interaction. Task-number: QTCREATORBUG-24430 Change-Id: I69bb49f84c1486fd32b2a048ca4d76dceb6a0b2b Reviewed-by: Knud Dollereder Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/generateresource.cpp | 36 +++++++++++-------- .../qmlpreviewconnectionmanager.cpp | 12 ++++--- src/plugins/qmlpreview/qmlpreviewplugin.cpp | 2 +- src/plugins/qmlprojectmanager/qmlproject.cpp | 13 ++++--- 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp index 57661f0aa48..cdb34f24d92 100644 --- a/src/plugins/qmldesigner/generateresource.cpp +++ b/src/plugins/qmldesigner/generateresource.cpp @@ -89,9 +89,10 @@ void GenerateResource::generateMenuEntry() if (resourceFileName.isEmpty()) return; - Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource", - "Generate a resource file out of project %1 to %2").arg( - currentProject->displayName(), QDir::toNativeSeparators(resourceFileName))); + Core::MessageManager::writeSilently( + QCoreApplication::translate("QmlDesigner::GenerateResource", + "Generate a resource file out of project %1 to %2") + .arg(currentProject->displayName(), QDir::toNativeSeparators(resourceFileName))); QTemporaryFile temp(projectPath + "/XXXXXXX.create.resource.qrc"); if (!temp.open()) @@ -111,34 +112,41 @@ void GenerateResource::generateMenuEntry() for (const auto &arguments : {arguments1, arguments2}) { rccProcess.start(rccBinary.toString(), arguments); if (!rccProcess.waitForStarted()) { - Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource", - "Unable to generate resource file: %1").arg(resourceFileName)); + Core::MessageManager::writeDisrupting( + QCoreApplication::translate("QmlDesigner::GenerateResource", + "Unable to generate resource file: %1") + .arg(resourceFileName)); return; } QByteArray stdOut; QByteArray stdErr; if (!Utils::SynchronousProcess::readDataFromProcess(rccProcess, 30, &stdOut, &stdErr, true)) { Utils::SynchronousProcess::stopProcess(rccProcess); - Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource", - "A timeout occurred running \"%1\"").arg(rccBinary.toString() + arguments.join(" "))); + Core::MessageManager::writeDisrupting( + QCoreApplication::translate("QmlDesigner::GenerateResource", + "A timeout occurred running \"%1\"") + .arg(rccBinary.toString() + arguments.join(" "))); return ; } if (!stdOut.trimmed().isEmpty()) { - Core::MessageManager::write(QString::fromLocal8Bit(stdOut)); + Core::MessageManager::writeFlashing(QString::fromLocal8Bit(stdOut)); } if (!stdErr.trimmed().isEmpty()) - Core::MessageManager::write(QString::fromLocal8Bit(stdErr)); + Core::MessageManager::writeFlashing(QString::fromLocal8Bit(stdErr)); if (rccProcess.exitStatus() != QProcess::NormalExit) { - Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource", - "\"%1\" crashed.").arg(rccBinary.toString() + arguments.join(" "))); + Core::MessageManager::writeDisrupting( + QCoreApplication::translate("QmlDesigner::GenerateResource", "\"%1\" crashed.") + .arg(rccBinary.toString() + arguments.join(" "))); return; } if (rccProcess.exitCode() != 0) { - Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource", - "\"%1\" failed (exit code %2).").arg(rccBinary.toString() + - " " + arguments.join(" ")).arg(rccProcess.exitCode())); + Core::MessageManager::writeDisrupting( + QCoreApplication::translate("QmlDesigner::GenerateResource", + "\"%1\" failed (exit code %2).") + .arg(rccBinary.toString() + " " + arguments.join(" ")) + .arg(rccProcess.exitCode())); return; } diff --git a/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp b/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp index 8700fc1c512..6767544c1d7 100644 --- a/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp +++ b/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp @@ -196,11 +196,13 @@ void QmlPreviewConnectionManager::createPreviewClient() m_qmlPreviewClient->announceError(path); }); - connect(m_qmlPreviewClient.data(), &QmlPreviewClient::errorReported, - this, [](const QString &error) { - Core::MessageManager::write("Error loading QML Live Preview:"); - Core::MessageManager::write(error); - }); + connect(m_qmlPreviewClient.data(), + &QmlPreviewClient::errorReported, + this, + [](const QString &error) { + Core::MessageManager::writeDisrupting("Error loading QML Live Preview:"); + Core::MessageManager::writeSilently(error); + }); connect(m_qmlPreviewClient.data(), &QmlPreviewClient::fpsReported, this, [this](const QmlPreviewClient::FpsInfo &frames) { diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp index fa409586ba3..bf3a66289ed 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp @@ -119,7 +119,7 @@ static bool defaultFileClassifier(const QString &filename) static void defaultFpsHandler(quint16 frames[8]) { - Core::MessageManager::write(QString::fromLatin1("QML preview: %1 fps").arg(frames[0])); + Core::MessageManager::writeSilently(QString::fromLatin1("QML preview: %1 fps").arg(frames[0])); } class QmlPreviewPluginPrivate : public QObject diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index db1d90d8282..ab94bab829d 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -146,10 +146,9 @@ void QmlBuildSystem::parseProject(RefreshOptions options) this, &QmlBuildSystem::refreshFiles); } else { - MessageManager::write(tr("Error while loading project file %1.") - .arg(projectFilePath().toUserOutput()), - MessageManager::NoModeSwitch); - MessageManager::write(errorMessage); + MessageManager::writeFlashing(tr("Error while loading project file %1.") + .arg(projectFilePath().toUserOutput())); + MessageManager::writeSilently(errorMessage); } } if (m_projectItem) { @@ -167,9 +166,9 @@ void QmlBuildSystem::parseProject(RefreshOptions options) Utils::FileReader reader; QString errorMessage; if (!reader.fetch(mainFilePath, &errorMessage)) { - MessageManager::write(tr("Warning while loading project file %1.") - .arg(projectFilePath().toUserOutput())); - MessageManager::write(errorMessage); + MessageManager::writeFlashing(tr("Warning while loading project file %1.") + .arg(projectFilePath().toUserOutput())); + MessageManager::writeSilently(errorMessage); } } }