Update InfoBar texts, titles and types

Task-number: QTCREATORBUG-32075
Change-Id: Ib3e84bdc455cc28c5ac30c14adb54668bcd29a79
Reviewed-by: Eike Ziller <[email protected]>
Reviewed-by: Leena Miettinen <[email protected]>

14 files changed, 33 insertions, 11 deletions

diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 68dfed60a83..5541a18f0d3 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -142,10 +142,12 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
 
         Utils::InfoBarEntry
             info(kSetupAndroidSetting,
-                 Tr::tr("Would you like to configure Android options? This will ensure "
-                        "Android kits can be usable and all essential packages are installed. "
-                        "To do it later, select Edit > Preferences > Devices > Android."),
+                 Tr::tr("Automatically create usable Android kits and install all essential "
+                        "packages. "
+                        "To do this later, select Edit > Preferences > Devices > Android."),
                  Utils::InfoBarEntry::GlobalSuppression::Enabled);
+        info.setTitle(Tr::tr("Configure Android Options?"));
+        info.setInfoType(Utils::InfoLabel::Information);
         info.addCustomButton(
             Tr::tr("Configure Android"),
             [this] {
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index a198d37b33a..3ac9015a092 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -171,6 +171,8 @@ static void checkSystemForClangdSuitability()
             "would be higher than what your system can handle.");
     const Id clangdWarningSetting("WarnAboutClangd");
     InfoBarEntry info(clangdWarningSetting, warnStr);
+    info.setTitle(Tr::tr("Clangd Disabled"));
+    info.setInfoType(InfoLabel::Warning);
     info.setDetailsWidgetCreator([] {
         const auto label = new QLabel(Tr::tr(
             "With clangd enabled, Qt Creator fully supports modern C++ "
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 441d1af1555..5b1fa260516 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -523,6 +523,7 @@ void CorePlugin::warnAboutCrashReporing()
     Utils::InfoBarEntry info(kWarnCrashReportingSetting, warnStr,
                              Utils::InfoBarEntry::GlobalSuppression::Enabled);
     info.setTitle(Tr::tr("Crash Reporting"));
+    info.setInfoType(InfoLabel::Information);
     info.addCustomButton(
         ICore::msgShowOptionsDialog(),
         [] { ICore::showOptionsDialog(Core::Constants::SETTINGS_ID_SYSTEM); },
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 20ccb8c701c..ee8da159933 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -790,6 +790,8 @@ void CppEditorWidget::showRenameWarningIfFileIsGenerated(const Utils::FilePath &
         }
         static const Id infoId("cppeditor.renameWarning");
         InfoBarEntry info(infoId, warning);
+        info.setTitle(Tr::tr("Renamed Symbol Will Be Overwritten"));
+        info.setInfoType(InfoLabel::Warning);
         if (ec) {
             info.addCustomButton(
                 CppEditor::Tr::tr("Open \"%1\"").arg(ec->source().fileName()),
diff --git a/src/plugins/debugger/dap/pydapengine.cpp b/src/plugins/debugger/dap/pydapengine.cpp
index 6f915a80947..034a94977a4 100644
--- a/src/plugins/debugger/dap/pydapengine.cpp
+++ b/src/plugins/debugger/dap/pydapengine.cpp
@@ -228,9 +228,10 @@ void PyDapEngine::setupEngine()
     if (missingModuleInstallation(interpreter, "debugpy")) {
         Utils::InfoBarEntry
             info(installDebugPyInfoBarId,
-                 Tr::tr(
-                     "Python debugging support is not available. Install the debugpy package."),
+                 Tr::tr("Install the debugpy package to turn on Python debugging support."),
                  Utils::InfoBarEntry::GlobalSuppression::Enabled);
+        info.setTitle(Tr::tr("Python Debugging Is Not Available"));
+        info.setInfoType(InfoLabel::Warning);
         info.addCustomButton(
             Tr::tr("Install debugpy"),
             [this] {
diff --git a/src/plugins/extensionmanager/extensionmanagerwidget.cpp b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
index 06c61de865d..0eac1d1a805 100644
--- a/src/plugins/extensionmanager/extensionmanagerwidget.cpp
+++ b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
@@ -107,6 +107,7 @@ static void requestRestart()
         Utils::InfoBarEntry
             info(kRestartSetting, Core::Tr::tr("Plugin changes will take effect after restart."));
         info.setTitle(Tr::tr("Restart Required"));
+        info.setInfoType(InfoLabel::Information);
         info.addCustomButton(
             Tr::tr("Restart Now"),
             [] { QTimer::singleShot(0, ICore::instance(), &ICore::restart); },
diff --git a/src/plugins/lua/bindings/fetch.cpp b/src/plugins/lua/bindings/fetch.cpp
index 71f1e30c3bf..21eaed9025a 100644
--- a/src/plugins/lua/bindings/fetch.cpp
+++ b/src/plugins/lua/bindings/fetch.cpp
@@ -221,6 +221,8 @@ void setupFetchModule()
                     infoBarId,
                     Tr::tr("Allow the extension \"%1\" to fetch data from the internet?")
                         .arg(pluginName)};
+                entry.setTitle(Tr::tr("Allow Fetching Data?"));
+                entry.setInfoType(InfoLabel::Warning);
                 entry.setDetailsWidgetCreator([pluginName, url] {
                     const QString markdown = Tr::tr("Allow the extension \"%1\" to fetch data "
                                                     "from the following URL:\n\n")
diff --git a/src/plugins/lua/bindings/install.cpp b/src/plugins/lua/bindings/install.cpp
index 434c5b2e91a..1fd163eec71 100644
--- a/src/plugins/lua/bindings/install.cpp
+++ b/src/plugins/lua/bindings/install.cpp
@@ -364,6 +364,8 @@ void setupInstallModule()
 
                     InfoBarEntry entry(infoBarId, msg, InfoBarEntry::GlobalSuppression::Enabled);
 
+                    entry.setInfoType(InfoLabel::Warning);
+
                     entry.addCustomButton(
                         Tr::tr("Install"),
                         [install]() { install(); },
diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index d87379efbe3..2894bd678d3 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -514,6 +514,7 @@ static void askUserAboutMcuSupportKitsUpgrade(const SettingsHandler::Ptr &settin
     InfoBarEntry info(upgradeMcuSupportKits,
                       Tr::tr("New version of Qt for MCUs detected. Upgrade existing kits?"),
                       InfoBarEntry::GlobalSuppression::Enabled);
+    info.setInfoType(InfoLabel::Information);
     using McuKitManager::UpgradeOption;
     static UpgradeOption selectedOption = UpgradeOption::Keep;
 
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index ffaa54e4df3..d302c351b7c 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -166,7 +166,8 @@ static void askAboutQtInstallation()
             "Link with a Qt installation to automatically register Qt versions and kits? To do "
             "this later, select Edit > Preferences > Kits > Qt Versions > Link with Qt."),
         Utils::InfoBarEntry::GlobalSuppression::Enabled);
-    info.setTitle(Tr::tr("Link with Qt"));
+    info.setTitle(Tr::tr("Link with an Installed Qt?"));
+    info.setInfoType(InfoLabel::Information);
     info.addCustomButton(
         Tr::tr("Link with Qt"),
         [] { QTimer::singleShot(0, ICore::dialogParent(), &LinkWithQtSupport::linkWithQt); },
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index fbf5b1aeb1a..1d76e4296f3 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1233,7 +1233,10 @@ void LinuxDevicePrivate::announceConnectionAttempt()
                                    "This might take a moment.").arg(q->displayName());
     qCDebug(linuxDeviceLog) << message;
     if (isMainThread()) {
-        Core::ICore::infoBar()->addInfo(InfoBarEntry(announceId(), message));
+        InfoBarEntry info(announceId(), message);
+        info.setTitle(Tr::tr("Establishing a Connection"));
+        info.setInfoType(InfoLabel::Ok);
+        Core::ICore::infoBar()->addInfo(info);
         QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
         QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents); // Yes, twice.
     }
@@ -1258,6 +1261,7 @@ bool LinuxDevicePrivate::checkDisconnectedWithWarning()
         const QString warnStr
             = Tr::tr("Device \"%1\" is currently marked as disconnected.").arg(name);
         InfoBarEntry info(errorId, warnStr, InfoBarEntry::GlobalSuppression::Enabled);
+        info.setTitle(Tr::tr("Device is Disconnected"));
         info.setDetailsWidgetCreator([] {
             const auto label = new QLabel(Tr::tr(
                 "The device was not available when trying to connect previously.<br>"
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index 32283aa93a8..fca2185a1cd 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -194,6 +194,7 @@ static void showUpdateInfo(const QList<Update> &updates,
 {
     InfoBarEntry info(InstallUpdates, infoTitle(updates, newQt));
     info.setTitle(Tr::tr("Updates Available"));
+    info.setInfoType(InfoLabel::Information);
     info.addCustomButton(
         Tr::tr("Open Settings"),
         [] { ICore::showOptionsDialog(FILTER_OPTIONS_PAGE_ID); },
diff --git a/src/plugins/webassembly/webassemblydevice.cpp b/src/plugins/webassembly/webassemblydevice.cpp
index 32a28215b6e..d72043d2f10 100644
--- a/src/plugins/webassembly/webassemblydevice.cpp
+++ b/src/plugins/webassembly/webassemblydevice.cpp
@@ -63,6 +63,8 @@ static void askUserAboutEmSdkSetup()
                       Tr::tr("Setup Emscripten SDK for WebAssembly? "
                              "To do it later, select Edit > Preferences > Devices > WebAssembly."),
                       InfoBarEntry::GlobalSuppression::Enabled);
+    info.setTitle(Tr::tr("Set up WebAssembly?"));
+    info.setInfoType(InfoLabel::Information);
     info.addCustomButton(
         Tr::tr("Setup Emscripten SDK"),
         [] { QTimer::singleShot(0, []() { ICore::showOptionsDialog(Constants::SETTINGS_ID); }); },
diff --git a/src/plugins/welcome/introductionwidget.cpp b/src/plugins/welcome/introductionwidget.cpp
index ebf8c0d8bcd..03f3ba1040c 100644
--- a/src/plugins/welcome/introductionwidget.cpp
+++ b/src/plugins/welcome/introductionwidget.cpp
@@ -426,11 +426,11 @@ void askUserAboutIntroduction()
 
     InfoBarEntry
         info(kTakeTourSetting,
-             Tr::tr("Would you like to take a quick UI tour? This tour highlights important user "
-                    "interface elements and shows how they are used. To take the tour later, "
-                    "select Help > UI Tour."),
+             Tr::tr("See where the important UI elements are and how they are used. "
+                    "To take the tour later, select Help > UI Tour."),
              InfoBarEntry::GlobalSuppression::Enabled);
-    info.setTitle(Tr::tr("UI Tour"));
+    info.setTitle(Tr::tr("Take a UI Tour?"));
+    info.setInfoType(InfoLabel::Information);
     info.addCustomButton(
         Tr::tr("Take UI Tour"),
         [] { runUiTour(); },