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

OP-1728 Remove keyboard focus on Spin/Checkboxes - Typo - Uncrustify

Browse Source
This commit is contained in:
Laurent Lalanne 2015-02-18 12:37:23 +01:00
parent f44a663e27
commit a9c442916f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,7 @@ void ConfigOutputWidget::runChannelTests(bool state)
// Add info at end // Add info at end
if (!state && isDirty()) { if (!state && isDirty()) {
QMessageBox mbox; QMessageBox mbox;
mbox.setText(QString(tr("You may want to save our neutral settings." ))); mbox.setText(QString(tr("You may want to save your neutral settings.")));
mbox.setStandardButtons(QMessageBox::Ok); mbox.setStandardButtons(QMessageBox::Ok);
mbox.setIcon(QMessageBox::Information); mbox.setIcon(QMessageBox::Information);
mbox.exec(); mbox.exec();

16
ground/openpilotgcs/src/plugins/config/outputchannelform.cpp
View File

@ -56,6 +56,13 @@ OutputChannelForm::OutputChannelForm(const int index, QWidget *parent) :
ui.actuatorMax->setMinimum(MINOUTPUT_VALUE); ui.actuatorMax->setMinimum(MINOUTPUT_VALUE);
ui.actuatorValue->setMinimum(MINOUTPUT_VALUE); ui.actuatorValue->setMinimum(MINOUTPUT_VALUE);
// Remove keyboard focus
ui.actuatorMin->setFocusPolicy(Qt::ClickFocus);
ui.actuatorMax->setFocusPolicy(Qt::ClickFocus);
ui.actuatorRev->setFocusPolicy(Qt::ClickFocus);
ui.actuatorLink->setFocusPolicy(Qt::ClickFocus);
ui.actuatorValue->setFocusPolicy(Qt::NoFocus);
setChannelRange(); setChannelRange();
disableMouseWheelEvents(); disableMouseWheelEvents();
@ -230,11 +237,11 @@ void OutputChannelForm::setRange(int minimum, int maximum)
*/ */
void OutputChannelForm::setChannelRange() void OutputChannelForm::setChannelRange()
{ {
int minValue = ui.actuatorMin->value(); int minValue = ui.actuatorMin->value();
int maxValue = ui.actuatorMax->value(); int maxValue = ui.actuatorMax->value();
int oldMini = ui.actuatorNeutral->minimum(); int oldMini = ui.actuatorNeutral->minimum();
int oldMaxi = ui.actuatorNeutral->maximum(); int oldMaxi = ui.actuatorNeutral->maximum();
m_mixerType = outputMixerType(); m_mixerType = outputMixerType();
@ -313,7 +320,6 @@ void OutputChannelForm::reverseChannel(bool state)
setChannelRange(); setChannelRange();
return; return;
} }
} }
/** /**