piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

added receivers on module frame

Browse Source
This commit is contained in:
Raphael Coeffic
2019-08-18 18:53:56 +02:00
parent ea929e4c19
commit c8e7522b38
2 changed files with 156 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/setup.cpp
+18 -12
View File
@@ -553,20 +553,26 @@ void ModulePanel::update()
}
if (mask & MASK_ACCESS) {
if (QString(generalSettings.registrationId) == ui->registrationId->text()) {
ui->registrationIdLabel->hide();
ui->registrationId->hide();
}
else {
ui->registrationIdLabel->show();
ui->registrationId->show();
}
}
else {
ui->registrationIdLabel->hide();
ui->registrationId->hide();
ui->rx1->setText(module.access.receiverName[0]);
ui->rx2->setText(module.access.receiverName[1]);
ui->rx3->setText(module.access.receiverName[2]);
}
ui->registrationIdLabel->setVisible(mask & MASK_ACCESS);
ui->registrationId->setVisible(mask & MASK_ACCESS);
ui->rx1Label->setVisible(mask & MASK_ACCESS);
ui->clearRx1->setVisible(mask & MASK_ACCESS);
ui->rx1->setVisible(mask & MASK_ACCESS);
ui->rx2Label->setVisible(mask & MASK_ACCESS);
ui->clearRx2->setVisible(mask & MASK_ACCESS);
ui->rx2->setVisible(mask & MASK_ACCESS);
ui->rx3Label->setVisible(mask & MASK_ACCESS);
ui->clearRx3->setVisible(mask & MASK_ACCESS);
ui->rx3->setVisible(mask & MASK_ACCESS);
// Failsafes
ui->label_failsafeMode->setVisible(mask & MASK_FAILSAFES);
ui->failsafeMode->setVisible(mask & MASK_FAILSAFES);
companion/src/modeledit/setup_module.ui
+138 -9
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1042</width>
<height>297</height>
<height>375</height>
</rect>
</property>
<property name="windowTitle">
@@ -239,25 +239,136 @@
<item row="3" column="1">
<widget class="QComboBox" name="r9mPower"/>
</item>
<item row="5" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item row="4" column="0">
<widget class="QLabel" name="rx1Label">
<property name="text">
<string>Receiver 1</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="rx1Layout">
<property name="spacing">
<number>-1</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="autoBind">
<widget class="QLineEdit" name="rx1">
<property name="text">
<string>Bind on startup</string>
<string/>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="lowPower">
<widget class="QPushButton" name="clearRx1">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Low Power</string>
<string>X</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0" colspan="2">
<item row="5" column="0">
<widget class="QLabel" name="rx2Label">
<property name="text">
<string>Receiver 2</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="1">
<layout class="QHBoxLayout" name="rx2Layout">
<item>
<widget class="QLineEdit" name="rx2">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearRx2">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>X</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="6" column="0">
<widget class="QLabel" name="rx3Label">
<property name="text">
<string>Receiver 3</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="1">
<layout class="QHBoxLayout" name="rx3Layout">
<item>
<widget class="QLineEdit" name="rx3">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clearRx3">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>X</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="warning_r9mPower">
<property name="palette">
<palette>
@@ -301,7 +412,25 @@
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<item row="8" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="autoBind">
<property name="text">
<string>Bind on startup</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="lowPower">
<property name="text">
<string>Low Power</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="9" column="0" colspan="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>