Add FontDialog to QtQuick.Dialogs

Adding non-native FontDialog to QtQuick.
This is a native FontDialog on platforms
that support it, and a non-native
Qt Quick FontDialog on platforms that don't.

Fixes: QTBUG-87799
Change-Id: I43a59e3668a8a40f1d0c04a3c2506283d552a22b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4 files changed, 226 insertions, 1 deletions

diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/dialogs/CMakeLists.txt
index d99d64b9..cc132f36 100644
--- a/tests/manual/dialogs/CMakeLists.txt
+++ b/tests/manual/dialogs/CMakeLists.txt
@@ -18,6 +18,7 @@ qt_internal_add_manual_test(dialogs
 set(qmake_immediate_resource_files
     "dialogs.qml"
     "FileDialogPage.qml"
+    "FontDialogPage.qml"
     "StringListView.qml"
     "qmldir"
     "Theme.qml"
diff --git a/tests/manual/dialogs/FontDialogPage.qml b/tests/manual/dialogs/FontDialogPage.qml
new file mode 100644
index 00000000..5b5d1034
--- /dev/null
+++ b/tests/manual/dialogs/FontDialogPage.qml
@@ -0,0 +1,222 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Dialogs
+import QtQuick.Layouts
+
+import "."
+
+ColumnLayout {
+    property alias dialog: fontDialog
+
+    // Put it all in another ColumnLayout so we can easily add margins.
+    ColumnLayout {
+        Layout.leftMargin: 12
+        Layout.rightMargin: 12
+        Layout.topMargin: 12
+        Layout.bottomMargin: 12
+
+        GroupBox {
+            title: qsTr("Dialog properties")
+
+            Layout.fillWidth: true
+
+            GridLayout {
+                columns: 2
+                anchors.fill: parent
+
+                Label {
+                    text: qsTr("modality")
+
+                    Layout.alignment: Qt.AlignTop
+                    Layout.minimumWidth: ApplicationWindow.window.width * 0.2
+                    Layout.maximumWidth: ApplicationWindow.window.width * 0.2
+                }
+                ButtonGroup {
+                    id: modalityButtonGroup
+                    buttons: modalityColumnLayout.children
+                }
+                ColumnLayout {
+                    id: modalityColumnLayout
+
+                    RadioButton {
+                        text: qsTr("Qt.NonModal")
+
+                        readonly property int modality: Qt.NonModal
+                    }
+                    RadioButton {
+                        text: qsTr("Qt.WindowModal")
+                        checked: true
+
+                        readonly property int modality: Qt.WindowModal
+                    }
+                    RadioButton {
+                        text: qsTr("Qt.ApplicationModal")
+
+                        readonly property int modality: Qt.ApplicationModal
+                    }
+                }
+
+                Label {
+                    text: qsTr("result")
+                }
+                TextField {
+                    id: resultTextField
+                    text: fontDialog.result === 1 ? qsTr("Accepted") : qsTr("Rejected")
+                    readOnly: true
+                    enabled: false
+                }
+
+                Label {
+                    text: qsTr("title")
+                }
+                TextField {
+                    id: titleTextField
+                    text: qsTr("Pick a font")
+                }
+            }
+        }
+
+        GroupBox {
+            title: qsTr("FontDialog properties")
+
+            Layout.fillWidth: true
+
+            GridLayout {
+                columns: 2
+                anchors.fill: parent
+
+                Label {
+                    Layout.minimumWidth: ApplicationWindow.window.width * 0.2
+                    Layout.maximumWidth: ApplicationWindow.window.width * 0.2
+                    text: qsTr("currentFont")
+                }
+                TextField {
+                    id: currentFontTextField
+                    text: qsTr("AaBbYyZz")
+                    font: fontDialog.currentFont
+                    readOnly: true
+                    selectByMouse: true
+
+                    Layout.fillWidth: true
+                }
+
+                Label {
+                    text: qsTr("selectedFont")
+                }
+                TextField {
+                    id: selectedFontTextField
+                    text: qsTr("AaBbYyZz")
+                    font: fontDialog.selectedFont
+                    readOnly: true
+                    selectByMouse: true
+
+                    Layout.fillWidth: true
+                }
+
+                Label {
+                    text: qsTr("fontOptions")
+
+                    Layout.alignment: Qt.AlignTop
+                }
+                ColumnLayout {
+                    id: fontOptionsColumnLayout
+
+                    CheckBox {
+                        id: noButtons
+                        text: qsTr("NoButtons")
+
+                        readonly property int fontOption: checked ? FontDialog.NoButtons : 0
+                    }
+                    CheckBox {
+                        id: scalableFonts
+                        text: qsTr("ScalableFonts")
+
+                        readonly property int fontOption: checked ? FontDialog.ScalableFonts : 0
+                    }
+                    CheckBox {
+                        id: nonScalableFonts
+                        text: qsTr("NonScalableFonts")
+
+                        readonly property int fontOption: checked ? FontDialog.NonScalableFonts : 0
+                    }
+                    CheckBox {
+                        id: monospacedFonts
+                        text: qsTr("MonospacedFonts")
+
+                        readonly property int fontOption: checked ? FontDialog.MonospacedFonts : 0
+                    }
+                    CheckBox {
+                        id: proportionalFonts
+                        text: qsTr("ProportionalFonts")
+
+                        readonly property int fontOption: checked ? FontDialog.ProportionalFonts : 0
+                    }
+                }
+            }
+        }
+
+        FontDialog {
+            id: fontDialog
+
+            modality: modalityButtonGroup.checkedButton.modality
+            title: titleTextField.text
+            options: noButtons.fontOption
+                | scalableFonts.fontOption
+                | nonScalableFonts.fontOption
+                | monospacedFonts.fontOption
+                | proportionalFonts.fontOption
+        }
+    }
+}
diff --git a/tests/manual/dialogs/dialogs.pro b/tests/manual/dialogs/dialogs.pro
index abb31492..7dc1b8fd 100644
--- a/tests/manual/dialogs/dialogs.pro
+++ b/tests/manual/dialogs/dialogs.pro
@@ -6,6 +6,7 @@ SOURCES += dialogs.cpp
 RESOURCES += \
     dialogs.qml \
     FileDialogPage.qml \
+    FontDialogPage.qml \
     StringListView.qml \
     qmldir \
     Theme.qml
diff --git a/tests/manual/dialogs/dialogs.qml b/tests/manual/dialogs/dialogs.qml
index d1f54c08..6e64659e 100644
--- a/tests/manual/dialogs/dialogs.qml
+++ b/tests/manual/dialogs/dialogs.qml
@@ -84,7 +84,7 @@ ApplicationWindow {
                 text: qsTr("FileDialog")
             }
             TabButton {
-                text: qsTr("Coming Soon...")
+                text: qsTr("FontDialog")
             }
         }
 
@@ -99,6 +99,7 @@ ApplicationWindow {
                 width: scrollView.width
 
                 FileDialogPage {}
+                FontDialogPage {}
             }
         }
     }