From a009deaf552d076d5495d89f573fa299c7555397 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik@verbruggen.consulting>
Date: Wed, 20 Mar 2024 15:46:47 +0100
Subject: [PATCH] Remove styling from error message in 'New Account' wizard

In dark mode, white text on a light-red background is very hard to read.
Now the warning icon is shown, and the error text is shown in bold, but
otherwise no styling (esp. coloring) is done.

Fixes: #11547
---
 src/gui/newwizard/setupwizardwindow.cpp |  2 +-
 src/gui/newwizard/setupwizardwindow.ui  | 47 ++++++++++++++++++-------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/gui/newwizard/setupwizardwindow.cpp b/src/gui/newwizard/setupwizardwindow.cpp
index 08439b49566..73de59cf663 100644
--- a/src/gui/newwizard/setupwizardwindow.cpp
+++ b/src/gui/newwizard/setupwizardwindow.cpp
@@ -182,7 +182,7 @@ void SetupWizardWindow::slotHideErrorMessageWidget()
 
 void SetupWizardWindow::showErrorMessage(const QString &errorMessage)
 {
-    _ui->errorMessageLabel->setText(errorMessage);
+    _ui->errorMessageLabel->setText(QStringLiteral("<b>%1</b>").arg(errorMessage));
     _ui->errorMessageLabel->setWordWrap(true);
     _ui->errorMessageWidget->show();
 }
diff --git a/src/gui/newwizard/setupwizardwindow.ui b/src/gui/newwizard/setupwizardwindow.ui
index 83728eef72b..ec9d1add249 100644
--- a/src/gui/newwizard/setupwizardwindow.ui
+++ b/src/gui/newwizard/setupwizardwindow.ui
@@ -62,25 +62,44 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="styleSheet">
-        <string notr="true">background-color: #ff7070;</string>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
+       <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0">
+        <item>
+         <widget class="QLabel" name="warningPixmap">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>64</width>
+            <height>64</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>64</width>
+            <height>64</height>
+           </size>
+          </property>
+          <property name="pixmap">
+           <pixmap resource="../../resources/client.qrc">:/client/resources/light/warning.svg</pixmap>
+          </property>
+          <property name="scaledContents">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QLabel" name="errorMessageLabel">
-          <property name="text">
-           <string notr="true">error message placeholder</string>
+          <property name="textFormat">
+           <enum>Qt::RichText</enum>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="errorMessageDismissButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
           <property name="text">
            <string>Dismiss</string>
           </property>
@@ -164,6 +183,8 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../resources/client.qrc"/>
+ </resources>
  <connections/>
 </ui>