diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-14 12:06:30 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-14 10:09:26 +0000 |
| commit | 32382540f8c8cc7808b5c75ea098bda19b92034f (patch) | |
| tree | 749a09becabd36e1cd77bd393fe6b16c078a6d8d /src/imports/platform/qquickplatformfiledialog.cpp | |
| parent | 6f5477369d252c0b4a10995830d16e83098c7c8b (diff) | |
File|FolderDialog: fill in and use the initial values in the options
Change-Id: I5805e03327cea6cba8083f636e061b561e87f215
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/platform/qquickplatformfiledialog.cpp')
| -rw-r--r-- | src/imports/platform/qquickplatformfiledialog.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp index 466b33ed..d46a1aac 100644 --- a/src/imports/platform/qquickplatformfiledialog.cpp +++ b/src/imports/platform/qquickplatformfiledialog.cpp @@ -217,15 +217,12 @@ void QQuickPlatformFileDialog::setFiles(const QList<QUrl> &files) */ QUrl QQuickPlatformFileDialog::currentFile() const { - if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle())) - return fileDialog->selectedFiles().value(0); - return QUrl(); + return currentFiles().value(0); } void QQuickPlatformFileDialog::setCurrentFile(const QUrl &file) { - if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle())) - fileDialog->selectFile(file); + setCurrentFiles(QList<QUrl>() << file); } /*! @@ -243,7 +240,7 @@ QList<QUrl> QQuickPlatformFileDialog::currentFiles() const { if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle())) return fileDialog->selectedFiles(); - return QList<QUrl>(); + return m_options->initiallySelectedFiles(); } void QQuickPlatformFileDialog::setCurrentFiles(const QList<QUrl> &files) @@ -252,6 +249,7 @@ void QQuickPlatformFileDialog::setCurrentFiles(const QList<QUrl> &files) for (const QUrl &file : files) fileDialog->selectFile(file); } + m_options->setInitiallySelectedFiles(files); } /*! @@ -266,7 +264,7 @@ QUrl QQuickPlatformFileDialog::folder() const { if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle())) return fileDialog->directory(); - return QUrl(); + return m_options->initialDirectory(); } void QQuickPlatformFileDialog::setFolder(const QUrl &folder) |