Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove styling from error message in 'New Account' wizard #11557

Merged
merged 2 commits into from
Mar 26, 2024
+35 −14
Merged

Remove styling from error message in 'New Account' wizard #11557

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a009dea
Remove styling from error message in 'New Account' wizard
erikjv Mar 20, 2024
ce9c4e3
Merge branch 'master' into work/remove-styling-in-error-display
TheOneRing Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gui/newwizard/setupwizardwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
47 changes: 34 additions & 13 deletions src/gui/newwizard/setupwizardwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -164,6 +183,8 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../../resources/client.qrc"/>
</resources>
<connections/>
</ui>
Loading