From 3ef343bbf8273f2447b7cc50a10ae07f090e2acf Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 9 Nov 2023 12:41:00 +0100 Subject: [PATCH] Core: Improve readability of searchresult error messages Task-number: QTCREATORBUG-29824 Change-Id: Ic26a6671b886d74ab2aac1d8e1baa66bd9fe7f8d Reviewed-by: Eike Ziller --- src/plugins/coreplugin/find/searchresultwidget.cpp | 8 ++++---- src/plugins/coreplugin/find/searchresultwidget.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp index 06c59d95ecc..400f8e06370 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.cpp +++ b/src/plugins/coreplugin/find/searchresultwidget.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -93,8 +94,6 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) : topLayout->addWidget(m_topReplaceWidget); m_messageWidget = new QFrame; - pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::TextColorError)); - m_messageWidget->setPalette(pal); if (creatorTheme()->flag(Theme::DrawSearchResultWidgetFrame)) { m_messageWidget->setFrameStyle(QFrame::Panel | QFrame::Raised); m_messageWidget->setLineWidth(1); @@ -103,8 +102,9 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) : auto messageLayout = new QHBoxLayout(m_messageWidget); messageLayout->setContentsMargins(2, 2, 2, 2); m_messageWidget->setLayout(messageLayout); - m_messageLabel = new QLabel; - m_messageLabel->setPalette(pal); + m_messageLabel = new InfoLabel; + m_messageLabel->setType(InfoLabel::Error); + m_messageLabel->setFilled(true); messageLayout->addWidget(m_messageLabel); layout->addWidget(m_messageWidget); m_messageWidget->setVisible(false); diff --git a/src/plugins/coreplugin/find/searchresultwidget.h b/src/plugins/coreplugin/find/searchresultwidget.h index a9f87c467f1..4a40346343a 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.h +++ b/src/plugins/coreplugin/find/searchresultwidget.h @@ -18,6 +18,7 @@ class QToolButton; class QCheckBox; QT_END_NAMESPACE +namespace Utils { class InfoLabel; } namespace Core { namespace Internal { @@ -123,7 +124,7 @@ private: QWidget *m_descriptionContainer = nullptr; QLabel *m_label = nullptr; QLabel *m_searchTerm = nullptr; - QLabel *m_messageLabel = nullptr; + Utils::InfoLabel *m_messageLabel = nullptr; QToolButton *m_cancelButton = nullptr; QLabel *m_matchesFoundLabel = nullptr; bool m_preserveCaseSupported = true;