From 5429bd15c0747a41cf84bb586f884260b5b62a4c Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 14 Mar 2018 17:57:24 -0700 Subject: [PATCH] Fix KML file extensions on mobile --- src/MissionManager/QGCMapPolygonVisuals.qml | 4 +++- src/PlanView/PlanView.qml | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/MissionManager/QGCMapPolygonVisuals.qml b/src/MissionManager/QGCMapPolygonVisuals.qml index fa658fc62..a535f09ad 100644 --- a/src/MissionManager/QGCMapPolygonVisuals.qml +++ b/src/MissionManager/QGCMapPolygonVisuals.qml @@ -32,6 +32,7 @@ Item { property int borderWidth: 0 property color borderColor: "black" + property var _gqcView: ggcView property var _polygonComponent property var _dragHandlesComponent property var _splitHandlesComponent @@ -172,11 +173,12 @@ Item { QGCFileDialog { id: kmlLoadDialog - qgcView: _root.qgcView + qgcView: _qgcView folder: QGroundControl.settingsManager.appSettings.missionSavePath title: qsTr("Select KML File") selectExisting: true nameFilters: [ qsTr("KML files (*.kml)") ] + fileExtension: QGroundControl.settingsManager.appSettings.kmlFileExtension onAcceptedForLoad: { diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml index 1b41997d7..71efed120 100644 --- a/src/PlanView/PlanView.qml +++ b/src/PlanView/PlanView.qml @@ -174,6 +174,8 @@ QGCView { fileDialog.title = qsTr("Select Plan File") fileDialog.selectExisting = true fileDialog.nameFilters = masterController.loadNameFilters + fileDialog.fileExtension = QGroundControl.settingsManager.appSettings.planFileExtension + fileDialog.fileExtension2 = QGroundControl.settingsManager.appSettings.missionFileExtension fileDialog.openForLoad() } @@ -182,6 +184,8 @@ QGCView { fileDialog.plan = true fileDialog.selectExisting = false fileDialog.nameFilters = masterController.saveNameFilters + fileDialog.fileExtension = QGroundControl.settingsManager.appSettings.planFileExtension + fileDialog.fileExtension2 = QGroundControl.settingsManager.appSettings.missionFileExtension fileDialog.openForSave() } @@ -194,6 +198,8 @@ QGCView { fileDialog.plan = false fileDialog.selectExisting = false fileDialog.nameFilters = masterController.saveKmlFilters + fileDialog.fileExtension = QGroundControl.settingsManager.appSettings.kmlFileExtension + fileDialog.fileExtension2 = "" fileDialog.openForSave() } } @@ -240,8 +246,6 @@ QGCView { qgcView: _qgcView property var plan: true folder: QGroundControl.settingsManager.appSettings.missionSavePath - fileExtension: QGroundControl.settingsManager.appSettings.planFileExtension - fileExtension2: QGroundControl.settingsManager.appSettings.missionFileExtension onAcceptedForSave: { plan ? masterController.saveToFile(file) : masterController.saveToKml(file) -- 2.22.0