From 9727456ec2050d0c967c1be8fcc0364402c9a9c8 Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Sun, 19 Jan 2014 17:20:03 +0100 Subject: [PATCH] OP-1178 Fixed QLineEdit support. Rgression from Re-factoring. --- .../openpilotgcs/src/plugins/config/configpipxtremewidget.cpp | 3 +-- .../src/plugins/uavobjectwidgetutils/configtaskwidget.cpp | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp index 165260fc3..494cce35b 100644 --- a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp @@ -53,7 +53,6 @@ ConfigPipXtremeWidget::ConfigPipXtremeWidget(QWidget *parent) : ConfigTaskWidget } else { qDebug() << "Error: Object is unknown (OPLinkSettings)."; } - autoLoadWidgets(); Core::Internal::GeneralSettings *settings = pm->getObject(); if (!settings->useExpertMode()) { m_oplink->Apply->setVisible(false); @@ -114,7 +113,7 @@ ConfigPipXtremeWidget::ConfigPipXtremeWidget(QWidget *parent) : ConfigTaskWidget // Request and update of the setting object. settingsUpdated = false; - + autoLoadWidgets(); disableMouseWheelEvents(); } diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp index b3323529e..42237bfa1 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp @@ -811,6 +811,8 @@ void ConfigTaskWidget::connectWidgetUpdatesToSlot(QWidget *widget, const char *f connect(cb, SIGNAL(valueChanged(int)), this, function, Qt::UniqueConnection); } else if (QDoubleSpinBox * cb = qobject_cast(widget)) { connect(cb, SIGNAL(valueChanged(double)), this, function, Qt::UniqueConnection); + } else if (QLineEdit * cb = qobject_cast(widget)) { + connect(cb, SIGNAL(textChanged(QString)), this, function, Qt::UniqueConnection); } else if (QCheckBox * cb = qobject_cast(widget)) { connect(cb, SIGNAL(stateChanged(int)), this, function, Qt::UniqueConnection); } else if (QPushButton * cb = qobject_cast(widget)) { @@ -837,6 +839,8 @@ void ConfigTaskWidget::disconnectWidgetUpdatesToSlot(QWidget *widget, const char disconnect(cb, SIGNAL(valueChanged(int)), this, function); } else if (QDoubleSpinBox * cb = qobject_cast(widget)) { disconnect(cb, SIGNAL(valueChanged(double)), this, function); + }else if (QLineEdit * cb = qobject_cast(widget)) { + disconnect(cb, SIGNAL(textChanged(double)), this, function); } else if (QCheckBox * cb = qobject_cast(widget)) { disconnect(cb, SIGNAL(stateChanged(int)), this, function); } else if (QPushButton * cb = qobject_cast(widget)) {