diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-07-22 12:06:39 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-22 16:45:01 +0200 |
| commit | 6499098a04c7a8a1193413500cd562f781df38bb (patch) | |
| tree | 6fdcfe6c6b94a3aef7b664226b4ae6dbddcdeea1 /src/imports | |
| parent | 17ded06804576dfde1b19f82f168f7ceb09ec92c (diff) | |
QtQuick.Dialogs: use URLs for interface with QPlatformFileDialogHelper
Depends on f5dbc876378ae58a7bdfe1e9664fc81caca18dfb and
5069e203d7aff7fb49bf746071f66bfd41c1ae89
Reverts commits 17ded06804576dfde1b19f82f168f7ceb09ec92c and
and d9751bc29d2f80b86eb237226ce832bf2e372f1d
Change-Id: Ibe2347f3b57e4e569bc4966735e9623dfd274628
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/dialogs/qquickabstractfiledialog.cpp | 15 | ||||
| -rw-r--r-- | src/imports/imports.pro | 3 | ||||
| -rw-r--r-- | src/imports/widgets/qquickqfiledialog.cpp | 17 |
3 files changed, 13 insertions, 22 deletions
diff --git a/src/imports/dialogs/qquickabstractfiledialog.cpp b/src/imports/dialogs/qquickabstractfiledialog.cpp index ec5a7f6926..e415ebc7e4 100644 --- a/src/imports/dialogs/qquickabstractfiledialog.cpp +++ b/src/imports/dialogs/qquickabstractfiledialog.cpp @@ -108,12 +108,9 @@ void QQuickAbstractFileDialog::setSelectFolder(bool selectFolder) QUrl QQuickAbstractFileDialog::folder() { - return QUrl(); - /* TODO after dialog helper switches to URLs if (m_dlgHelper && !m_dlgHelper->directory().isEmpty()) - return QUrl::fromLocalFile(m_dlgHelper->directory()); - return QUrl::fromLocalFile(m_options->initialDirectory()); - */ + return m_dlgHelper->directory(); + return m_options->initialDirectory(); } void QQuickAbstractFileDialog::setFolder(const QUrl &f) @@ -162,13 +159,7 @@ QUrl QQuickAbstractFileDialog::fileUrl() QList<QUrl> QQuickAbstractFileDialog::fileUrls() { - QList<QUrl> ret; - /* TODO after dialog helper switches to URLs - if (m_dlgHelper) - foreach (QString path, m_dlgHelper->selectedFiles()) - ret << QUrl::fromLocalFile(path); - */ - return ret; + return m_dlgHelper->selectedFiles(); } void QQuickAbstractFileDialog::updateModes() diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 6fbe8a51b8..7a922a832e 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -10,8 +10,7 @@ qtHaveModule(quick) { qtquick2 \ particles \ window \ -# disabled to allow file dialog changes to use urls internally (qtbase) -# dialogs \ + dialogs \ testlib } diff --git a/src/imports/widgets/qquickqfiledialog.cpp b/src/imports/widgets/qquickqfiledialog.cpp index 6aab2adbb9..7446887eb8 100644 --- a/src/imports/widgets/qquickqfiledialog.cpp +++ b/src/imports/widgets/qquickqfiledialog.cpp @@ -66,12 +66,10 @@ public: } virtual bool defaultNameFilterDisables() const { return true; } - virtual void setDirectory(const QString &dir) { m_dialog.setDirectory(dir); } - virtual void selectFile(const QString &f) { m_dialog.selectFile(f); } - /* TODO after dialog helper switches to URLs - virtual QString directory() const { return m_dialog.directory().absolutePath(); } - virtual QStringList selectedFiles() const { return m_dialog.selectedFiles(); } - */ + virtual void setDirectory(const QUrl &dir) { m_dialog.setDirectoryUrl(dir); } + virtual QUrl directory() const { return m_dialog.directoryUrl(); } + virtual void selectFile(const QUrl &f) { m_dialog.selectUrl(f); } + virtual QList<QUrl> selectedFiles() const; virtual void setFilter() { m_dialog.setWindowTitle(QPlatformFileDialogHelper::options()->windowTitle()); @@ -190,7 +188,6 @@ QPlatformFileDialogHelper *QQuickQFileDialog::helper() if (parentItem) m_parentWindow = parentItem->window(); - /* TODO after dialog helper switches to URLs if (!m_dlgHelper) { m_dlgHelper = new QFileDialogHelper(); connect(m_dlgHelper, SIGNAL(directoryEntered(QString)), this, SIGNAL(folderChanged())); @@ -198,9 +195,13 @@ QPlatformFileDialogHelper *QQuickQFileDialog::helper() connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept())); connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject())); } - */ return m_dlgHelper; } +QList<QUrl> QFileDialogHelper::selectedFiles() const +{ + return m_dialog.selectedUrls(); +} + QT_END_NAMESPACE |