diff --git a/src/ui/QGCPX4VehicleConfig.ui b/src/ui/QGCPX4VehicleConfig.ui index 01c4dfb..858e4fe 100644 --- a/src/ui/QGCPX4VehicleConfig.ui +++ b/src/ui/QGCPX4VehicleConfig.ui @@ -20,7 +20,16 @@ Form - + + 0 + + + 0 + + + 0 + + 0 @@ -996,7 +1005,16 @@ Configuration - + + 0 + + + 0 + + + 0 + + 0 @@ -1009,12 +1027,21 @@ 0 0 - 98 - 28 + 21 + 16 - + + 0 + + + 0 + + + 0 + + 0 @@ -1033,7 +1060,16 @@ Configuration - + + 0 + + + 0 + + + 0 + + 0 @@ -1046,12 +1082,21 @@ 0 0 - 98 - 28 + 21 + 16 - + + 0 + + + 0 + + + 0 + + 0 @@ -1084,7 +1129,16 @@ Onboard Configuration - + + 0 + + + 0 + + + 0 + + 0 @@ -1097,12 +1151,21 @@ 0 0 - 98 - 28 + 16 + 16 - + + 0 + + + 0 + + + 0 + + 0 @@ -1208,7 +1271,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -1247,26 +1319,14 @@ Upgrade - - - - 100 - 75 - - - - - 16777215 - 16777215 - - + - Radio -Calibration + Airframe +Config - :/files/images/px4/menu/remote.png:/files/images/px4/menu/remote.png + :/files/images/px4/menu/plane.png:/files/images/px4/menu/plane.png @@ -1301,14 +1361,26 @@ Calibration - + + + + 100 + 75 + + + + + 16777215 + 16777215 + + - Airframe -Config + Radio +Calibration - :/files/images/px4/menu/plane.png:/files/images/px4/menu/plane.png + :/files/images/px4/menu/remote.png:/files/images/px4/menu/remote.png diff --git a/src/ui/map/QGCMapToolBar.cc b/src/ui/map/QGCMapToolBar.cc index 16616a7..d15f122 100644 --- a/src/ui/map/QGCMapToolBar.cc +++ b/src/ui/map/QGCMapToolBar.cc @@ -202,7 +202,7 @@ void QGCMapToolBar::setUpdateInterval() if (ok) { map->setUpdateRateLimit(time); - ui->posLabel->setText(tr("Map update rate limit: %1 second%2").arg(time).arg((time != 1.0f) ? "s" : "")); + ui->posLabel->setText(tr("Limit: %1 second%2").arg(time).arg((time != 1.0f) ? "s" : "")); } } } @@ -219,14 +219,14 @@ void QGCMapToolBar::setMapType() if (ok) { map->SetMapType((MapType::Types)mapType); - ui->posLabel->setText(tr("Map type: %1").arg(mapType)); + ui->posLabel->setText(tr("Map: %1").arg(mapType)); } } } void QGCMapToolBar::tileLoadStart() { - ui->posLabel->setText(tr("Starting to load tiles..")); + ui->posLabel->setText(tr("Loading..")); } void QGCMapToolBar::tileLoadEnd() @@ -238,11 +238,11 @@ void QGCMapToolBar::tileLoadProgress(int progress) { if (progress == 1) { - ui->posLabel->setText(tr("1 tile to load..")); + ui->posLabel->setText(tr("1 tile")); } else if (progress > 0) { - ui->posLabel->setText(tr("%1 tiles to load..").arg(progress)); + ui->posLabel->setText(tr("%1 tile").arg(progress)); } else { diff --git a/src/ui/px4_configuration/QGCPX4SensorCalibration.cc b/src/ui/px4_configuration/QGCPX4SensorCalibration.cc index 077111f..a17174f 100644 --- a/src/ui/px4_configuration/QGCPX4SensorCalibration.cc +++ b/src/ui/px4_configuration/QGCPX4SensorCalibration.cc @@ -337,6 +337,15 @@ void QGCPX4SensorCalibration::setActiveUAS(UASInterface* uas) connect(uas, SIGNAL(textMessageReceived(int,int,int,QString)), this, SLOT(handleTextMessage(int,int,int,QString))); connect(uas, SIGNAL(parameterChanged(int,int,QString,QVariant)), this, SLOT(parameterChanged(int,int,QString,QVariant))); activeUAS = uas; + + if (activeUAS->isRotaryWing()) { + // Users are confused by the config button + ui->diffPressureButton->hide(); + ui->diffPressureLabel->hide(); + } else { + ui->diffPressureButton->show(); + ui->diffPressureLabel->show(); + } } void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int severity, QString text)