diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:18:52 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:18:52 +0200 |
| commit | 7f3aa9feb6bbe8ab50513f5506f7eb289726ce76 (patch) | |
| tree | 54ba566b06ebc88066f7fa74207a170b77dbd7bc /src/dialogs/qquickdialog.cpp | |
| parent | 06e5c9b8befd950ba9f48717ca83d32c040e2c39 (diff) | |
| parent | 45484e3f70cfb430e861754253f46fae1d745fda (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I4aa5c960a03616d95f9e1d10b4c8ba222997a24d
Diffstat (limited to 'src/dialogs/qquickdialog.cpp')
| -rw-r--r-- | src/dialogs/qquickdialog.cpp | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index f0260e986..76f278aed 100644 --- a/src/dialogs/qquickdialog.cpp +++ b/src/dialogs/qquickdialog.cpp @@ -202,8 +202,9 @@ QT_BEGIN_NAMESPACE */ QQuickDialog::QQuickDialog(QObject *parent) : QQuickAbstractDialog(parent) + , m_enabledButtons(Ok) + , m_clickedButton(NoButton) { - connect(this, SIGNAL(buttonClicked()), this, SLOT(clicked())); } @@ -226,6 +227,13 @@ QJSValue QQuickDialog::__standardButtonsRightModel() return m_standardButtonsRightModel; } +void QQuickDialog::setVisible(bool v) +{ + if (v) + m_clickedButton == NoButton; + QQuickAbstractDialog::setVisible(v); +} + void QQuickDialog::updateStandardButtons() { if (m_standardButtonsRightModel.isUndefined()) { @@ -363,37 +371,6 @@ void QQuickDialog::click(QQuickAbstractDialog::StandardButton button) QPlatformDialogHelper::buttonRole(static_cast<QPlatformDialogHelper::StandardButton>(button)))); } -void QQuickDialog::clicked() { - switch (QPlatformDialogHelper::buttonRole(static_cast<QPlatformDialogHelper::StandardButton>(m_clickedButton))) { - case QPlatformDialogHelper::AcceptRole: - accept(); - break; - case QPlatformDialogHelper::RejectRole: - reject(); - break; - case QPlatformDialogHelper::DestructiveRole: - emit discard(); - break; - case QPlatformDialogHelper::HelpRole: - emit help(); - break; - case QPlatformDialogHelper::YesRole: - emit yes(); - break; - case QPlatformDialogHelper::NoRole: - emit no(); - break; - case QPlatformDialogHelper::ApplyRole: - emit apply(); - break; - case QPlatformDialogHelper::ResetRole: - emit reset(); - break; - default: - qWarning("StandardButton %d has no role", m_clickedButton); - } -} - void QQuickDialog::accept() { // enter key is treated like OK if (m_clickedButton == NoButton) |