From 3dc511f1d14c5662af6acfd2f5c2ff1f93402915 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 28 Aug 2019 13:35:38 +0200 Subject: [PATCH] Utils: Use Theme default "ok" and "error" colors for FancyLineEdit ...and remove the redundant setter calls elsewhere. Change-Id: Iec71fe1bff7f8c9dd72bf3c3e643a4ed01e4dc80 Reviewed-by: Eike Ziller --- src/libs/utils/fancylineedit.cpp | 5 +++-- src/libs/utils/pathchooser.cpp | 1 - src/plugins/coreplugin/find/findtoolbar.cpp | 2 -- src/plugins/git/gerrit/gerritdialog.cpp | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 0a046e4a174..e1460d18971 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -134,7 +134,7 @@ public: QString m_lastFilterText; QColor m_okTextColor; - QColor m_errorTextColor = Qt::red; + QColor m_errorTextColor; QString m_errorMessage; }; @@ -143,7 +143,8 @@ FancyLineEditPrivate::FancyLineEditPrivate(FancyLineEdit *parent) : m_lineEdit(parent), m_completionShortcut(completionShortcut()->key(), parent) { - m_okTextColor = parent->palette().color(QPalette::Active, QPalette::Text); + m_okTextColor = creatorTheme()->color(Theme::TextColorNormal); + m_errorTextColor = creatorTheme()->color(Theme::TextColorError); m_completionShortcut.setContext(Qt::WidgetShortcut); connect(completionShortcut(), &CompletionShortcut::keyChanged, diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index a4cc97407a6..31d5a1aeaf5 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -234,7 +234,6 @@ PathChooser::PathChooser(QWidget *parent) : connect(d->m_lineEdit, &QLineEdit::textChanged, this, [this] { emit pathChanged(d->m_lineEdit->text()); }); d->m_lineEdit->setMinimumWidth(120); - d->m_lineEdit->setErrorColor(creatorTheme()->color(Theme::TextColorError)); d->m_hLayout->addWidget(d->m_lineEdit); d->m_hLayout->setSizeConstraint(QLayout::SetMinimumSize); diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 72a2d23e3cb..caedd37e95a 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -100,8 +100,6 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind) m_ui.findEdit->setButtonVisible(Utils::FancyLineEdit::Left, true); m_ui.findEdit->setFiltering(true); m_ui.findEdit->setPlaceholderText(QString()); - m_ui.findEdit->setOkColor(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal)); - m_ui.findEdit->setErrorColor(Utils::creatorTheme()->color(Utils::Theme::TextColorError)); m_ui.findEdit->button(Utils::FancyLineEdit::Left)->setFocusPolicy(Qt::TabFocus); m_ui.findEdit->setValidationFunction([this](Utils::FancyLineEdit *, QString *) { return m_lastResult != IFindSupport::NotFound; diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp index 0f7907f99f4..402c29763a1 100644 --- a/src/plugins/git/gerrit/gerritdialog.cpp +++ b/src/plugins/git/gerrit/gerritdialog.cpp @@ -72,8 +72,6 @@ GerritDialog::GerritDialog(const QSharedPointer &p, auto completer = new QCompleter(this); completer->setModel(m_queryModel); m_ui->queryLineEdit->setSpecialCompleter(completer); - m_ui->queryLineEdit->setOkColor(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal)); - m_ui->queryLineEdit->setErrorColor(Utils::creatorTheme()->color(Utils::Theme::TextColorError)); m_ui->queryLineEdit->setValidationFunction([this](Utils::FancyLineEdit *, QString *) { return m_model->state() != GerritModel::Error; });