From 801275669a5564cffab1aa9d32072208187f2055 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Sat, 14 Dec 2019 16:47:08 +0100
Subject: [PATCH] CMakeProjectManager: Use Utils::InfoLabel in
 CMakeBuildSettingsWidget

Task-number: QTCREATORBUG-23346
Change-Id: I6f8928ad1ed8ac15d354c7105d95be941833ae0d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 .../cmakebuildsettingswidget.cpp              | 28 ++++---------------
 .../cmakebuildsettingswidget.h                |  7 ++---
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
index ac2898657d4..77f89d08c56 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
@@ -42,10 +42,10 @@
 #include <utils/detailswidget.h>
 #include <utils/fancylineedit.h>
 #include <utils/headerviewstretcher.h>
+#include <utils/infolabel.h>
 #include <utils/itemviews.h>
 #include <utils/pathchooser.h>
 #include <utils/progressindicator.h>
-#include <utils/utilsicons.h>
 
 #include <QBoxLayout>
 #include <QCheckBox>
@@ -124,26 +124,14 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     mainLayout->addItem(new QSpacerItem(20, 10), row, 0);
 
     ++row;
-    m_errorLabel = new QLabel;
-    m_errorLabel->setPixmap(Utils::Icons::CRITICAL.pixmap());
-    m_errorLabel->setVisible(false);
-    m_errorMessageLabel = new QLabel;
+    m_errorMessageLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Error);
     m_errorMessageLabel->setVisible(false);
-    auto boxLayout = new QHBoxLayout;
-    boxLayout->addWidget(m_errorLabel);
-    boxLayout->addWidget(m_errorMessageLabel);
-    mainLayout->addLayout(boxLayout, row, 0, 1, 3, Qt::AlignHCenter);
+    mainLayout->addWidget(m_errorMessageLabel, row, 0, 1, -1, Qt::AlignHCenter);
 
     ++row;
-    m_warningLabel = new QLabel;
-    m_warningLabel->setPixmap(Utils::Icons::WARNING.pixmap());
-    m_warningLabel->setVisible(false);
-    m_warningMessageLabel = new QLabel;
+    m_warningMessageLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Warning);
     m_warningMessageLabel->setVisible(false);
-    auto boxLayout2 = new QHBoxLayout;
-    boxLayout2->addWidget(m_warningLabel);
-    boxLayout2->addWidget(m_warningMessageLabel);
-    mainLayout->addLayout(boxLayout2, row, 0, 1, 3, Qt::AlignHCenter);
+    mainLayout->addWidget(m_warningMessageLabel, row, 0, 1, -1, Qt::AlignHCenter);
 
     ++row;
     mainLayout->addItem(new QSpacerItem(20, 10), row, 0);
@@ -345,21 +333,15 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
 void CMakeBuildSettingsWidget::setError(const QString &message)
 {
     bool showError = !message.isEmpty();
-    m_errorLabel->setVisible(showError);
-    m_errorLabel->setToolTip(message);
     m_errorMessageLabel->setVisible(showError);
     m_errorMessageLabel->setText(message);
-    m_errorMessageLabel->setToolTip(message);
 }
 
 void CMakeBuildSettingsWidget::setWarning(const QString &message)
 {
     bool showWarning = !message.isEmpty();
-    m_warningLabel->setVisible(showWarning);
-    m_warningLabel->setToolTip(message);
     m_warningMessageLabel->setVisible(showWarning);
     m_warningMessageLabel->setText(message);
-    m_warningMessageLabel->setToolTip(message);
 }
 
 void CMakeBuildSettingsWidget::updateButtonState()
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h
index d63a8c80ce7..db68e3e125b 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.h
@@ -40,6 +40,7 @@ QT_END_NAMESPACE
 namespace Utils {
 class CategorySortFilterModel;
 class FancyLineEdit;
+class InfoLabel;
 class ProgressIndicator;
 } // namespace Utils
 
@@ -86,10 +87,8 @@ private:
     QPushButton *m_reconfigureButton;
     QTimer m_showProgressTimer;
     Utils::FancyLineEdit *m_filterEdit;
-    QLabel *m_errorLabel;
-    QLabel *m_warningLabel;
-    QLabel *m_errorMessageLabel;
-    QLabel *m_warningMessageLabel;
+    Utils::InfoLabel *m_errorMessageLabel;
+    Utils::InfoLabel *m_warningMessageLabel;
 };
 
 } // namespace Internal