rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

gcs: some cosmetic ui text changes

Browse Source
This commit is contained in:
Oleg Semyonov 2011-07-28 23:26:07 +03:00
parent 9840f12658
commit ad339d32a6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
View File

@ -167,7 +167,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Changes on this page require an Hw reboot to be applied</string> <string>Changes on this page only take effect after board reset or power cycle</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

8
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
View File

@ -67,19 +67,19 @@ void ConfigCCHWWidget::widgetsContentsChanged()
} }
else if((m_telemetry->cbTele->currentText()=="Spektrum" ||m_telemetry->cbFlexi->currentText()=="Spektrum") && m_telemetry->receiverType->currentText()!="Spektrum") else if((m_telemetry->cbTele->currentText()=="Spektrum" ||m_telemetry->cbFlexi->currentText()=="Spektrum") && m_telemetry->receiverType->currentText()!="Spektrum")
{ {
m_telemetry->problems->setText("Warning: you have at least one port configured as 'Spektrum' however that is not your selected input type"); m_telemetry->problems->setText("Warning: you have a port configured as 'Spektrum' however that is not your selected receiver type");
} }
else if(m_telemetry->cbTele->currentText()=="S.Bus" && m_telemetry->receiverType->currentText()!="S.Bus") else if(m_telemetry->cbTele->currentText()=="S.Bus" && m_telemetry->receiverType->currentText()!="S.Bus")
{ {
m_telemetry->problems->setText("Warning: you have at least one port configured as 'S.Bus' however that is not your selected input type"); m_telemetry->problems->setText("Warning: you have a port configured as 'S.Bus' however that is not your selected receiver type");
} }
else if(m_telemetry->cbTele->currentText()!="S.Bus" && m_telemetry->receiverType->currentText()=="S.Bus") else if(m_telemetry->cbTele->currentText()!="S.Bus" && m_telemetry->receiverType->currentText()=="S.Bus")
{ {
m_telemetry->problems->setText("Warning: you have selected 'S.Bus' as your input type however you have no port configured for that protocol"); m_telemetry->problems->setText("Warning: you have selected 'S.Bus' as your receiver type however you have no port configured for that protocol");
} }
else if((m_telemetry->cbTele->currentText()!="Spektrum" && m_telemetry->cbFlexi->currentText()!="Spektrum") && m_telemetry->receiverType->currentText()=="Spektrum") else if((m_telemetry->cbTele->currentText()!="Spektrum" && m_telemetry->cbFlexi->currentText()!="Spektrum") && m_telemetry->receiverType->currentText()=="Spektrum")
{ {
m_telemetry->problems->setText("Warning: you have at selected 'Spektrum' as your input type however you have no port configured for that protocol"); m_telemetry->problems->setText("Warning: you have selected 'Spektrum' as your receiver type however you have no port configured for that protocol");
} }
else else
{ {

2
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -698,7 +698,7 @@ void ConfigInputWidget::receiverHelp()
unassigned.append("FlightMode"); unassigned.append("FlightMode");
} }
if(unassigned.length()>0) if(unassigned.length()>0)
m_config->lblMissingInputs->setText(QString("Channels left to assign:")+unassigned); m_config->lblMissingInputs->setText(QString("Channels left to assign: ")+unassigned);
else else
m_config->lblMissingInputs->setText(""); m_config->lblMissingInputs->setText("");
} }