qml: msgpopup: Qt6 changes

Use anchors preferentially, and nest the title bar elements.

src/MsgPopup.qml

@@ -11,12 +11,13 @@ import "qmlcomponents"
 
 Popup {
     id: msgpopup
-    x: 75
+    x: (parent.width-width)/2
     y: (parent.height-height)/2
-    width: parent.width-150
+    width: 550
     height: msgpopupbody.implicitHeight+150
     padding: 0
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
+    modal: true
 
     property alias title: msgpopupheader.text
     property alias text: msgpopupbody.text
@@ -29,63 +30,70 @@ Popup {
 
     // background of title
     Rectangle {
+        id: msgpopup_title_background
         color: "#f5f5f5"
-        anchors.right: parent.right
+        anchors.left: parent.left
         anchors.top: parent.top
         height: 35
         width: parent.width
-    }
-    // line under title
-    Rectangle {
-        color: "#afafaf"
-        width: parent.width
-        y: 35
-        implicitHeight: 1
-    }
-
-    Text {
-        id: msgx
-        text: "X"
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.rightMargin: 25
-        anchors.topMargin: 10
-        font.family: roboto.name
-        font.bold: true
-
-        MouseArea {
-            anchors.fill: parent
-            cursorShape: Qt.PointingHandCursor
-            onClicked: {
-                msgpopup.close()
-            }
-        }
-    }
-
-    ColumnLayout {
-        spacing: 20
-        anchors.fill: parent
 
         Text {
             id: msgpopupheader
             horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            Layout.fillWidth: true
-            Layout.topMargin: 10
+            anchors.fill: parent
+            anchors.topMargin: 10
             font.family: roboto.name
             font.bold: true
         }
 
+        Text {
+            text: "X"
+            Layout.alignment: Qt.AlignRight
+            horizontalAlignment: Text.AlignRight
+            verticalAlignment: Text.AlignVCenter
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.rightMargin: 25
+            anchors.topMargin: 10
+            font.family: roboto.name
+            font.bold: true
+
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    msgpopup.close()
+                }
+            }
+        }
+    }
+    // line under title
+    Rectangle {
+        id: msgpopup_title_separator
+        color: "#afafaf"
+        width: parent.width
+        anchors.top: msgpopup_title_background.bottom
+        height: 1
+    }
+
+    ColumnLayout {
+        spacing: 20
+        anchors.top: msgpopup_title_separator.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+
         Text {
             id: msgpopupbody
             font.pointSize: 12
             wrapMode: Text.Wrap
             textFormat: Text.StyledText
             font.family: roboto.name
-            Layout.maximumWidth: msgpopup.width-50
             Layout.fillHeight: true
             Layout.leftMargin: 25
+            Layout.rightMargin: 25
             Layout.topMargin: 25
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
             Accessible.name: text.replace(/<\/?[^>]+(>|$)/g, "")
         }
 
@@ -93,6 +101,7 @@ Popup {
             Layout.alignment: Qt.AlignCenter | Qt.AlignBottom
             Layout.bottomMargin: 10
             spacing: 20
+            id: buttons
 
             ImButtonRed {
                 text: qsTr("NO")
@@ -128,8 +137,6 @@ Popup {
                 font.family: roboto.name
                 visible: msgpopup.quitButton
             }
-
-            Text { text: " " }
         }
     }