diff --git a/src/AnalyzeView/LogDownloadPage.qml b/src/AnalyzeView/LogDownloadPage.qml index dbd642bf67d23935794adbdd706f6ae5262ad89c..bbe5b37979d213eba2881cf3597fb5b3c220d93b 100644 --- a/src/AnalyzeView/LogDownloadPage.qml +++ b/src/AnalyzeView/LogDownloadPage.qml @@ -152,8 +152,21 @@ AnalyzePage { var o = logController.model.get(rowIndex) if (o) o.selected = true }) - //-- Download them - logController.download() + fileDialog.qgcView = logDownloadPage + fileDialog.title = qsTr("Select save directory") + fileDialog.selectExisting = true + fileDialog.folder = QGroundControl.settingsManager.appSettings.telemetrySavePath + fileDialog.selectFolder = true + fileDialog.openForLoad() + } + + QGCFileDialog { + id: fileDialog + + onAcceptedForLoad: { + logController.download(file) + close() + } } } diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 21566d34c4b39b13e64f5f8d2afee68700a3126f..f209c5b093ca5ca0ca0293be0a195434c88b6d10 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -270,7 +270,7 @@ int MissionController::insertSimpleMissionItem(QGeoCoordinate coordinate, int i) newItem->setCommand(MavlinkQmlSingleton::MAV_CMD_NAV_WAYPOINT); _initVisualItem(newItem); if (_visualItems->count() == 1) { - newItem->setCommand(MavlinkQmlSingleton::MAV_CMD_NAV_TAKEOFF); + newItem->setCommand(_activeVehicle->vtol() ? MavlinkQmlSingleton::MAV_CMD_NAV_VTOL_TAKEOFF : MavlinkQmlSingleton::MAV_CMD_NAV_TAKEOFF); } newItem->setDefaultsForCommand(); if ((MAV_CMD)newItem->command() == MAV_CMD_NAV_WAYPOINT) { diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index acf401bb7ec26d96483763acdb75147152eca51a..b4417bc6041e83c84b1ad7ffad87c1f7a2339d43 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -606,7 +606,7 @@ void QGCApplication::_missingParamsDisplay(void) } _missingParams.clear(); - showMessage(QString("Parameters missing from firmware: %1. You may be running an older version of firmware QGC does not work correctly with or your firmware has a bug in it.").arg(params)); + showMessage(QString("Parameters are missing from firmware. You may be running a version of firmware QGC does not work correctly with or your firmware has a bug in it. Missing params: %1").arg(params)); } QObject* QGCApplication::_rootQmlObject() diff --git a/src/QmlControls/QGCFlickableHorizontalIndicator.qml b/src/QmlControls/QGCFlickableHorizontalIndicator.qml index 46216aa51ce4a3ac1ec2c01f5674c68ec49404ec..b1ac454f77b018ea8cad3808b10ab5959936daa0 100644 --- a/src/QmlControls/QGCFlickableHorizontalIndicator.qml +++ b/src/QmlControls/QGCFlickableHorizontalIndicator.qml @@ -33,7 +33,7 @@ Rectangle { properties: "opacity" from: 1.0 to: 0.0 - duration: 1000 + duration: 3000 easing.type: Easing.InQuint } } diff --git a/src/QmlControls/QGCFlickableVerticalIndicator.qml b/src/QmlControls/QGCFlickableVerticalIndicator.qml index 5844c7dc09a4da5c390b3f7fc45d4f94648a9048..67f220d6bef7e9b452c6fc2108887a0cb2e8e81c 100644 --- a/src/QmlControls/QGCFlickableVerticalIndicator.qml +++ b/src/QmlControls/QGCFlickableVerticalIndicator.qml @@ -33,7 +33,7 @@ Rectangle { properties: "opacity" from: 1.0 to: 0.0 - duration: 1000 + duration: 3000 easing.type: Easing.InQuint } }