From 63b8aa0681df9912c3d139de325bef9ccfe1aea6 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Wed, 19 Jan 2022 13:26:44 -0700
Subject: [PATCH] SystemDialog: improve design and make it more KDE-like

This makes it use a more KDE-ish style so that it fits in with the
rest of the system a bit better.
---
 .../contents/systemdialog/SystemDialog.qml    | 78 ++++++++++---------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/lookandfeel/contents/systemdialog/SystemDialog.qml b/lookandfeel/contents/systemdialog/SystemDialog.qml
index 4dc0f8fc2..79fdb6ffd 100644
--- a/lookandfeel/contents/systemdialog/SystemDialog.qml
+++ b/lookandfeel/contents/systemdialog/SystemDialog.qml
@@ -27,10 +27,9 @@ Item {
     property Window window
     implicitHeight: column.implicitHeight
     implicitWidth: column.implicitWidth
-    readonly property real minimumHeight: column.Layout.minimumHeight
-    readonly property real minimumWidth: column.Layout.minimumWidth
     readonly property int flags: Qt.Dialog
     property alias standardButtons: footerButtonBox.standardButtons
+    readonly property int spacing: Kirigami.Units.largeSpacing // standard KDE dialog margins
 
     function present() {
         window.show()
@@ -38,28 +37,27 @@ Item {
 
     ColumnLayout {
         id: column
-        spacing: 0
         anchors.fill: parent
-        
+        anchors.margins: root.spacing
+
+        spacing: root.spacing
+
+        // Header area
         RowLayout {
-            Layout.topMargin: Kirigami.Units.gridUnit
-            Layout.bottomMargin: Kirigami.Units.gridUnit
-            Layout.leftMargin: Kirigami.Units.gridUnit
-            Layout.rightMargin: Kirigami.Units.largeSpacing
-            
-            spacing: Kirigami.Units.gridUnit
-            
+            spacing: root.spacing
+
             Kirigami.Icon {
                 id: icon
                 visible: source
-                Layout.alignment: Qt.AlignTop | Qt.AlignLeft
                 implicitWidth: Kirigami.Units.iconSizes.large
                 implicitHeight: Kirigami.Units.iconSizes.large
             }
-            
+
             ColumnLayout {
                 Layout.fillWidth: true
-                spacing: Kirigami.Units.largeSpacing
+
+                spacing: Kirigami.Units.smallSpacing
+
                 Kirigami.Heading {
                     id: titleHeading
                     text: root.title
@@ -68,6 +66,7 @@ Item {
                     wrapMode: Text.Wrap
                     elide: Text.ElideRight
                 }
+
                 Label {
                     id: subtitleLabel
                     Layout.fillWidth: true
@@ -75,36 +74,39 @@ Item {
                     elide: Text.ElideRight
                     visible: text.length > 0
                 }
-                Control {
-                    id: contentsControl
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                    leftPadding: 0
-                    rightPadding: 0
-                    bottomPadding: 0
-                    topPadding: 0
-                }
             }
         }
 
-        RowLayout {
+        // Main content area, to be provided by the implementation
+        Control {
+            id: contentsControl
+
             Layout.fillWidth: true
-            Item {
-                Layout.fillWidth: true
-            }
-            DialogButtonBox {
-                id: footerButtonBox
-                Layout.fillWidth: true
-                spacing: Kirigami.Units.smallSpacing
-                onAccepted: root.window.accept()
-                onRejected: root.window.reject()
+            Layout.fillHeight: true
+            leftPadding: 0
+            rightPadding: 0
+            bottomPadding: 0
+            topPadding: 0
+        }
+
+        // Footer area with buttons
+        DialogButtonBox {
+            id: footerButtonBox
+
+            Layout.fillWidth: true
+            leftPadding: 0
+            rightPadding: 0
+            bottomPadding: 0
+            topPadding: 0
+
+            onAccepted: root.window.accept()
+            onRejected: root.window.reject()
 
-                Repeater {
-                    model: root.actions
+            Repeater {
+                model: root.actions
 
-                    delegate: Button {
-                        action: modelData
-                    }
+                delegate: Button {
+                    action: modelData
                 }
             }
         }