Quick: Fix file selection modes in the default UI delegate

Our implementation of QML file picker was outdated. Now directory picker
is a separate type of dialog and other file selection modes are set in
FileDialog.fileMode property.

Change-Id: Icc62369539c56666e596e5ee6f1b3068a43acd81
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 35d4b0b1d1c723e32d589b3dfddfe96eaa8e5568)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

7 files changed, 77 insertions, 5 deletions

diff --git a/src/webenginequick/ui/CMakeLists.txt b/src/webenginequick/ui/CMakeLists.txt
index c24d8da8d..f2f281ef5 100644
--- a/src/webenginequick/ui/CMakeLists.txt
+++ b/src/webenginequick/ui/CMakeLists.txt
@@ -4,6 +4,7 @@ set(qml_files
     "AutofillPopup.qml"
     "ColorDialog.qml"
     "ConfirmDialog.qml"
+    "DirectoryPicker.qml"
     "FilePicker.qml"
     "Menu.qml"
     "MenuItem.qml"
diff --git a/src/webenginequick/ui/DirectoryPicker.qml b/src/webenginequick/ui/DirectoryPicker.qml
new file mode 100644
index 000000000..a8a6d47c9
--- /dev/null
+++ b/src/webenginequick/ui/DirectoryPicker.qml
@@ -0,0 +1,15 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+import QtQuick.Dialogs
+
+FolderDialog {
+    id: folderDialog
+    objectName: "folderDialog"
+
+    signal folderSelected(var folder)
+
+    onAccepted: {
+        folderSelected([selectedFolder])
+    }
+}
diff --git a/src/webenginequick/ui_delegates_manager.cpp b/src/webenginequick/ui_delegates_manager.cpp
index 0c6cee763..a075a4c9b 100644
--- a/src/webenginequick/ui_delegates_manager.cpp
+++ b/src/webenginequick/ui_delegates_manager.cpp
@@ -356,6 +356,10 @@ void UIDelegatesManager::showDialog(QSharedPointer<AuthenticationDialogControlle
 
 void UIDelegatesManager::showFilePicker(QSharedPointer<FilePickerController> controller)
 {
+    if (controller->mode() == FilePickerController::UploadFolder) {
+        showDirectoryPicker(controller);
+        return;
+    }
 
     if (!ensureComponentLoaded(FilePicker))
         return;
@@ -367,19 +371,21 @@ void UIDelegatesManager::showFilePicker(QSharedPointer<FilePickerController> con
     filePicker->setParent(m_view);
     filePickerComponent->completeCreate();
 
+    static int fileModeIndex = filePicker->metaObject()->indexOfEnumerator("FileMode");
+    QMetaEnum fileModeEnum = filePicker->metaObject()->enumerator(fileModeIndex);
+
     // Fine-tune some properties depending on the mode.
     switch (controller->mode()) {
     case FilePickerController::Open:
+        filePicker->setProperty("fileMode", fileModeEnum.keyToValue("OpenFile"));
         break;
     case FilePickerController::Save:
-        filePicker->setProperty("selectExisting", false);
+        filePicker->setProperty("fileMode", fileModeEnum.keyToValue("SaveFile"));
         break;
     case FilePickerController::OpenMultiple:
-        filePicker->setProperty("selectMultiple", true);
+        filePicker->setProperty("fileMode", fileModeEnum.keyToValue("OpenFiles"));
         break;
     case FilePickerController::UploadFolder:
-        filePicker->setProperty("selectFolder", true);
-        break;
     default:
         Q_UNREACHABLE();
     }
@@ -403,6 +409,35 @@ void UIDelegatesManager::showFilePicker(QSharedPointer<FilePickerController> con
     QMetaObject::invokeMethod(filePicker, "open");
 }
 
+void UIDelegatesManager::showDirectoryPicker(QSharedPointer<FilePickerController> controller)
+{
+    if (!ensureComponentLoaded(DirectoryPicker))
+        return;
+
+    QQmlContext *context = qmlContext(m_view);
+    QObject *directoryPicker = directoryPickerComponent->beginCreate(context);
+    if (QQuickItem *item = qobject_cast<QQuickItem*>(directoryPicker))
+        item->setParentItem(m_view);
+    directoryPicker->setParent(m_view);
+    directoryPickerComponent->completeCreate();
+
+    QQmlProperty directoryPickedSignal(directoryPicker, QStringLiteral("onFolderSelected"));
+    CHECK_QML_SIGNAL_PROPERTY(directoryPickedSignal, directoryPickerComponent->url());
+    QQmlProperty rejectSignal(directoryPicker, QStringLiteral("onRejected"));
+    CHECK_QML_SIGNAL_PROPERTY(rejectSignal, directoryPickerComponent->url());
+    static int acceptedIndex = controller->metaObject()->indexOfSlot("accepted(QVariant)");
+    QObject::connect(directoryPicker, directoryPickedSignal.method(), controller.data(), controller->metaObject()->method(acceptedIndex));
+    static int rejectedIndex = controller->metaObject()->indexOfSlot("rejected()");
+    QObject::connect(directoryPicker, rejectSignal.method(), controller.data(), controller->metaObject()->method(rejectedIndex));
+
+    // delete when done.
+    static int deleteLaterIndex = directoryPicker->metaObject()->indexOfSlot("deleteLater()");
+    QObject::connect(directoryPicker, directoryPickedSignal.method(), directoryPicker, directoryPicker->metaObject()->method(deleteLaterIndex));
+    QObject::connect(directoryPicker, rejectSignal.method(), directoryPicker, directoryPicker->metaObject()->method(deleteLaterIndex));
+
+    QMetaObject::invokeMethod(directoryPicker, "open");
+}
+
 class TemporaryCursorMove
 {
 public:
diff --git a/src/webenginequick/ui_delegates_manager.h b/src/webenginequick/ui_delegates_manager.h
index 70e5ba00d..24dde656c 100644
--- a/src/webenginequick/ui_delegates_manager.h
+++ b/src/webenginequick/ui_delegates_manager.h
@@ -22,6 +22,7 @@
     F(ConfirmDialog, confirmDialog) SEPARATOR \
     F(PromptDialog, promptDialog) SEPARATOR \
     F(FilePicker, filePicker) SEPARATOR \
+    F(DirectoryPicker, directoryPicker) SEPARATOR \
     F(AuthenticationDialog, authenticationDialog) SEPARATOR \
     F(ToolTip, toolTip) SEPARATOR \
     F(TouchHandle, touchHandle) SEPARATOR \
@@ -80,6 +81,7 @@ public:
     void showDialog(QSharedPointer<JavaScriptDialogController>);
     void showDialog(QSharedPointer<AuthenticationDialogController>);
     void showFilePicker(QSharedPointer<FilePickerController>);
+    void showDirectoryPicker(QSharedPointer<FilePickerController>);
     virtual void showMenu(QObject *menu);
     void showToolTip(const QString &text);
     QQuickItem *createTouchHandle();
diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml
index 2404efd2d..a557369ed 100644
--- a/tests/auto/quick/qmltests/data/tst_filePicker.qml
+++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml
@@ -146,7 +146,7 @@ TestWebEngineView {
             FilePickerParams.selectedFilesUrl.push(Qt.resolvedUrl("../data"))
 
             keyClick(Qt.Key_Enter) // Focus is on the button. Open FileDialog.
-            tryCompare(FilePickerParams, "filePickerOpened", true)
+            tryCompare(FilePickerParams, "directoryPickerOpened", true)
             // Check that the title is a file list (eg. "test1.html,test2.html")
             tryVerify(function() { return webEngineView.title.match("^([^,]+,)+[^,]+$"); })
 
diff --git a/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/DirectoryPicker.qml b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/DirectoryPicker.qml
new file mode 100644
index 000000000..71da28843
--- /dev/null
+++ b/tests/auto/quick/qmltests/mock-delegates/QtWebEngine/ControlsDelegates/DirectoryPicker.qml
@@ -0,0 +1,18 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import "../../TestParams"
+
+QtObject {
+    signal folderSelected(var folder)
+    signal rejected()
+
+    function open() {
+        FilePickerParams.directoryPickerOpened = true;
+        if (FilePickerParams.selectFiles)
+            folderSelected(FilePickerParams.selectedFilesUrl);
+        else
+            rejected();
+    }
+}
diff --git a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
index 4a1ffeb02..67d67dc40 100644
--- a/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
+++ b/tests/auto/quick/qmltests/mock-delegates/TestParams/FilePickerParams.qml
@@ -8,5 +8,6 @@ QtObject {
     property var selectedFilesUrl: [];
     property bool selectFiles: false;
     property bool filePickerOpened: false;
+    property bool directoryPickerOpened: false;
     property var nameFilters: [];
 }