Merge pull request #7056 from DonLakeFlyer/StableMerge

Stable merge into master

ChangeLog.md

@@ -25,6 +25,7 @@ Note: This file only contains high level features or important fixes.
 * Structure Scan: Fix loading of structure scan height
 * ArduPilot: Fix location of planned home position when not connected to vehicle. Issue #6840.
 * Fix loading of parameters from multiple components. Would report download complete too early, thus missing all default component params.
+* Fix file delete in mobile file dialogs
 
 ### 3.4.4 - Stable
 * Stable desktop versions now inform user at boot if newer version is available.

src/MissionManager/StructureScanComplexItem.cc

@@ -319,7 +319,7 @@ void StructureScanComplexItem::appendMissionItems(QList<MissionItem*>& items, QO
                                                 0,                                          // No hold time
                                                 0.0,                                        // No acceptance radius specified
                                                 0.0,                                        // Pass through waypoint
-                                                90, //std::numeric_limits<double>::quiet_NaN(),   // Yaw unchanged
+                                                std::numeric_limits<double>::quiet_NaN(),   // Yaw unchanged
                                                 vertexCoord.latitude(),
                                                 vertexCoord.longitude(),
                                                 layerAltitude,

src/QmlControls/QGCFileDialog.qml

@@ -107,7 +107,7 @@ Item {
                     spacing:        ScreenTools.defaultFontPixelHeight / 2
 
                     Repeater {
-                        id:     fileList
+                        id:     fileRepeater
                         model:  controller.getFiles(folder, _rgExtensions)
 
                         FileButton {
@@ -136,7 +136,10 @@ Item {
 
                                 MenuItem {
                                     text:           qsTr("Delete")
-                                    onTriggered:    controller.deleteFile(hamburgerMenu.fileToDelete);
+                                    onTriggered: {
+                                        controller.deleteFile(hamburgerMenu.fileToDelete)
+                                        fileRepeater.model = controller.getFiles(folder, _rgExtensions)
+                                    }
                                 }
                             }
                         }
@@ -144,7 +147,7 @@ Item {
 
                     QGCLabel {
                         text:       qsTr("No files")
-                        visible:    fileList.model.length === 0
+                        visible:    fileRepeater.model.length === 0
                     }
                 }
             }
@@ -217,9 +220,11 @@ Item {
                     }
 
                     Repeater {
-                        model: controller.getFiles(folder, [ fileExtension ])
+                        id:     fileRepeater
+                        model:  controller.getFiles(folder, [ fileExtension ])
 
                         FileButton {
+                            id:             fileButton
                             anchors.left:   parent.left
                             anchors.right:  parent.right
                             text:           modelData
@@ -240,14 +245,14 @@ Item {
 
                                 property string fileToDelete
 
-                                onAboutToHide: {
-                                    fileButton.highlight = false
-                                    hideDialog()
+                                onAboutToHide: fileButton.highlight = false
 
-                                }
                                 MenuItem {
                                     text:           qsTr("Delete")
-                                    onTriggered:    controller.deleteFile(hamburgerMenu.fileToDelete);
+                                    onTriggered: {
+                                        controller.deleteFile(hamburgerMenu.fileToDelete)
+                                        fileRepeater.model = controller.getFiles(folder, [ fileExtension ])
+                                    }
                                 }
                             }
                         }