From b8d5482e9c4a77b40d4554a7aac8bacabd3bf3d9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 7 Dec 2021 17:19:47 +0100 Subject: [PATCH] ClangTools: Make settings UI more consistent - Do not show filter edit when using config file. - Use more helpful placeholder text in the filter edit. Fixes: QTCREATORBUG-26489 Change-Id: I6c12ced505e0c9b7c048ad5521531c5d46ea4cb1 Reviewed-by: Reviewed-by: David Schulz --- src/plugins/clangtools/diagnosticconfigswidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp index 8d51688a1bd..c90e1e07883 100644 --- a/src/plugins/clangtools/diagnosticconfigswidget.cpp +++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp @@ -836,7 +836,7 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c #endif setupTreeView(m_clazyChecks->checksView, m_clazySortFilterProxyModel, 2); m_clazyChecks->filterLineEdit->setFiltering(true); - m_clazyChecks->filterLineEdit->setPlaceholderText(tr("Textual Filter")); + m_clazyChecks->filterLineEdit->setPlaceholderText(tr("Filter by name")); connect(m_clazyChecks->filterLineEdit, &Utils::FancyLineEdit::filterChanged, m_clazySortFilterProxyModel, qOverload(&QSortFilterProxyModel::setFilterRegularExpression)); @@ -889,6 +889,7 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c tidyFilterModel->setSourceModel(m_tidyTreeModel.get()); setupTreeView(m_tidyChecks->checksPrefixesTree, tidyFilterModel); m_tidyChecks->filterLineEdit->setFiltering(true); + m_tidyChecks->filterLineEdit->setPlaceholderText(tr("Filter by name")); connect(m_tidyChecks->filterLineEdit, &Utils::FancyLineEdit::filterChanged, tidyFilterModel, qOverload(&QSortFilterProxyModel::setFilterRegularExpression)); @@ -977,6 +978,7 @@ void DiagnosticConfigsWidget::syncClangTidyWidgets(const ClangDiagnosticConfig & case ClangDiagnosticConfig::TidyMode::UseConfigFile: m_tidyChecks->tidyMode->setCurrentIndex(1); m_tidyChecks->plainTextEditButton->setVisible(false); + m_tidyChecks->filterLineEdit->setVisible(false); m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::EmptyPage); break; case ClangDiagnosticConfig::TidyMode::UseCustomChecks: @@ -984,9 +986,11 @@ void DiagnosticConfigsWidget::syncClangTidyWidgets(const ClangDiagnosticConfig & m_tidyChecks->tidyMode->setCurrentIndex(0); if (m_tidyInfo.supportedChecks.isEmpty()) { m_tidyChecks->plainTextEditButton->setVisible(false); + m_tidyChecks->filterLineEdit->setVisible(false); m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::InvalidExecutablePage); } else { m_tidyChecks->plainTextEditButton->setVisible(true); + m_tidyChecks->filterLineEdit->setVisible(true); m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::ChecksPage); syncTidyChecksToTree(config); }