FileDialog: add missing selectedNameFilter-property

Change-Id: If31d657e29a9cc3049af5cd3cf39d68979ff2db0
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

1 files changed, 24 insertions, 0 deletions

diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp
index 99667262..466b33ed 100644
--- a/src/imports/platform/qquickplatformfiledialog.cpp
+++ b/src/imports/platform/qquickplatformfiledialog.cpp
@@ -324,6 +324,8 @@ void QQuickPlatformFileDialog::resetOptions()
     example, \c Makefile). In a native Windows file dialog, \b{*.*} will match
     such files, while in other types of file dialogs it may not. So it is better
     to use \b{*} if you mean to select any file.
+
+    \sa selectedNameFilter
 */
 QStringList QQuickPlatformFileDialog::nameFilters() const
 {
@@ -345,6 +347,27 @@ void QQuickPlatformFileDialog::resetNameFilters()
 }
 
 /*!
+    \qmlproperty string Qt.labs.platform::FileDialog::selectedNameFilter
+
+    This property holds the currently selected name filter.
+
+    \sa nameFilters
+*/
+QString QQuickPlatformFileDialog::selectedNameFilter() const
+{
+    if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle()))
+        return fileDialog->selectedNameFilter();
+    return m_options->initiallySelectedNameFilter();
+}
+
+void QQuickPlatformFileDialog::setSelectedNameFilter(const QString &filter)
+{
+    if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle()))
+        fileDialog->selectNameFilter(filter);
+    m_options->setInitiallySelectedNameFilter(filter);
+}
+
+/*!
     \qmlproperty string Qt.labs.platform::FileDialog::defaultSuffix
 
     This property holds a suffix that is added to selected files that have
@@ -449,6 +472,7 @@ QPlatformDialogHelper *QQuickPlatformFileDialog::createHelper()
         connect(fileDialog, &QPlatformFileDialogHelper::currentChanged, this, &QQuickPlatformFileDialog::currentFileChanged);
         connect(fileDialog, &QPlatformFileDialogHelper::currentChanged, this, &QQuickPlatformFileDialog::currentFilesChanged);
         connect(fileDialog, &QPlatformFileDialogHelper::directoryEntered, this, &QQuickPlatformFileDialog::folderChanged);
+        connect(fileDialog, &QPlatformFileDialogHelper::filterSelected, this, &QQuickPlatformFileDialog::selectedNameFilterChanged);
         fileDialog->setOptions(m_options);
     }
     return dialog;