Browse Source

Fix KML file extensions on mobile

QGC4.4
DonLakeFlyer 7 years ago
parent
commit
5429bd15c0
  1. 4
      src/MissionManager/QGCMapPolygonVisuals.qml
  2. 8
      src/PlanView/PlanView.qml

4
src/MissionManager/QGCMapPolygonVisuals.qml

@ -32,6 +32,7 @@ Item {
property int borderWidth: 0 property int borderWidth: 0
property color borderColor: "black" property color borderColor: "black"
property var _gqcView: ggcView
property var _polygonComponent property var _polygonComponent
property var _dragHandlesComponent property var _dragHandlesComponent
property var _splitHandlesComponent property var _splitHandlesComponent
@ -172,11 +173,12 @@ Item {
QGCFileDialog { QGCFileDialog {
id: kmlLoadDialog id: kmlLoadDialog
qgcView: _root.qgcView qgcView: _qgcView
folder: QGroundControl.settingsManager.appSettings.missionSavePath folder: QGroundControl.settingsManager.appSettings.missionSavePath
title: qsTr("Select KML File") title: qsTr("Select KML File")
selectExisting: true selectExisting: true
nameFilters: [ qsTr("KML files (*.kml)") ] nameFilters: [ qsTr("KML files (*.kml)") ]
fileExtension: QGroundControl.settingsManager.appSettings.kmlFileExtension
onAcceptedForLoad: { onAcceptedForLoad: {

8
src/PlanView/PlanView.qml

@ -174,6 +174,8 @@ QGCView {
fileDialog.title = qsTr("Select Plan File") fileDialog.title = qsTr("Select Plan File")
fileDialog.selectExisting = true fileDialog.selectExisting = true
fileDialog.nameFilters = masterController.loadNameFilters fileDialog.nameFilters = masterController.loadNameFilters
fileDialog.fileExtension = QGroundControl.settingsManager.appSettings.planFileExtension
fileDialog.fileExtension2 = QGroundControl.settingsManager.appSettings.missionFileExtension
fileDialog.openForLoad() fileDialog.openForLoad()
} }
@ -182,6 +184,8 @@ QGCView {
fileDialog.plan = true fileDialog.plan = true
fileDialog.selectExisting = false fileDialog.selectExisting = false
fileDialog.nameFilters = masterController.saveNameFilters fileDialog.nameFilters = masterController.saveNameFilters
fileDialog.fileExtension = QGroundControl.settingsManager.appSettings.planFileExtension
fileDialog.fileExtension2 = QGroundControl.settingsManager.appSettings.missionFileExtension
fileDialog.openForSave() fileDialog.openForSave()
} }
@ -194,6 +198,8 @@ QGCView {
fileDialog.plan = false fileDialog.plan = false
fileDialog.selectExisting = false fileDialog.selectExisting = false
fileDialog.nameFilters = masterController.saveKmlFilters fileDialog.nameFilters = masterController.saveKmlFilters
fileDialog.fileExtension = QGroundControl.settingsManager.appSettings.kmlFileExtension
fileDialog.fileExtension2 = ""
fileDialog.openForSave() fileDialog.openForSave()
} }
} }
@ -240,8 +246,6 @@ QGCView {
qgcView: _qgcView qgcView: _qgcView
property var plan: true property var plan: true
folder: QGroundControl.settingsManager.appSettings.missionSavePath folder: QGroundControl.settingsManager.appSettings.missionSavePath
fileExtension: QGroundControl.settingsManager.appSettings.planFileExtension
fileExtension2: QGroundControl.settingsManager.appSettings.missionFileExtension
onAcceptedForSave: { onAcceptedForSave: {
plan ? masterController.saveToFile(file) : masterController.saveToKml(file) plan ? masterController.saveToFile(file) : masterController.saveToKml(file)

Loading…
Cancel
Save