Preferences: Add default implementation for filtering

The default "matches" method now takes the widget and looks for all
child labels, checkboxes, push buttons and group boxes.
Because of that, the former "createWidget" method
can be called multiple times without creating a new widget
(-->widget()), and the "finished" method must ensure that the created
widget gets deleted, since not all widgets that were created are added
to the UI anymore.

Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

1 files changed, 48 insertions, 62 deletions

diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 834879c172..40cb62ec3b 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -102,76 +102,61 @@ void GeneralSettings::fillLanguageBox() const
     }
 }
 
-QWidget *GeneralSettings::createPage(QWidget *parent)
+QWidget *GeneralSettings::widget()
 {
-    m_page = new Ui::GeneralSettings();
-    m_widget = new QWidget(parent);
-    m_page->setupUi(m_widget);
-
-    fillLanguageBox();
-
-    m_page->colorButton->setColor(StyleHelper::requestedBaseColor());
-    m_page->reloadBehavior->setCurrentIndex(EditorManager::reloadSetting());
-    if (HostOsInfo::isAnyUnixHost()) {
-        QSettings *settings = Core::ICore::settings();
-        const QStringList availableTerminals = ConsoleProcess::availableTerminalEmulators();
-        const QString currentTerminal = ConsoleProcess::terminalEmulator(settings, false);
-        m_page->terminalComboBox->addItems(availableTerminals);
-        m_page->terminalComboBox->lineEdit()->setText(currentTerminal);
-        m_page->terminalComboBox->lineEdit()->setPlaceholderText(ConsoleProcess::defaultTerminalEmulator());
-    } else {
-        m_page->terminalLabel->hide();
-        m_page->terminalComboBox->hide();
-        m_page->resetTerminalButton->hide();
-    }
-
-    if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost()) {
-        QSettings *settings = Core::ICore::settings();
-        m_page->externalFileBrowserEdit->setText(UnixUtils::fileBrowser(settings));
-    } else {
-        m_page->externalFileBrowserLabel->hide();
-        m_page->externalFileBrowserEdit->hide();
-        m_page->resetFileBrowserButton->hide();
-        m_page->helpExternalFileBrowserButton->hide();
-    }
-
-    m_page->autoSaveCheckBox->setChecked(EditorManager::autoSaveEnabled());
-    m_page->autoSaveInterval->setValue(EditorManager::autoSaveInterval());
-    m_page->resetWarningsButton->setEnabled(Core::InfoBar::anyGloballySuppressed()
-                                            || Utils::CheckableMessageBox::hasSuppressedQuestions(ICore::settings()));
+    if (!m_widget) {
+        m_page = new Ui::GeneralSettings();
+        m_widget = new QWidget;
+        m_page->setupUi(m_widget);
+
+        fillLanguageBox();
+
+        m_page->colorButton->setColor(StyleHelper::requestedBaseColor());
+        m_page->reloadBehavior->setCurrentIndex(EditorManager::reloadSetting());
+        if (HostOsInfo::isAnyUnixHost()) {
+            QSettings *settings = Core::ICore::settings();
+            const QStringList availableTerminals = ConsoleProcess::availableTerminalEmulators();
+            const QString currentTerminal = ConsoleProcess::terminalEmulator(settings, false);
+            m_page->terminalComboBox->addItems(availableTerminals);
+            m_page->terminalComboBox->lineEdit()->setText(currentTerminal);
+            m_page->terminalComboBox->lineEdit()->setPlaceholderText(ConsoleProcess::defaultTerminalEmulator());
+        } else {
+            m_page->terminalLabel->hide();
+            m_page->terminalComboBox->hide();
+            m_page->resetTerminalButton->hide();
+        }
 
-    connect(m_page->resetColorButton, SIGNAL(clicked()),
-            this, SLOT(resetInterfaceColor()));
-    connect(m_page->resetWarningsButton, SIGNAL(clicked()),
-            this, SLOT(resetWarnings()));
-    if (HostOsInfo::isAnyUnixHost()) {
-        connect(m_page->resetTerminalButton, SIGNAL(clicked()), this, SLOT(resetTerminal()));
-        if (!HostOsInfo::isMacHost()) {
-            connect(m_page->resetFileBrowserButton, SIGNAL(clicked()), this, SLOT(resetFileBrowser()));
-            connect(m_page->helpExternalFileBrowserButton, SIGNAL(clicked()),
-                    this, SLOT(showHelpForFileBrowser()));
+        if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost()) {
+            QSettings *settings = Core::ICore::settings();
+            m_page->externalFileBrowserEdit->setText(UnixUtils::fileBrowser(settings));
+        } else {
+            m_page->externalFileBrowserLabel->hide();
+            m_page->externalFileBrowserEdit->hide();
+            m_page->resetFileBrowserButton->hide();
+            m_page->helpExternalFileBrowserButton->hide();
         }
-    }
 
-    if (m_searchKeywords.isEmpty()) {
-        QLatin1Char sep(' ');
-        QTextStream(&m_searchKeywords)
-                << m_page->interfaceBox->title() << sep
-                << m_page->colorLabel->text() << sep
-                << m_page->languageLabel->text() << sep
-                << m_page->systemBox->title() << sep
-                << m_page->terminalLabel->text() << sep
-                << m_page->modifiedLabel->text();
-        m_searchKeywords.remove(QLatin1Char('&'));
+        m_page->autoSaveCheckBox->setChecked(EditorManager::autoSaveEnabled());
+        m_page->autoSaveInterval->setValue(EditorManager::autoSaveInterval());
+        m_page->resetWarningsButton->setEnabled(Core::InfoBar::anyGloballySuppressed()
+                                                || Utils::CheckableMessageBox::hasSuppressedQuestions(ICore::settings()));
+
+        connect(m_page->resetColorButton, SIGNAL(clicked()),
+                this, SLOT(resetInterfaceColor()));
+        connect(m_page->resetWarningsButton, SIGNAL(clicked()),
+                this, SLOT(resetWarnings()));
+        if (HostOsInfo::isAnyUnixHost()) {
+            connect(m_page->resetTerminalButton, SIGNAL(clicked()), this, SLOT(resetTerminal()));
+            if (!HostOsInfo::isMacHost()) {
+                connect(m_page->resetFileBrowserButton, SIGNAL(clicked()), this, SLOT(resetFileBrowser()));
+                connect(m_page->helpExternalFileBrowserButton, SIGNAL(clicked()),
+                        this, SLOT(showHelpForFileBrowser()));
+            }
+        }
     }
     return m_widget;
 }
 
-bool GeneralSettings::matches(const QString &s) const
-{
-    return m_searchKeywords.contains(s, Qt::CaseInsensitive);
-}
-
 void GeneralSettings::apply()
 {
     if (!m_page) // wasn't shown, can't be changed
@@ -195,6 +180,7 @@ void GeneralSettings::apply()
 
 void GeneralSettings::finish()
 {
+    delete m_widget;
     if (!m_page) // page was never shown
         return;
     delete m_page;