diff options
Diffstat (limited to 'src/imports/widgets')
-rw-r--r-- | src/imports/widgets/qquickqfontdialog.cpp | 178 | ||||
-rw-r--r-- | src/imports/widgets/qquickqfontdialog_p.h | 78 | ||||
-rw-r--r-- | src/imports/widgets/widgets.pro | 6 | ||||
-rw-r--r-- | src/imports/widgets/widgetsplugin.cpp | 2 |
4 files changed, 263 insertions, 1 deletions
diff --git a/src/imports/widgets/qquickqfontdialog.cpp b/src/imports/widgets/qquickqfontdialog.cpp new file mode 100644 index 0000000000..6d637e1ddb --- /dev/null +++ b/src/imports/widgets/qquickqfontdialog.cpp @@ -0,0 +1,178 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtQuick.Dialogs module 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 "qquickqfontdialog_p.h" +#include "qquickitem.h" + +#include <private/qguiapplication_p.h> +#include <private/qqmlcontext_p.h> +#include <QWindow> +#include <QQuickWindow> +#include <QFontDialog> + +QT_BEGIN_NAMESPACE + +class QFontDialogHelper : public QPlatformFontDialogHelper +{ +public: + QFontDialogHelper() : + QPlatformFontDialogHelper() + { + connect(&m_dialog, SIGNAL(currentFontChanged(const QFont &)), this, SIGNAL(currentFontChanged(const QFont &))); + connect(&m_dialog, SIGNAL(fontSelected(const QFont &)), this, SIGNAL(fontSelected(const QFont &))); + connect(&m_dialog, SIGNAL(accepted()), this, SIGNAL(accept())); + connect(&m_dialog, SIGNAL(rejected()), this, SIGNAL(reject())); + } + + virtual void setCurrentFont(const QFont &font) { m_dialog.setCurrentFont(font); } + virtual QFont currentFont() const { return m_dialog.currentFont(); } + + virtual void exec() { m_dialog.exec(); } + + virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) { + m_dialog.winId(); + QWindow *window = m_dialog.windowHandle(); + Q_ASSERT(window); + window->setTransientParent(parent); + window->setFlags(f); + m_dialog.windowHandle()->setTransientParent(parent); + m_dialog.windowHandle()->setFlags(f); + m_dialog.setWindowModality(m); + m_dialog.setWindowTitle(QPlatformFontDialogHelper::options()->windowTitle()); + m_dialog.setOptions((QFontDialog::FontDialogOptions)((int)(QPlatformFontDialogHelper::options()->options()))); + m_dialog.show(); + return m_dialog.isVisible(); + } + + virtual void hide() { m_dialog.hide(); } + +private: + QFontDialog m_dialog; +}; + +/*! + \qmltype QtFontDialog + \instantiates QQuickQFontDialog + \inqmlmodule QtQuick.PrivateWidgets 1 + \ingroup qtquick-visual + \brief Dialog component for choosing files from a local filesystem. + \since 5.2 + \internal + + QtFontDialog provides a means to instantiate and manage a QFontDialog. + It is not recommended to be used directly; it is an implementation + detail of \l FontDialog in the \l QtQuick.Dialogs module. + + To use this type, you will need to import the module with the following line: + \code + import QtQuick.PrivateWidgets 1.1 + \endcode +*/ + +/*! + \qmlsignal QtQuick::Dialogs::FontDialog::accepted + + The \a accepted signal is emitted when the user has finished using the + dialog. You can then inspect the \a filePath or \a filePaths properties to + get the selection. + + Example: + + \qml + FontDialog { + onAccepted: { console.log("Selected file: " + filePath) } + } + \endqml +*/ + +/*! + \qmlsignal QtQuick::Dialogs::FontDialog::rejected + + The \a rejected signal is emitted when the user has dismissed the dialog, + either by closing the dialog window or by pressing the Cancel button. +*/ + +/*! + \class QQuickQFontDialog + \inmodule QtQuick.PrivateWidgets + \internal + + \brief The QQuickQFontDialog class is a wrapper for a QFontDialog. + + \since 5.2 +*/ + +/*! + Constructs a file dialog with parent window \a parent. +*/ +QQuickQFontDialog::QQuickQFontDialog(QObject *parent) + : QQuickAbstractFontDialog(parent) +{ +} + +/*! + Destroys the file dialog. +*/ +QQuickQFontDialog::~QQuickQFontDialog() +{ + if (m_dlgHelper) + m_dlgHelper->hide(); + delete m_dlgHelper; +} + +QPlatformFontDialogHelper *QQuickQFontDialog::helper() +{ + QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent()); + if (parentItem) + m_parentWindow = parentItem->window(); + + if (!m_dlgHelper) { + m_dlgHelper = new QFontDialogHelper(); + connect(m_dlgHelper, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(setFont(const QFont &))); + connect(m_dlgHelper, SIGNAL(fontSelected(const QFont &)), this, SLOT(setFont(const QFont &))); + connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept())); + connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject())); + } + + return m_dlgHelper; +} + +QT_END_NAMESPACE diff --git a/src/imports/widgets/qquickqfontdialog_p.h b/src/imports/widgets/qquickqfontdialog_p.h new file mode 100644 index 0000000000..6efd15995b --- /dev/null +++ b/src/imports/widgets/qquickqfontdialog_p.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtQuick.Dialogs module 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 QQUICKQFONTDIALOG_P_H +#define QQUICKQFONTDIALOG_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 "../dialogs/qquickabstractfontdialog_p.h" + +QT_BEGIN_NAMESPACE + +class QQuickQFontDialog : public QQuickAbstractFontDialog +{ + Q_OBJECT + +public: + QQuickQFontDialog(QObject *parent = 0); + virtual ~QQuickQFontDialog(); + +protected: + QPlatformFontDialogHelper *helper(); + + Q_DISABLE_COPY(QQuickQFontDialog) +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QQuickQFontDialog *) + +#endif // QQUICKQFONTDIALOG_P_H diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro index 7e6a04161a..6d40897781 100644 --- a/src/imports/widgets/widgets.pro +++ b/src/imports/widgets/widgets.pro @@ -1,13 +1,15 @@ CXX_MODULE = qml TARGET = widgetsplugin TARGETPATH = QtQuick/PrivateWidgets -IMPORT_VERSION = 1.0 +IMPORT_VERSION = 1.1 SOURCES += \ qquickqfiledialog.cpp \ ../dialogs/qquickabstractfiledialog.cpp \ qquickqcolordialog.cpp \ ../dialogs/qquickabstractcolordialog.cpp \ + qquickqfontdialog.cpp \ + ../dialogs/qquickabstractfontdialog.cpp \ ../dialogs/qquickabstractdialog.cpp \ widgetsplugin.cpp @@ -16,6 +18,8 @@ HEADERS += \ ../dialogs/qquickabstractfiledialog_p.h \ qquickqcolordialog_p.h \ ../dialogs/qquickabstractcolordialog_p.h \ + qquickqfontdialog_p.h \ + ../dialogs/qquickabstractfontdialog_p.h \ ../dialogs/qquickabstractdialog_p.h QT += quick-private gui-private core-private qml-private widgets diff --git a/src/imports/widgets/widgetsplugin.cpp b/src/imports/widgets/widgetsplugin.cpp index be9d59f346..4df0292d8a 100644 --- a/src/imports/widgets/widgetsplugin.cpp +++ b/src/imports/widgets/widgetsplugin.cpp @@ -43,6 +43,7 @@ #include <QtQml/qqml.h> #include "qquickqfiledialog_p.h" #include "qquickqcolordialog_p.h" +#include "qquickqfontdialog_p.h" QT_BEGIN_NAMESPACE @@ -77,6 +78,7 @@ public: qmlRegisterType<QQuickQFileDialog>(uri, 1, 0, "QtFileDialog"); qmlRegisterType<QQuickQColorDialog>(uri, 1, 0, "QtColorDialog"); + qmlRegisterType<QQuickQFontDialog>(uri, 1, 1, "QtFontDialog"); } }; |