From e8e9aa4c03d9c55771688757571d283d47dbe002 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 30 Jul 2018 19:45:27 -0700 Subject: [PATCH] Duplication cleanup --- src/QmlControls/ParameterEditor.qml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 9fa0fec47..f9ea4fb42 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -33,6 +33,7 @@ QGCView { property var _searchResults ///< List of parameter names from search results property bool _showRCToParam: !ScreenTools.isMobile && QGroundControl.multiVehicleManager.activeVehicle.px4Firmware property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle + property var _appSettings: QGroundControl.settingsManager.appSettings ParameterEditorController { id: controller; @@ -112,28 +113,18 @@ QGCView { MenuItem { text: qsTr("Load from file...") onTriggered: { - var appSettings = QGroundControl.settingsManager.appSettings - fileDialog.qgcView = qgcView - fileDialog.title = qsTr("Select Parameter File") + fileDialog.title = qsTr("Load Parameters") fileDialog.selectExisting = true - fileDialog.folder = appSettings.parameterSavePath - fileDialog.fileExtension = appSettings.parameterFileExtension - fileDialog.nameFilters = [ qsTr("Parameter Files (*.%1)").arg(appSettings.parameterFileExtension) , qsTr("All Files (*.*)") ] fileDialog.openForLoad() } } MenuItem { text: qsTr("Save to file...") onTriggered: { - var appSettings = QGroundControl.settingsManager.appSettings - fileDialog.qgcView = qgcView fileDialog.title = qsTr("Save Parameters") fileDialog.selectExisting = false - fileDialog.folder = appSettings.parameterSavePath - fileDialog.fileExtension = appSettings.parameterFileExtension - fileDialog.nameFilters = [ qsTr("Parameter Files (*.%1)").arg(appSettings.parameterFileExtension) , qsTr("All Files (*.*)") ] fileDialog.openForSave() } } @@ -292,7 +283,10 @@ QGCView { } // QGCViewPanel QGCFileDialog { - id: fileDialog + id: fileDialog + folder: _appSettings.parameterSavePath + fileExtension: _appSettings.parameterFileExtension + nameFilters: [ qsTr("Parameter Files (*.%1)").arg(_appSettings.parameterFileExtension) , qsTr("All Files (*.*)") ] onAcceptedForSave: { controller.saveToFile(file) -- 2.22.0