diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-17 15:14:57 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-19 05:15:37 +0000 |
commit | fd4d347b0cda7de4040bb36be362884c0c5aea3d (patch) | |
tree | 50452da851932be76cb0014cb61d0f7085f33f63 | |
parent | 13452a48c8eabdc734615ca4759da9a72cb9d691 (diff) |
Add missing QQuickDialog::standardButton() invokable method
[ChangeLog][Controls][Dialog] Added a standardButton() method for
accessing the standard buttons in the dialog's button box.
Change-Id: I7a92a0176985e1bc2c1a82f4bc9e78b813eee802
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 1 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdialog.cpp | 16 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdialog_p.h | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index c02573ce..e9f21378 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -269,6 +269,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickAction>(uri, 2, 3, "Action"); qmlRegisterType<QQuickActionGroup>(uri, 2, 3, "ActionGroup"); qmlRegisterType<QQuickButtonGroup, 3>(uri, 2, 3, "ButtonGroup"); + qmlRegisterType<QQuickDialog, 2>(uri, 2, 3, "Dialog"); qmlRegisterType<QQuickDialogButtonBox>(uri, 2, 3, "DialogButtonBox"); qRegisterMetaType<QQuickIcon>(); qmlRegisterType<QQuickRangeSlider, 3>(uri, 2, 3, "RangeSlider"); diff --git a/src/quicktemplates2/qquickdialog.cpp b/src/quicktemplates2/qquickdialog.cpp index 00719ae4..eb7b658e 100644 --- a/src/quicktemplates2/qquickdialog.cpp +++ b/src/quicktemplates2/qquickdialog.cpp @@ -302,6 +302,22 @@ void QQuickDialog::setStandardButtons(QPlatformDialogHelper::StandardButtons but /*! \since QtQuick.Controls 2.3 + \qmlmethod AbstractButton QtQuick.Controls::Dialog::standardButton(StandardButton button) + + Returns the specified standard \a button, or \c null if it does not exist. + + \sa standardButtons +*/ +QQuickAbstractButton *QQuickDialog::standardButton(QPlatformDialogHelper::StandardButton button) const +{ + Q_D(const QQuickDialog); + if (!d->buttonBox) + return nullptr; + return d->buttonBox->standardButton(button); +} + +/*! + \since QtQuick.Controls 2.3 \qmlproperty int QtQuick.Controls::Dialog::result This property holds the result code. diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates2/qquickdialog_p.h index 0743ee0a..e6c8d1ce 100644 --- a/src/quicktemplates2/qquickdialog_p.h +++ b/src/quicktemplates2/qquickdialog_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickDialogPrivate; +class QQuickAbstractButton; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialog : public QQuickPopup { @@ -79,6 +80,7 @@ public: QPlatformDialogHelper::StandardButtons standardButtons() const; void setStandardButtons(QPlatformDialogHelper::StandardButtons buttons); + Q_REVISION(3) Q_INVOKABLE QQuickAbstractButton *standardButton(QPlatformDialogHelper::StandardButton button) const; enum StandardCode { Rejected, Accepted }; Q_ENUM(StandardCode) |