Allow to filter the type of fonts displayed

QFontComboBox had convenient filtering options but somehow not
QFontDialog, so provide the same type of flags and a similar behavior.

Change-Id: Ia8efabc60ae795673c772ff8ed63fd49244a5bb9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>

2 files changed, 16 insertions, 0 deletions

diff --git a/tests/manual/dialogs/fontdialogpanel.cpp b/tests/manual/dialogs/fontdialogpanel.cpp
index 2bdbb0625a..5cc899b7d6 100644
--- a/tests/manual/dialogs/fontdialogpanel.cpp
+++ b/tests/manual/dialogs/fontdialogpanel.cpp
@@ -67,12 +67,20 @@ FontDialogPanel::FontDialogPanel(QWidget *parent)
     , m_fontSizeBox(new QDoubleSpinBox)
     , m_noButtons(new QCheckBox(tr("Don't display OK/Cancel buttons")))
     , m_dontUseNativeDialog(new QCheckBox(tr("Don't use native dialog")))
+    , m_scalableFilter(new QCheckBox(tr("Filter scalable fonts")))
+    , m_nonScalableFilter(new QCheckBox(tr("Filter non scalable fonts")))
+    , m_monospacedFilter(new QCheckBox(tr("Filter monospaced fonts")))
+    , m_proportionalFilter(new QCheckBox(tr("Filter proportional fonts")))
 {
     // Options
     QGroupBox *optionsGroupBox = new QGroupBox(tr("Options"), this);
     QVBoxLayout *optionsLayout = new QVBoxLayout(optionsGroupBox);
     optionsLayout->addWidget(m_noButtons);
     optionsLayout->addWidget(m_dontUseNativeDialog);
+    optionsLayout->addWidget(m_scalableFilter);
+    optionsLayout->addWidget(m_nonScalableFilter);
+    optionsLayout->addWidget(m_monospacedFilter);
+    optionsLayout->addWidget(m_proportionalFilter);
 
     // Font
     QGroupBox *fontGroupBox = new QGroupBox(tr("Font"), this);
@@ -201,6 +209,10 @@ void FontDialogPanel::applySettings(QFontDialog *d) const
 {
     d->setOption(QFontDialog::NoButtons, m_noButtons->isChecked());
     d->setOption(QFontDialog::DontUseNativeDialog, m_dontUseNativeDialog->isChecked());
+    d->setOption(QFontDialog::ScalableFonts, m_scalableFilter->isChecked());
+    d->setOption(QFontDialog::NonScalableFonts, m_nonScalableFilter->isChecked());
+    d->setOption(QFontDialog::MonospacedFonts, m_monospacedFilter->isChecked());
+    d->setOption(QFontDialog::ProportionalFonts, m_proportionalFilter->isChecked());
 
     QFont font = m_fontFamilyBox->currentFont();
     font.setPointSizeF(m_fontSizeBox->value());
diff --git a/tests/manual/dialogs/fontdialogpanel.h b/tests/manual/dialogs/fontdialogpanel.h
index 92f2b7313f..13e9e9f93a 100644
--- a/tests/manual/dialogs/fontdialogpanel.h
+++ b/tests/manual/dialogs/fontdialogpanel.h
@@ -77,6 +77,10 @@ private:
     QDoubleSpinBox *m_fontSizeBox;
     QCheckBox *m_noButtons;
     QCheckBox *m_dontUseNativeDialog;
+    QCheckBox *m_scalableFilter;
+    QCheckBox *m_nonScalableFilter;
+    QCheckBox *m_monospacedFilter;
+    QCheckBox *m_proportionalFilter;
     QPushButton *m_deleteNonModalDialogButton;
     QPushButton *m_deleteModalDialogButton;
     QString m_result;