fix display bugs

Author: raphaelscholle

src/configure.qml

@@ -41,6 +41,7 @@ Rectangle {
     property bool useSettings: true
     property string qopenhdConfPath: ""
     property bool qopenhdConfPresent: false
+    property bool returnHomeAfterPopupClose: false
 
     Component.onCompleted: {
         qopenhdConfPath = normalizeLocalFilePath(imageWriter.getValue("qopenhdConfPath"))
@@ -59,6 +60,7 @@ Rectangle {
         anchors.right: parent.right
         anchors.topMargin: 8
         anchors.rightMargin: 8
+        z: 10
         width: 28
         height: 28
         padding: 4
@@ -133,7 +135,7 @@ ImButton {
 
             ColumnLayout {
                 anchors.fill: parent
-                anchors.topMargin: -100
+                anchors.topMargin: driveSelected ? 16 : -100
                 anchors.leftMargin: 50
                 anchors.rightMargin: 50
                 spacing: 12
@@ -633,6 +635,12 @@ ImButton {
 
     MsgPopup {
         id: msgpopup
+        onClosed: {
+            if (returnHomeAfterPopupClose) {
+                returnHomeAfterPopupClose = false
+                navigateBack()
+            }
+        }
     }
 
     FileDialog {
@@ -699,6 +707,7 @@ ImButton {
     }
 
     function onError(msg) {
+        returnHomeAfterPopupClose = false
         msgpopup.title = qsTr("Error")
         msgpopup.text = msg
         msgpopup.openPopup()
@@ -947,5 +956,16 @@ ImButton {
         imageWriter.setSetting("qopenhdConfPath", qopenhdConfPath)
 
         console.log("[Configure] Settings written: bootType", bootType, "sbc", sbc, "camera", camera)
+        msgpopup.title = qsTr("Settings written")
+        msgpopup.text = qsTr("Settings were written to <b>%1</b>.").arg(selectedDevice)
+        msgpopup.continueButton = true
+        msgpopup.detailsButton = false
+        msgpopup.configureButton = false
+        msgpopup.closeButton = false
+        msgpopup.quitButton = false
+        msgpopup.yesButton = false
+        msgpopup.noButton = false
+        returnHomeAfterPopupClose = true
+        msgpopup.openPopup()
     }
 }

src/update.qml

@@ -31,6 +31,7 @@ Rectangle {
     property double writeSpeedMB: 0
     property double lastWriteBytes: 0
     property double lastWriteTimestamp: 0
+    property bool returnHomeAfterPopupClose: false
 
     function navigateBack() {
         if (progressBar.visible) {
@@ -783,6 +784,7 @@ Rectangle {
 
         Item {
             width: window.width-100
+            height: contentLayout.implicitHeight + 24
             Accessible.name: name+".\n"+description
 
             MouseArea {
@@ -1117,6 +1119,12 @@ Rectangle {
             }
             window.close()
         }
+        onClosed: {
+            if (returnHomeAfterPopupClose) {
+                returnHomeAfterPopupClose = false
+                navigateBack()
+            }
+        }
     }
     MsgPopup {
         id: quitpopup
@@ -1371,6 +1379,7 @@ Rectangle {
     }
 
     function onError(msg) {
+        returnHomeAfterPopupClose = false
         msgpopup.title = qsTr("Error")
         msgpopup.configureButton = false
         msgpopup.closeButton = false
@@ -1410,13 +1419,14 @@ Rectangle {
     }
 
     function onUpdateUploadSuccess() {
-        msgpopup.title = qsTr("Update ready")
-        msgpopup.text = qsTr("<b>%1</b> was copied to <b>%2</b>.<br>You can now safely remove the card or continue configuring it.").arg(osbutton.text).arg(dstbutton.text)
-        msgpopup.continueButton = false
+        msgpopup.title = qsTr("Update written")
+        msgpopup.text = qsTr("<b>%1</b> was written to <b>%2</b>.<br>You can now safely remove the card.").arg(osbutton.text).arg(dstbutton.text)
+        msgpopup.continueButton = true
         msgpopup.detailsButton = false
-        msgpopup.configureButton = true
-        msgpopup.closeButton = true
+        msgpopup.configureButton = false
+        msgpopup.closeButton = false
         msgpopup.quitButton = false
+        returnHomeAfterPopupClose = true
         msgpopup.openPopup()
         resetWriteButton()
         customizebutton.visible = true