diff options
Diffstat (limited to 'src/plugins/platforms/ios')
-rw-r--r-- | src/plugins/platforms/ios/ios.pro | 6 | ||||
-rw-r--r-- | src/plugins/platforms/ios/qiosfiledialog.h | 82 | ||||
-rw-r--r-- | src/plugins/platforms/ios/qiosfiledialog.mm | 141 | ||||
-rw-r--r-- | src/plugins/platforms/ios/qiostheme.h | 3 | ||||
-rw-r--r-- | src/plugins/platforms/ios/qiostheme.mm | 22 |
5 files changed, 252 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/ios.pro b/src/plugins/platforms/ios/ios.pro index 2da1c9b41e..bf7849b740 100644 --- a/src/plugins/platforms/ios/ios.pro +++ b/src/plugins/platforms/ios/ios.pro @@ -29,7 +29,8 @@ OBJECTIVE_SOURCES = \ qiosplatformaccessibility.mm \ qiostextresponder.mm \ qiosmenu.mm \ - qiosfileengineassetslibrary.mm + qiosfileengineassetslibrary.mm \ + qiosfiledialog.mm HEADERS = \ qiosintegration.h \ @@ -52,7 +53,8 @@ HEADERS = \ qiostextresponder.h \ qiosmenu.h \ qiosfileenginefactory.h \ - qiosfileengineassetslibrary.h + qiosfileengineassetslibrary.h \ + qiosfiledialog.h OTHER_FILES = \ quiview_textinput.mm \ diff --git a/src/plugins/platforms/ios/qiosfiledialog.h b/src/plugins/platforms/ios/qiosfiledialog.h new file mode 100644 index 0000000000..7442e21422 --- /dev/null +++ b/src/plugins/platforms/ios/qiosfiledialog.h @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QIOSFILEDIALOG_H +#define QIOSFILEDIALOG_H + +#include <QtCore/qeventloop.h> +#include <qpa/qplatformdialoghelper.h> + +QT_BEGIN_NAMESPACE + +Q_FORWARD_DECLARE_OBJC_CLASS(UIViewController); + +class QIOSFileDialog : public QPlatformFileDialogHelper +{ +public: + QIOSFileDialog(); + ~QIOSFileDialog(); + + void exec() Q_DECL_OVERRIDE; + bool defaultNameFilterDisables() const Q_DECL_OVERRIDE { return false; } + bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) Q_DECL_OVERRIDE; + void hide() Q_DECL_OVERRIDE; + void setDirectory(const QUrl &) Q_DECL_OVERRIDE {} + QUrl directory() const Q_DECL_OVERRIDE { return QUrl(); } + void selectFile(const QUrl &) Q_DECL_OVERRIDE {} + QList<QUrl> selectedFiles() const Q_DECL_OVERRIDE; + void setFilter() Q_DECL_OVERRIDE {} + void selectNameFilter(const QString &) Q_DECL_OVERRIDE {} + QString selectedNameFilter() const Q_DECL_OVERRIDE { return QString(); } + + void selectedFilesChanged(QList<QUrl> selection); + +private: + QUrl m_directory; + QList<QUrl> m_selection; + QEventLoop m_eventLoop; + UIViewController *m_viewController; +}; + +QT_END_NAMESPACE + +#endif // QIOSFILEDIALOG_H + diff --git a/src/plugins/platforms/ios/qiosfiledialog.mm b/src/plugins/platforms/ios/qiosfiledialog.mm new file mode 100644 index 0000000000..b844f7d0c0 --- /dev/null +++ b/src/plugins/platforms/ios/qiosfiledialog.mm @@ -0,0 +1,141 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qiosfiledialog.h" + +#import <UIKit/UIKit.h> + +#include <QtCore/qstandardpaths.h> +#include <QtGui/qwindow.h> + +@interface QIOSImagePickerController : UIImagePickerController <UIImagePickerControllerDelegate, UINavigationControllerDelegate> { + QIOSFileDialog *m_fileDialog; +} +@end + +@implementation QIOSImagePickerController + +- (id)initWithQIOSFileDialog:(QIOSFileDialog *)fileDialog +{ + self = [super init]; + if (self) { + m_fileDialog = fileDialog; + [self setSourceType:UIImagePickerControllerSourceTypePhotoLibrary]; + [self setDelegate:self]; + } + return self; +} + +- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info +{ + Q_UNUSED(picker); + NSURL *url = [info objectForKey:UIImagePickerControllerReferenceURL]; + m_fileDialog->selectedFilesChanged(QList<QUrl>() << QUrl::fromNSURL(url)); + emit m_fileDialog->accept(); +} + +- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker +{ + Q_UNUSED(picker) + emit m_fileDialog->reject(); +} + +@end + +// -------------------------------------------------------------------------- + +QIOSFileDialog::QIOSFileDialog() + : m_viewController(0) +{ +} + +QIOSFileDialog::~QIOSFileDialog() +{ + [m_viewController release]; +} + +void QIOSFileDialog::exec() +{ + m_eventLoop.exec(QEventLoop::DialogExec); +} + +bool QIOSFileDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) +{ + Q_UNUSED(windowFlags); + Q_UNUSED(windowModality); + + if (options()->initialDirectory().scheme() == QLatin1String("assets-library")) { + m_viewController = [[QIOSImagePickerController alloc] initWithQIOSFileDialog:this]; + UIWindow *window = parent ? reinterpret_cast<UIView *>(parent->winId()).window + : [UIApplication sharedApplication].keyWindow; + [window.rootViewController presentViewController:m_viewController animated:YES completion:nil]; + return true; + } + + return false; +} + +void QIOSFileDialog::hide() +{ + // QFileDialog will remember the last directory set, and open subsequent dialogs in the same + // directory for convenience. This works for normal file dialogs, but not when using native + // pickers. Those can only be used for picking specific types, without support for normal file + // system navigation. To avoid showing a native picker by accident, we change directory back + // before we return. More could have been done to preserve the "last directory" logic here, but + // navigating the file system on iOS is not recommended in the first place, so we keep it simple. + emit directoryEntered(QUrl::fromLocalFile(QDir::currentPath())); + + [m_viewController dismissViewControllerAnimated:YES completion:nil]; + m_eventLoop.exit(); +} + +QList<QUrl> QIOSFileDialog::selectedFiles() const +{ + return m_selection; +} + +void QIOSFileDialog::selectedFilesChanged(QList<QUrl> selection) +{ + m_selection = selection; + emit filesSelected(m_selection); + if (m_selection.count() == 1) + emit fileSelected(m_selection[0]); +} diff --git a/src/plugins/platforms/ios/qiostheme.h b/src/plugins/platforms/ios/qiostheme.h index 99047bfb1a..9ef179b4dc 100644 --- a/src/plugins/platforms/ios/qiostheme.h +++ b/src/plugins/platforms/ios/qiostheme.h @@ -52,6 +52,9 @@ public: QPlatformMenuItem* createPlatformMenuItem() const Q_DECL_OVERRIDE; QPlatformMenu* createPlatformMenu() const Q_DECL_OVERRIDE; + bool usePlatformNativeDialog(DialogType type) const Q_DECL_OVERRIDE; + QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const Q_DECL_OVERRIDE; + const QFont *font(Font type = SystemFont) const; static const char *name; diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm index 6842cb3faa..29cd897b71 100644 --- a/src/plugins/platforms/ios/qiostheme.mm +++ b/src/plugins/platforms/ios/qiostheme.mm @@ -46,6 +46,7 @@ #include <UIKit/UIInterface.h> #include "qiosmenu.h" +#include "qiosfiledialog.h" QT_BEGIN_NAMESPACE @@ -80,6 +81,27 @@ QPlatformMenu* QIOSTheme::createPlatformMenu() const return new QIOSMenu(); } +bool QIOSTheme::usePlatformNativeDialog(QPlatformTheme::DialogType type) const +{ + switch (type) { + case FileDialog: + return true; + default: + return false; + } +} + +QPlatformDialogHelper *QIOSTheme::createPlatformDialogHelper(QPlatformTheme::DialogType type) const +{ + switch (type) { + case FileDialog: + return new QIOSFileDialog(); + break; + default: + return 0; + } +} + QVariant QIOSTheme::themeHint(ThemeHint hint) const { switch (hint) { |