diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-18 14:41:25 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-20 17:23:35 +0000 |
commit | a2ab56bc3d778c7a5e30f58d0d29116ec6da793a (patch) | |
tree | d18c1bf0630ed90bcf04a98e039bf41d71cea0e8 /src | |
parent | 19eaef1f316067249cdda12a3ffc7462a652a88e (diff) |
Platform: add FontDialog
Change-Id: Icda7f8ad0a4cdaace1a2c33fd42cfd071d547a15
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png | bin | 0 -> 43653 bytes | |||
-rw-r--r-- | src/imports/platform/platform.pri | 2 | ||||
-rw-r--r-- | src/imports/platform/qquickplatformfontdialog.cpp | 160 | ||||
-rw-r--r-- | src/imports/platform/qquickplatformfontdialog_p.h | 89 | ||||
-rw-r--r-- | src/imports/platform/qtlabsplatformplugin.cpp | 2 |
5 files changed, 253 insertions, 0 deletions
diff --git a/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png b/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png Binary files differnew file mode 100644 index 00000000..9f3dc2e7 --- /dev/null +++ b/src/imports/platform/doc/images/qtlabsplatform-fontdialog-gtk.png diff --git a/src/imports/platform/platform.pri b/src/imports/platform/platform.pri index 289b7d4f..40045a5d 100644 --- a/src/imports/platform/platform.pri +++ b/src/imports/platform/platform.pri @@ -1,6 +1,7 @@ HEADERS += \ $$PWD/qquickplatformcolordialog_p.h \ $$PWD/qquickplatformdialog_p.h \ + $$PWD/qquickplatformfontdialog_p.h \ $$PWD/qquickplatformiconloader_p.h \ $$PWD/qquickplatformmenu_p.h \ $$PWD/qquickplatformmenubar_p.h \ @@ -11,6 +12,7 @@ HEADERS += \ SOURCES += \ $$PWD/qquickplatformcolordialog.cpp \ $$PWD/qquickplatformdialog.cpp \ + $$PWD/qquickplatformfontdialog.cpp \ $$PWD/qquickplatformiconloader.cpp \ $$PWD/qquickplatformmenu.cpp \ $$PWD/qquickplatformmenubar.cpp \ diff --git a/src/imports/platform/qquickplatformfontdialog.cpp b/src/imports/platform/qquickplatformfontdialog.cpp new file mode 100644 index 00000000..d0bc3e21 --- /dev/null +++ b/src/imports/platform/qquickplatformfontdialog.cpp @@ -0,0 +1,160 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Platform module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickplatformfontdialog_p.h" + +#include <QtGui/qpa/qplatformtheme.h> +#include <QtGui/private/qguiapplication_p.h> + +QT_BEGIN_NAMESPACE + +/*! + \qmltype FontDialog + \inherits Dialog + \instantiates QQuickPlatformFontDialog + \inqmlmodule Qt.labs.platform + \since 5.8 + \brief A native font dialog. + + The FontDialog type provides a QML API for native platform font dialogs. + + \image qtlabsplatform-fontdialog-gtk.png + + To show a font dialog, construct an instance of FontDialog, set the + desired properties, and call \l {Dialog::}{open()}. FontDialog emits + the \l fontSelected() signal when the user has selected a font. + + \code + MenuItem { + text: "Font" + onTriggered: fontDialog.open() + } + + FontDialog { + id: fontDialog + currentFont.family: "Sans" + onFontSelected: document.font = font + } + \endcode + + FontDialog is currently available on the following platforms: + + \list + \li OS X + \li Linux (when running with the GTK+ platform theme) + \endlist + + \labs +*/ + +/*! + \qmlsignal void Qt.labs.platform::FontDialog::fontSelected(font font) + + This signal is emitted just after the user has clicked \uicontrol OK to select a \a font. + + \sa currentFont +*/ + +QQuickPlatformFontDialog::QQuickPlatformFontDialog(QObject *parent) + : QQuickPlatformDialog(parent), m_options(QFontDialogOptions::create()) +{ + QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::FontDialog); + if (QPlatformFontDialogHelper *fontDialog = qobject_cast<QPlatformFontDialogHelper *>(dialog)) { + connect(fontDialog, &QPlatformFontDialogHelper::currentFontChanged, this, &QQuickPlatformFontDialog::currentFontChanged); + connect(fontDialog, &QPlatformFontDialogHelper::fontSelected, this, &QQuickPlatformFontDialog::fontSelected); + } + setHandle(dialog); +} + +/*! + \qmlproperty font Qt.labs.platform::FontDialog::currentFont + + This property holds the currently selected font in the dialog. + + \sa fontSelected() +*/ +QFont QQuickPlatformFontDialog::currentFont() const +{ + if (QPlatformFontDialogHelper *fontDialog = qobject_cast<QPlatformFontDialogHelper *>(handle())) + return fontDialog->currentFont(); + return QFont(); +} + +void QQuickPlatformFontDialog::setCurrentFont(const QFont &font) +{ + if (QPlatformFontDialogHelper *fontDialog = qobject_cast<QPlatformFontDialogHelper *>(handle())) + fontDialog->setCurrentFont(font); +} + +/*! + \qmlproperty flags Qt.labs.platform::FontDialog::options + + This property holds the various options that affect the look and feel of the dialog. + + By default, all options are disabled. + + Options should be set before showing the dialog. Setting them while the dialog is + visible is not guaranteed to have an immediate effect on the dialog (depending on + the option and on the platform). + + Available options: + \value FontDialog.ScalableFonts Show scalable fonts. + \value FontDialog.NonScalableFonts Show non-scalable fonts. + \value FontDialog.MonospacedFonts Show monospaced fonts. + \value FontDialog.ProportionalFonts Show proportional fonts. + \value FontDialog.NoButtons Don't display \uicontrol OK and \uicontrol Cancel buttons (useful for "live dialogs"). +*/ +QFontDialogOptions::FontDialogOptions QQuickPlatformFontDialog::options() const +{ + return m_options->options(); +} + +void QQuickPlatformFontDialog::setOptions(QFontDialogOptions::FontDialogOptions options) +{ + if (options == m_options->options()) + return; + + m_options->setOptions(options); + emit optionsChanged(); +} + +void QQuickPlatformFontDialog::applyOptions() +{ + if (QPlatformFontDialogHelper *fontDialog = qobject_cast<QPlatformFontDialogHelper *>(handle())) + fontDialog->setOptions(m_options); +} + +QT_END_NAMESPACE diff --git a/src/imports/platform/qquickplatformfontdialog_p.h b/src/imports/platform/qquickplatformfontdialog_p.h new file mode 100644 index 00000000..91f9a31a --- /dev/null +++ b/src/imports/platform/qquickplatformfontdialog_p.h @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Platform module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKPLATFORMFONTDIALOG_P_H +#define QQUICKPLATFORMFONTDIALOG_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qquickplatformdialog_p.h" +#include <QtGui/qfont.h> +#include <QtQml/qqml.h> + +QT_BEGIN_NAMESPACE + +class QQuickPlatformFontDialog : public QQuickPlatformDialog +{ + Q_OBJECT + Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont NOTIFY currentFontChanged FINAL) + Q_PROPERTY(QFontDialogOptions::FontDialogOptions options READ options WRITE setOptions NOTIFY optionsChanged FINAL) + Q_FLAGS(QFontDialogOptions::FontDialogOptions) + +public: + explicit QQuickPlatformFontDialog(QObject *parent = nullptr); + + QFont currentFont() const; + void setCurrentFont(const QFont &font); + + QFontDialogOptions::FontDialogOptions options() const; + void setOptions(QFontDialogOptions::FontDialogOptions options); + +Q_SIGNALS: + void optionsChanged(); + void currentFontChanged(); + void fontSelected(const QFont &font); + +protected: + void applyOptions() override; + +private: + QSharedPointer<QFontDialogOptions> m_options; +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QQuickPlatformFontDialog) + +#endif // QQUICKPLATFORMFONTDIALOG_P_H diff --git a/src/imports/platform/qtlabsplatformplugin.cpp b/src/imports/platform/qtlabsplatformplugin.cpp index d6be08af..9e778856 100644 --- a/src/imports/platform/qtlabsplatformplugin.cpp +++ b/src/imports/platform/qtlabsplatformplugin.cpp @@ -39,6 +39,7 @@ #include "qquickplatformdialog_p.h" #include "qquickplatformcolordialog_p.h" +#include "qquickplatformfontdialog_p.h" #include "qquickplatformmenu_p.h" #include "qquickplatformmenubar_p.h" @@ -75,6 +76,7 @@ void QtLabsPlatformPlugin::registerTypes(const char *uri) { qmlRegisterUncreatableType<QQuickPlatformDialog>(uri, 1, 0, "Dialog", QQuickPlatformDialog::tr("Dialog is an abstract base class")); qmlRegisterType<QQuickPlatformColorDialog>(uri, 1, 0, "ColorDialog"); + qmlRegisterType<QQuickPlatformFontDialog>(uri, 1, 0, "FontDialog"); qmlRegisterType<QQuickPlatformMenu>(uri, 1, 0, "Menu"); qmlRegisterType<QQuickPlatformMenuBar>(uri, 1, 0, "MenuBar"); |