feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangTools: Make settings UI more consistent

Browse Source 
- 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: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-12-07 17:19:47 +01:00
parent 1717e0b702
commit b8d5482e9c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangtools/diagnosticconfigswidget.cpp
View File

@@ -836,7 +836,7 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c
#endif #endif
setupTreeView(m_clazyChecks->checksView, m_clazySortFilterProxyModel, 2); setupTreeView(m_clazyChecks->checksView, m_clazySortFilterProxyModel, 2);
m_clazyChecks->filterLineEdit->setFiltering(true); 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, connect(m_clazyChecks->filterLineEdit, &Utils::FancyLineEdit::filterChanged,
m_clazySortFilterProxyModel, m_clazySortFilterProxyModel,
qOverload<const QString &>(&QSortFilterProxyModel::setFilterRegularExpression)); qOverload<const QString &>(&QSortFilterProxyModel::setFilterRegularExpression));
@@ -889,6 +889,7 @@ DiagnosticConfigsWidget::DiagnosticConfigsWidget(const ClangDiagnosticConfigs &c
tidyFilterModel->setSourceModel(m_tidyTreeModel.get()); tidyFilterModel->setSourceModel(m_tidyTreeModel.get());
setupTreeView(m_tidyChecks->checksPrefixesTree, tidyFilterModel); setupTreeView(m_tidyChecks->checksPrefixesTree, tidyFilterModel);
m_tidyChecks->filterLineEdit->setFiltering(true); m_tidyChecks->filterLineEdit->setFiltering(true);
m_tidyChecks->filterLineEdit->setPlaceholderText(tr("Filter by name"));
connect(m_tidyChecks->filterLineEdit, &Utils::FancyLineEdit::filterChanged, tidyFilterModel, connect(m_tidyChecks->filterLineEdit, &Utils::FancyLineEdit::filterChanged, tidyFilterModel,
qOverload<const QString &>(&QSortFilterProxyModel::setFilterRegularExpression)); qOverload<const QString &>(&QSortFilterProxyModel::setFilterRegularExpression));
@@ -977,6 +978,7 @@ void DiagnosticConfigsWidget::syncClangTidyWidgets(const ClangDiagnosticConfig &
case ClangDiagnosticConfig::TidyMode::UseConfigFile: case ClangDiagnosticConfig::TidyMode::UseConfigFile:
m_tidyChecks->tidyMode->setCurrentIndex(1); m_tidyChecks->tidyMode->setCurrentIndex(1);
m_tidyChecks->plainTextEditButton->setVisible(false); m_tidyChecks->plainTextEditButton->setVisible(false);
m_tidyChecks->filterLineEdit->setVisible(false);
m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::EmptyPage); m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::EmptyPage);
break; break;
case ClangDiagnosticConfig::TidyMode::UseCustomChecks: case ClangDiagnosticConfig::TidyMode::UseCustomChecks:
@@ -984,9 +986,11 @@ void DiagnosticConfigsWidget::syncClangTidyWidgets(const ClangDiagnosticConfig &
m_tidyChecks->tidyMode->setCurrentIndex(0); m_tidyChecks->tidyMode->setCurrentIndex(0);
if (m_tidyInfo.supportedChecks.isEmpty()) { if (m_tidyInfo.supportedChecks.isEmpty()) {
m_tidyChecks->plainTextEditButton->setVisible(false); m_tidyChecks->plainTextEditButton->setVisible(false);
m_tidyChecks->filterLineEdit->setVisible(false);
m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::InvalidExecutablePage); m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::InvalidExecutablePage);
} else { } else {
m_tidyChecks->plainTextEditButton->setVisible(true); m_tidyChecks->plainTextEditButton->setVisible(true);
m_tidyChecks->filterLineEdit->setVisible(true);
m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::ChecksPage); m_tidyChecks->stackedWidget->setCurrentIndex(TidyPages::ChecksPage);
syncTidyChecksToTree(config); syncTidyChecksToTree(config);
} }