From ab07169c7a228486e3f5b23f1534d58c605433de Mon Sep 17 00:00:00 2001 From: Fredrik Larsson Date: Sat, 22 Nov 2014 11:04:20 +1100 Subject: [PATCH] Put space between next / skip, don't show skip for flight mode channel as we must have one --- ground/openpilotgcs/src/plugins/config/configinputwidget.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp index bfadb16c8..3ca726523 100644 --- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp @@ -868,10 +868,9 @@ void ConfigInputWidget::setChannel(int newChan) "Move the %1 stick.")).arg(manualSettingsObj->getField("ChannelGroups")->getElementNames().at(newChan))); } - if (manualSettingsObj->getField("ChannelGroups")->getElementNames().at(newChan).contains("Accessory") || - manualSettingsObj->getField("ChannelGroups")->getElementNames().at(newChan).contains("FlightMode")) { + if (manualSettingsObj->getField("ChannelGroups")->getElementNames().at(newChan).contains("Accessory")) { ui->wzNext->setEnabled(true); - ui->wzNext->setText(tr("Next/Skip")); + ui->wzNext->setText(tr("Next / Skip")); ui->wzText->setText(ui->wzText->text() + tr(" Alternatively, click Next to skip this channel.")); } else { ui->wzNext->setEnabled(false);