[Companion] AutoCheckBox used instead of QCheckBox

This commit is contained in:
bsongis
2015-07-27 07:36:38 +02:00
parent cc41d69954
commit dad815f631
4 changed files with 4 additions and 14 deletions
+2 -11
View File
@@ -728,7 +728,6 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
analogs[1] = new TelemetryAnalog(this, model.frsky.channels[1], model, generalSettings, firmware);
ui->A2Layout->addWidget(analogs[1]);
connect(analogs[1], SIGNAL(modified()), this, SLOT(onAnalogModified()));
ui->ignoreSensorIds->hide();
}
if (IS_TARANIS(firmware->getBoard())) {
@@ -796,10 +795,12 @@ void TelemetryPanel::setup()
ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
}
ui->telemetryProtocol->setCurrentIndex(model->telemetryProtocol);
ui->ignoreSensorIds->setField(model->frsky.ignoreSensorIds);
}
else {
ui->telemetryProtocolLabel->hide();
ui->telemetryProtocol->hide();
ui->ignoreSensorIds->hide();
}
ui->rssiAlarm1SB->setValue(model->frsky.rssiAlarms[0].value);
@@ -871,10 +872,6 @@ void TelemetryPanel::setup()
ui->variousGB->show();
}
if (IS_ARM(firmware->getBoard())) {
ui->ignoreSensorIds->setChecked(model->frsky.ignoreSensorIds);
}
if (!(firmware->getCapability(HasMahPersistent))) {
ui->mahCount_label->hide();
ui->mahCount_SB->hide();
@@ -1041,12 +1038,6 @@ void TelemetryPanel::on_mahCount_SB_editingFinished()
emit modified();
}
void TelemetryPanel::on_ignoreSensorIds_toggled(bool checked)
{
model->frsky.ignoreSensorIds = checked;
emit modified();
}
void TelemetryPanel::on_mahCount_ChkB_toggled(bool checked)
{
model->frsky.mAhPersistent = checked;
-1
View File
@@ -132,7 +132,6 @@ class TelemetryPanel : public ModelPanel
void on_fasOffset_DSB_editingFinished();
void on_mahCount_SB_editingFinished();
void on_mahCount_ChkB_toggled(bool checked);
void on_ignoreSensorIds_toggled(bool checked);
private:
Ui::Telemetry *ui;
+1 -1
View File
@@ -910,7 +910,7 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="ignoreSensorIds">
<widget class="AutoCheckBox" name="ignoreSensorIds">
<property name="text">
<string>Disable multi sensor handling</string>
</property>
+1 -1
View File
@@ -29,7 +29,7 @@ class AutoCheckBox: public QCheckBox
{
lock = true;
if (field) {
setChecked((int)*field);
setChecked(*field);
}
lock = false;
}