QQuickDialog: add missing standard button signals

There were no signals at all for the following standard buttons:
- Apply
- Discard
- Help
- Reset/RestoreDefaults

[ChangeLog][Controls][Dialog] Added missing applied(), discarded(),
helpRequested(), and reset() signals that are emitted when the
respective standard buttons are clicked.

Task-number: QTBUG-59423
Change-Id: I744a445be2c3506470bdd023e6909f483cc2520a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

4 files changed, 83 insertions, 9 deletions

diff --git a/src/quicktemplates2/qquickdialog.cpp b/src/quicktemplates2/qquickdialog.cpp
index eb7b658e..4fe53c99 100644
--- a/src/quicktemplates2/qquickdialog.cpp
+++ b/src/quicktemplates2/qquickdialog.cpp
@@ -37,6 +37,7 @@
 #include "qquickdialog_p.h"
 #include "qquickdialog_p_p.h"
 #include "qquickdialogbuttonbox_p.h"
+#include "qquickabstractbutton_p.h"
 #include "qquickpopupitem_p_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -115,6 +116,69 @@ QT_BEGIN_NAMESPACE
     \sa accepted()
 */
 
+/*!
+    \since QtQuick.Controls 2.3
+    \qmlsignal QtQuick.Controls::Dialog::applied()
+
+    This signal is emitted when the \c Dialog.Apply standard button is clicked.
+
+    \sa discarded(), reset()
+*/
+
+/*!
+    \since QtQuick.Controls 2.3
+    \qmlsignal QtQuick.Controls::Dialog::reset()
+
+    This signal is emitted when the \c Dialog.Reset standard button is clicked.
+
+    \sa discarded(), applied()
+*/
+
+/*!
+    \since QtQuick.Controls 2.3
+    \qmlsignal QtQuick.Controls::Dialog::discarded()
+
+    This signal is emitted when the \c Dialog.Discard standard button is clicked.
+
+    \sa reset(), applied()
+*/
+
+/*!
+    \since QtQuick.Controls 2.3
+    \qmlsignal QtQuick.Controls::Dialog::helpRequested()
+
+    This signal is emitted when the \c Dialog.Help standard button is clicked.
+
+    \sa accepted(), rejected()
+*/
+
+QPlatformDialogHelper::ButtonRole QQuickDialogPrivate::buttonRole(QQuickAbstractButton *button)
+{
+    const QQuickDialogButtonBoxAttached *attached = qobject_cast<QQuickDialogButtonBoxAttached *>(qmlAttachedPropertiesObject<QQuickDialogButtonBox>(button, false));
+    return attached ? attached->buttonRole() : QPlatformDialogHelper::InvalidRole;
+}
+
+void QQuickDialogPrivate::handleClick(QQuickAbstractButton *button)
+{
+    Q_Q(QQuickDialog);
+    switch (buttonRole(button)) {
+    case QPlatformDialogHelper::ApplyRole:
+        emit q->applied();
+        break;
+    case QPlatformDialogHelper::ResetRole:
+        emit q->reset();
+        break;
+    case QPlatformDialogHelper::DestructiveRole:
+        emit q->discarded();
+        break;
+    case QPlatformDialogHelper::HelpRole:
+        emit q->helpRequested();
+        break;
+    default:
+        break;
+    }
+}
+
 QQuickDialog::QQuickDialog(QObject *parent)
     : QQuickPopup(*(new QQuickDialogPrivate), parent)
 {
@@ -188,12 +252,14 @@ void QQuickDialog::setHeader(QQuickItem *header)
     if (QQuickDialogButtonBox *buttonBox = qobject_cast<QQuickDialogButtonBox *>(oldHeader)) {
         disconnect(buttonBox, &QQuickDialogButtonBox::accepted, this, &QQuickDialog::accept);
         disconnect(buttonBox, &QQuickDialogButtonBox::rejected, this, &QQuickDialog::reject);
+        QObjectPrivate::disconnect(buttonBox, &QQuickDialogButtonBox::clicked, d, &QQuickDialogPrivate::handleClick);
         if (d->buttonBox == buttonBox)
             d->buttonBox = nullptr;
     }
     if (QQuickDialogButtonBox *buttonBox = qobject_cast<QQuickDialogButtonBox *>(header)) {
         connect(buttonBox, &QQuickDialogButtonBox::accepted, this, &QQuickDialog::accept);
         connect(buttonBox, &QQuickDialogButtonBox::rejected, this, &QQuickDialog::reject);
+        QObjectPrivate::connect(buttonBox, &QQuickDialogButtonBox::clicked, d, &QQuickDialogPrivate::handleClick);
         d->buttonBox = buttonBox;
         buttonBox->setStandardButtons(d->standardButtons);
     }
@@ -235,12 +301,14 @@ void QQuickDialog::setFooter(QQuickItem *footer)
     if (QQuickDialogButtonBox *buttonBox = qobject_cast<QQuickDialogButtonBox *>(oldFooter)) {
         disconnect(buttonBox, &QQuickDialogButtonBox::accepted, this, &QQuickDialog::accept);
         disconnect(buttonBox, &QQuickDialogButtonBox::rejected, this, &QQuickDialog::reject);
+        QObjectPrivate::disconnect(buttonBox, &QQuickDialogButtonBox::clicked, d, &QQuickDialogPrivate::handleClick);
         if (d->buttonBox == buttonBox)
             d->buttonBox = nullptr;
     }
     if (QQuickDialogButtonBox *buttonBox = qobject_cast<QQuickDialogButtonBox *>(footer)) {
         connect(buttonBox, &QQuickDialogButtonBox::accepted, this, &QQuickDialog::accept);
         connect(buttonBox, &QQuickDialogButtonBox::rejected, this, &QQuickDialog::reject);
+        QObjectPrivate::connect(buttonBox, &QQuickDialogButtonBox::clicked, d, &QQuickDialogPrivate::handleClick);
         d->buttonBox = buttonBox;
         buttonBox->setStandardButtons(d->standardButtons);
     }
diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates2/qquickdialog_p.h
index e6c8d1ce..8032cf83 100644
--- a/src/quicktemplates2/qquickdialog_p.h
+++ b/src/quicktemplates2/qquickdialog_p.h
@@ -96,6 +96,10 @@ public Q_SLOTS:
 Q_SIGNALS:
     void accepted();
     void rejected();
+    Q_REVISION(3) void applied();
+    Q_REVISION(3) void reset();
+    Q_REVISION(3) void discarded();
+    Q_REVISION(3) void helpRequested();
 
     void titleChanged();
     void headerChanged();
diff --git a/src/quicktemplates2/qquickdialog_p_p.h b/src/quicktemplates2/qquickdialog_p_p.h
index 2a0f4b53..e26182ac 100644
--- a/src/quicktemplates2/qquickdialog_p_p.h
+++ b/src/quicktemplates2/qquickdialog_p_p.h
@@ -48,11 +48,14 @@
 // We mean it.
 //
 
+#include <QtQuickTemplates2/private/qquickdialog_p.h>
 #include <QtQuickTemplates2/private/qquickpopup_p_p.h>
 #include <QtQuickTemplates2/private/qquickpagelayout_p_p.h>
+#include <QtGui/qpa/qplatformdialoghelper.h>
 
 QT_BEGIN_NAMESPACE
 
+class QQuickAbstractButton;
 class QQuickDialogButtonBox;
 
 class QQuickDialogPrivate : public QQuickPopupPrivate
@@ -67,6 +70,10 @@ public:
         return dialog->d_func();
     }
 
+    static QPlatformDialogHelper::ButtonRole buttonRole(QQuickAbstractButton *button);
+
+    void handleClick(QQuickAbstractButton *button);
+
     int result;
     QString title;
     QQuickDialogButtonBox *buttonBox;
diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp
index b6136f4b..7b4dbb56 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
+++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp
@@ -38,6 +38,7 @@
 #include "qquickdialogbuttonbox_p_p.h"
 #include "qquickabstractbutton_p.h"
 #include "qquickbutton_p.h"
+#include "qquickdialog_p_p.h"
 
 #include <QtCore/qpointer.h>
 #include <QtGui/private/qguiapplication_p.h>
@@ -167,12 +168,6 @@ QT_BEGIN_NAMESPACE
     \sa accepted(), rejected(), helpRequested()
 */
 
-static QPlatformDialogHelper::ButtonRole buttonRole(QQuickAbstractButton *button)
-{
-    const QQuickDialogButtonBoxAttached *attached = qobject_cast<QQuickDialogButtonBoxAttached *>(qmlAttachedPropertiesObject<QQuickDialogButtonBox>(button, false));
-    return attached ? attached->buttonRole() : QPlatformDialogHelper::InvalidRole;
-}
-
 QQuickDialogButtonBoxPrivate::QQuickDialogButtonBoxPrivate()
     : alignment(0),
       position(QQuickDialogButtonBox::Footer),
@@ -268,8 +263,8 @@ void QQuickDialogButtonBoxPrivate::updateLayout()
     struct ButtonLayout {
         bool operator()(QQuickAbstractButton *first, QQuickAbstractButton *second)
         {
-            const QPlatformDialogHelper::ButtonRole firstRole = buttonRole(first);
-            const QPlatformDialogHelper::ButtonRole secondRole = buttonRole(second);
+            const QPlatformDialogHelper::ButtonRole firstRole = QQuickDialogPrivate::buttonRole(first);
+            const QPlatformDialogHelper::ButtonRole secondRole = QQuickDialogPrivate::buttonRole(second);
 
             if (firstRole != secondRole && firstRole != QPlatformDialogHelper::InvalidRole && secondRole != QPlatformDialogHelper::InvalidRole) {
                 const int *l = m_layout;
@@ -313,7 +308,7 @@ void QQuickDialogButtonBoxPrivate::handleClick()
     // or change its role. Now changing the role is not possible yet, but arguably
     // both clicked and accepted/rejected/etc. should be emitted "atomically"
     // depending on whatever role the button had at the time of the click.
-    const QPlatformDialogHelper::ButtonRole role = buttonRole(button);
+    const QPlatformDialogHelper::ButtonRole role = QQuickDialogPrivate::buttonRole(button);
     QPointer<QQuickDialogButtonBox> guard(q);
 
     emit q->clicked(button);