Add Dialog

[ChangeLog][Controls] Added Dialog to provide convenience for handling
dialog popups. Dialog integrates with DialogButtonBox, and provides
convenient accepted() and rejected() signals.

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

1 files changed, 12 insertions, 14 deletions

diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index c603184ae6..753a8c0081 100644
--- a/examples/quickcontrols2/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
@@ -207,7 +207,7 @@ ApplicationWindow {
         }
     }
 
-    Popup {
+    Dialog {
         id: settingsDialog
         x: Math.round((window.width - width) / 2)
         y: Math.round(window.height / 6)
@@ -216,6 +216,16 @@ ApplicationWindow {
         modal: true
         focus: true
 
+        standardButtons: Dialog.Ok | Dialog.Cancel
+        onAccepted: {
+            settings.style = styleBox.displayText
+            settingsDialog.close()
+        }
+        onRejected: {
+            styleBox.currentIndex = styleBox.styleIndex
+            settingsDialog.close()
+        }
+
         contentItem: ColumnLayout {
             id: settingsColumn
             spacing: 20
@@ -254,22 +264,10 @@ ApplicationWindow {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
             }
-
-            DialogButtonBox {
-                standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel
-                onAccepted: {
-                    settings.style = styleBox.displayText
-                    settingsDialog.close()
-                }
-                onRejected: {
-                    styleBox.currentIndex = styleBox.styleIndex
-                    settingsDialog.close()
-                }
-            }
         }
     }
 
-    Popup {
+    Dialog {
         id: aboutDialog
         modal: true
         focus: true