From 127c431e25208e98304a1e9dc1140fdfba078be8 Mon Sep 17 00:00:00 2001 From: Christoph Schleifenbaum Date: Sat, 31 Mar 2012 10:24:52 +0200 Subject: Add Mac OS X backend for QDesktopServices. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie48844ed93385c8aef9ae0765b7a3d26583ed642 Reviewed-by: James Turner Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/cocoa.pro | 2 + src/plugins/platforms/cocoa/qcocoaintegration.h | 3 ++ src/plugins/platforms/cocoa/qcocoaintegration.mm | 6 +++ src/plugins/platforms/cocoa/qcocoaservices.h | 58 ++++++++++++++++++++ src/plugins/platforms/cocoa/qcocoaservices.mm | 69 ++++++++++++++++++++++++ 5 files changed, 138 insertions(+) create mode 100644 src/plugins/platforms/cocoa/qcocoaservices.h create mode 100644 src/plugins/platforms/cocoa/qcocoaservices.mm (limited to 'src') diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 2ae39dd16c..f149a6775b 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -36,6 +36,7 @@ OBJECTIVE_SOURCES += main.mm \ qpaintengine_mac.mm \ qprintengine_mac.mm \ qcocoaprintersupport.mm \ + qcocoaservices.mm \ HEADERS += qcocoaintegration.h \ qcocoatheme.h \ @@ -69,6 +70,7 @@ HEADERS += qcocoaintegration.h \ qpaintengine_mac_p.h \ qprintengine_mac_p.h \ qcocoaprintersupport.h \ + qcocoaservices.h \ FORMS += $$PWD/../../../widgets/dialogs/qfiledialog.ui RESOURCES += qcocoaresources.qrc diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index fb3ee3290e..b3eeab3f7a 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -48,6 +48,7 @@ #include "qcocoacursor.h" #include "qcocoaclipboard.h" #include "qcocoadrag.h" +#include "qcocoaservices.h" #include #include @@ -99,6 +100,7 @@ public: QStringList themeNames() const; QPlatformTheme *createPlatformTheme(const QString &name) const; + QPlatformServices *services() const; private: @@ -111,6 +113,7 @@ private: QList mScreens; QCocoaClipboard *mCocoaClipboard; QScopedPointer mCocoaDrag; + QScopedPointer mServices; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index f91351ad46..0a3790fd72 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -99,6 +99,7 @@ QCocoaIntegration::QCocoaIntegration() , mAccessibility(new QPlatformAccessibility) , mCocoaClipboard(new QCocoaClipboard) , mCocoaDrag(new QCocoaDrag) + , mServices(new QCocoaServices) { QCocoaAutoReleasePool pool; @@ -239,4 +240,9 @@ QPlatformTheme *QCocoaIntegration::createPlatformTheme(const QString &name) cons return QPlatformIntegration::createPlatformTheme(name); } +QPlatformServices *QCocoaIntegration::services() const +{ + return mServices.data(); +} + QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaservices.h b/src/plugins/platforms/cocoa/qcocoaservices.h new file mode 100644 index 0000000000..022c39dc57 --- /dev/null +++ b/src/plugins/platforms/cocoa/qcocoaservices.h @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCOCOADESKTOPSERVICES_H +#define QCOCOADESKTOPSERVICES_H + +#include + +QT_BEGIN_NAMESPACE + +class QCocoaServices : public QPlatformServices +{ +public: + bool openUrl(const QUrl &url); + bool openDocument(const QUrl &url); +}; + +QT_END_NAMESPACE + +#endif // QCOCOADESKTOPSERVICES_H diff --git a/src/plugins/platforms/cocoa/qcocoaservices.mm b/src/plugins/platforms/cocoa/qcocoaservices.mm new file mode 100644 index 0000000000..60bd62eef8 --- /dev/null +++ b/src/plugins/platforms/cocoa/qcocoaservices.mm @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qcocoaservices.h" + +#include "qt_mac_p.h" + +#include +#include + +#include + +QT_BEGIN_NAMESPACE + +bool QCocoaServices::openUrl(const QUrl &url) +{ + const QString scheme = url.scheme(); + if (scheme.isEmpty()) + return openDocument(url); + return [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:QT_PREPEND_NAMESPACE(QCFString::toNSString)(url.toString())]]; +} + +bool QCocoaServices::openDocument(const QUrl &url) +{ + if (!url.isValid()) + return false; + + return [[NSWorkspace sharedWorkspace] openFile:QT_PREPEND_NAMESPACE(QCFString::toNSString)(url.toLocalFile())]; +} + +QT_END_NAMESPACE -- cgit v1.2.3