rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.

Browse Source
This commit is contained in:
Mike LaBranche 2012-05-26 16:49:02 -07:00
parent 94df1847fc
commit 1b2ffde116
10 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
View File

@ -49,7 +49,7 @@
*/
ConfigFixedWingWidget::ConfigFixedWingWidget(Ui_AircraftWidget *aircraft, QWidget *parent) : VehicleConfig(parent)
{
m_aircraft = aircraft;
m_aircraft = aircraft;
}
/**

7
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
View File

@ -52,6 +52,13 @@ VehicleConfig::VehicleConfig(QWidget *parent) : ConfigTaskWidget(parent)
mixerTypeDescriptions << "Disabled" << "Motor" << "Servo" << "CameraRoll" << "CameraPitch"
<< "CameraYaw" << "Accessory0" << "Accessory1" << "Accessory2"
<< "Accessory3" << "Accessory4" << "Accessory5";
// This is needed because new style tries to compact things as much as possible in grid
// and on OSX the widget sizes of PushButtons is reported incorrectly:
// https://bugreports.qt-project.org/browse/QTBUG-14591
foreach( QPushButton * btn, findChildren<QPushButton*>() ) {
btn->setAttribute(Qt::WA_LayoutUsesWidgetRect);
}
}
VehicleConfig::~VehicleConfig()

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

@ -90,7 +90,7 @@ ConfigCameraStabilizationWidget::ConfigCameraStabilizationWidget(QWidget *parent
connect(m_camerastabilization->camerastabilizationSaveSD, SIGNAL(clicked()), this, SLOT(saveSettings()));
connect(m_camerastabilization->camerastabilizationHelp, SIGNAL(clicked()), this, SLOT(openHelp()));
disbleMouseWheelEvents();
disableMouseWheelEvents();
}
ConfigCameraStabilizationWidget::~ConfigCameraStabilizationWidget()

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

@ -53,7 +53,7 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa
connect(this,SIGNAL(widgetContentsChanged(QWidget*)),this,SLOT(processLinkedWidgets(QWidget*)));
disbleMouseWheelEvents();
disableMouseWheelEvents();
}

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

@ -68,7 +68,7 @@ ConfigTxPIDWidget::ConfigTxPIDWidget(QWidget *parent) : ConfigTaskWidget(parent)
populateWidgets();
refreshWidgetsValues();
disbleMouseWheelEvents();
disableMouseWheelEvents();
}
ConfigTxPIDWidget::~ConfigTxPIDWidget()

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

@ -233,7 +233,7 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi
refreshWidgetsValues();
addToDirtyMonitor();
disbleMouseWheelEvents();
disableMouseWheelEvents();
}

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

@ -37,7 +37,7 @@ inputChannelForm::inputChannelForm(QWidget *parent,bool showlegend) :
connect(ui->channelNumberDropdown,SIGNAL(currentIndexChanged(int)),this,SLOT(channelDropdownUpdated(int)));
connect(ui->channelNumber,SIGNAL(valueChanged(int)),this,SLOT(channelNumberUpdated(int)));
disbleMouseWheelEvents();
disableMouseWheelEvents();
}

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

@ -71,7 +71,7 @@ OutputChannelForm::OutputChannelForm(const int index, QWidget *parent, const boo
connect(ui.actuatorLink, SIGNAL(toggled(bool)),
this, SLOT(linkToggled(bool)));
disbleMouseWheelEvents();
disableMouseWheelEvents();
}
OutputChannelForm::~OutputChannelForm()

2
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -1145,7 +1145,7 @@ void ConfigTaskWidget::loadWidgetLimits(QWidget * widget,UAVObjectField * field,
}
}
void ConfigTaskWidget::disbleMouseWheelEvents()
void ConfigTaskWidget::disableMouseWheelEvents()
{
//Disable mouse wheel events
foreach( QSpinBox * sp, findChildren<QSpinBox*>() ) {

2
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
View File

@ -86,7 +86,7 @@ public:
ConfigTaskWidget(QWidget *parent = 0);
~ConfigTaskWidget();
void disbleMouseWheelEvents();
void disableMouseWheelEvents();
bool eventFilter( QObject * obj, QEvent * evt );
void saveObjectToSD(UAVObject *obj);