From e660233ec3f6a98b69e8c7ea7b709e03ed15983a Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 9 Nov 2018 12:28:26 -0800 Subject: [PATCH 1/3] Fix delete file --- ChangeLog.md | 1 + src/QmlControls/QGCFileDialog.qml | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 3291ec1..aa920ae 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 d70730a..cdf6afc 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 ]) + } } } } From bab39999a8af35844fe51476643dab29deb22314 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 16 Nov 2018 08:24:19 -0800 Subject: [PATCH 2/3] AppVeyor: Qt version fix (#7011) --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ea99b1d..3ad0208 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,7 +15,7 @@ environment: install: - git submodule update --init --recursive - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.11.1\msvc2015\bin;%PATH% + - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.11\msvc2015\bin;%PATH% - mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\ - ps: | Write-Host "Installing GStreamer..." -ForegroundColor Cyan @@ -35,7 +35,7 @@ install: Write-Host "Installed" -ForegroundColor Green build_script: - - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.11.1\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro + - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.11\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro - cd %SHADOW_BUILD_DIR% && jom - if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\QGroundControl-installer.exe %APPVEYOR_BUILD_FOLDER%\QGroundControl-installer.exe ) # Generate the source server information to embed in the PDB From 97cbe038dc829f99ca9b7f37d81693cb1da631fc Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 1 Dec 2018 11:05:43 -0800 Subject: [PATCH 3/3] Remove incorrect vehicle yaw --- src/MissionManager/StructureScanComplexItem.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MissionManager/StructureScanComplexItem.cc b/src/MissionManager/StructureScanComplexItem.cc index 05666db..a336044 100644 --- a/src/MissionManager/StructureScanComplexItem.cc +++ b/src/MissionManager/StructureScanComplexItem.cc @@ -281,7 +281,7 @@ void StructureScanComplexItem::appendMissionItems(QList& items, QO 0, // No hold time 0.0, // No acceptance radius specified 0.0, // Pass through waypoint - 90, //std::numeric_limits::quiet_NaN(), // Yaw unchanged + std::numeric_limits::quiet_NaN(), // Yaw unchanged vertexCoord.latitude(), vertexCoord.longitude(), layerAltitude,