Options dialog: Further polishing.

Task-number: QTCREATOR-26

1 files changed, 18 insertions, 0 deletions

diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index a8320a87ccb..86e55461ed3 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -44,6 +44,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDate>
 #include <QtCore/QLocale>
+#include <QtCore/QTextStream>
 
 #include <QtGui/QFileDialog>
 #include <QtGui/QMessageBox>
@@ -237,6 +238,16 @@ CppFileSettings CppFileSettingsWidget::settings() const
     return rc;
 }
 
+QString CppFileSettingsWidget::searchKeywords() const
+{
+    QString rc;
+    QTextStream(&rc) << m_ui->headerSuffixLabel->text()
+            << ' ' << m_ui->sourceSuffixLabel->text()
+            << ' ' << m_ui->lowerCaseFileNamesCheckBox->text();
+    rc.remove(QLatin1Char('&'));
+    return rc;
+}
+
 static inline void setComboText(QComboBox *cb, const QString &text, int defaultIndex = 0)
 {
     const int index = cb->findText(text);
@@ -312,6 +323,8 @@ QWidget *CppFileSettingsPage::createPage(QWidget *parent)
 
     m_widget = new CppFileSettingsWidget(parent);
     m_widget->setSettings(*m_settings);
+    if (m_searchKeywords.isEmpty())
+        m_searchKeywords = m_widget->searchKeywords();
     return m_widget;
 }
 
@@ -327,6 +340,11 @@ void CppFileSettingsPage::apply()
     }
 }
 
+bool CppFileSettingsPage::matches(const QString &s) const
+{
+    return m_searchKeywords.contains(s, Qt::CaseInsensitive);
+}
+
 }
 }