diff --git a/ChangeLog.md b/ChangeLog.md index 3291ec1eb58e53c2c551039112b59202006d236b..aa920ae9086b4f756c25c42836c2fdce82cda4e3 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -10,6 +10,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. diff --git a/src/QmlControls/QGCFileDialog.qml b/src/QmlControls/QGCFileDialog.qml index d70730a070f33004b027a74f7b62a43c5582a35c..cdf6afc387d6a6c4de126e6988a44823139d1eb0 100644 --- a/src/QmlControls/QGCFileDialog.qml +++ b/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 ]) + } } } }