From 78ffbe0ae7150aead36c20d4f4b003ca8d4bfcf4 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Thu, 12 Dec 2019 10:08:18 +0100
Subject: [PATCH] Utils: Use Utils::InfoLabel in ProjectIntroPage

Increases legibility in dark themes and removes some usages of style sheets.

Task-number: QDS-1346
Task-number: QTCREATORBUG-23346
Change-Id: If4a5583ee63ad14381de4cdef9561333f7854683
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/utils/projectintropage.cpp | 36 +++++++----------------------
 src/libs/utils/projectintropage.h   |  5 ++--
 src/libs/utils/projectintropage.ui  |  7 +++++-
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index 56127ac4797..a98095b3d91 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -58,29 +58,19 @@ namespace Utils {
 class ProjectIntroPagePrivate
 {
 public:
-    ProjectIntroPagePrivate();
     Ui::ProjectIntroPage m_ui;
     bool m_complete = false;
     QRegularExpressionValidator m_projectNameValidator;
-    // Status label style sheets
-    const QString m_errorStyleSheet;
-    const QString m_warningStyleSheet;
-    const QString m_hintStyleSheet;
     bool m_forceSubProject = false;
     QStringList m_projectDirectories;
 };
 
-ProjectIntroPagePrivate::  ProjectIntroPagePrivate() :
-    m_errorStyleSheet(QLatin1String("background : red;")),
-    m_warningStyleSheet(QLatin1String("background : yellow;"))
-{
-}
-
 ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
     WizardPage(parent),
     d(new ProjectIntroPagePrivate)
 {
     d->m_ui.setupUi(this);
+    d->m_ui.stateLabel->setFilled(true);
     hideStatusLabel();
     d->m_ui.nameLineEdit->setPlaceholderText(tr("Enter project name"));
     d->m_ui.nameLineEdit->setFocus();
@@ -171,7 +161,7 @@ bool ProjectIntroPage::validate()
     }
     // Validate and display status
     if (!d->m_ui.pathChooser->isValid()) {
-        displayStatusMessage(Error, d->m_ui.pathChooser->errorMessage());
+        displayStatusMessage(InfoLabel::Error, d->m_ui.pathChooser->errorMessage());
         return false;
     }
 
@@ -179,7 +169,7 @@ bool ProjectIntroPage::validate()
     bool nameValid = false;
     switch (d->m_ui.nameLineEdit->state()) {
     case FancyLineEdit::Invalid:
-        displayStatusMessage(Error, d->m_ui.nameLineEdit->errorMessage());
+        displayStatusMessage(InfoLabel::Error, d->m_ui.nameLineEdit->errorMessage());
         return false;
     case FancyLineEdit::DisplayingPlaceholderText:
         break;
@@ -197,11 +187,11 @@ bool ProjectIntroPage::validate()
     }
 
     if (projectDirFile.isDir()) {
-        displayStatusMessage(Warning, tr("The project already exists."));
+        displayStatusMessage(InfoLabel::Warning, tr("The project already exists."));
         return nameValid;
     }
     // Not a directory, but something else, likely causing directory creation to fail
-    displayStatusMessage(Error, tr("A file with that name already exists."));
+    displayStatusMessage(InfoLabel::Error, tr("A file with that name already exists."));
     return false;
 }
 
@@ -292,25 +282,15 @@ bool ProjectIntroPage::validateProjectName(const QString &name, QString *errorMe
     return true;
 }
 
-void ProjectIntroPage::displayStatusMessage(StatusLabelMode m, const QString &s)
+void ProjectIntroPage::displayStatusMessage(InfoLabel::InfoType t, const QString &s)
 {
-    switch (m) {
-    case Error:
-        d->m_ui.stateLabel->setStyleSheet(d->m_errorStyleSheet);
-        break;
-    case Warning:
-        d->m_ui.stateLabel->setStyleSheet(d->m_warningStyleSheet);
-        break;
-    case Hint:
-        d->m_ui.stateLabel->setStyleSheet(d->m_hintStyleSheet);
-        break;
-    }
+    d->m_ui.stateLabel->setType(t);
     d->m_ui.stateLabel->setText(s);
 }
 
 void ProjectIntroPage::hideStatusLabel()
 {
-    displayStatusMessage(Hint, QString());
+    displayStatusMessage(InfoLabel::None, {});
 }
 
 bool ProjectIntroPage::useAsDefaultPath() const
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index 909ad7d576e..37ea875091c 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -27,6 +27,7 @@
 
 #include "utils_global.h"
 #include "wizardpage.h"
+#include "infolabel.h"
 
 namespace Utils {
 
@@ -77,10 +78,8 @@ private:
     void slotChanged();
     void slotActivated();
 
-    enum StatusLabelMode { Error, Warning, Hint };
-
     bool validate();
-    void displayStatusMessage(StatusLabelMode m, const QString &);
+    void displayStatusMessage(InfoLabel::InfoType t, const QString &);
     void hideStatusLabel();
 
     ProjectIntroPagePrivate *d;
diff --git a/src/libs/utils/projectintropage.ui b/src/libs/utils/projectintropage.ui
index c882b595778..54624948a6b 100644
--- a/src/libs/utils/projectintropage.ui
+++ b/src/libs/utils/projectintropage.ui
@@ -109,7 +109,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="stateLabel">
+    <widget class="Utils::InfoLabel" name="stateLabel">
      <property name="wordWrap">
       <bool>true</bool>
      </property>
@@ -129,6 +129,11 @@
    <header location="global">utils/pathchooser.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>Utils::InfoLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">utils/infolabel.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>