Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Add headers to GVAR grid... (Re #4707)

Browse source
This commit is contained in:
Andre Bernet 2017-03-28 09:49:24 +02:00
parent 19688ff924
commit 02c7ef70ea
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
companion/src/modeledit/flightmodes.cpp
View file

@ -153,12 +153,27 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
// GVars // GVars
if (gvCount > 0 && (firmware->getCapability(GvarsFlightModes) || phaseIdx == 0) ) { if (gvCount > 0 && (firmware->getCapability(GvarsFlightModes) || phaseIdx == 0) ) {
QGridLayout *gvLayout = new QGridLayout(ui->gvGB); QGridLayout *gvLayout = new QGridLayout(ui->gvGB);
// Column headers
int headerCol = 1;
QLabel *nameLabel = new QLabel(ui->gvGB);
nameLabel->setText(tr("Name"));
gvLayout->addWidget(nameLabel, 0, headerCol++, 1, 1);
if (phaseIdx > 0) {
QLabel *sourceLabel = new QLabel(ui->gvGB);
sourceLabel->setText(tr("Value source"));
gvLayout->addWidget(sourceLabel, 0, headerCol++, 1, 1);
}
QLabel *valueLabel = new QLabel(ui->gvGB);
valueLabel->setText(tr("Value"));
gvLayout->addWidget(valueLabel, 0, headerCol++, 1, 1);
for (int i=0; i<gvCount; i++) { for (int i=0; i<gvCount; i++) {
int col = 0; int col = 0;
// GVar label // GVar label
QLabel *label = new QLabel(ui->gvGB); QLabel *label = new QLabel(ui->gvGB);
label->setText(tr("GVAR%1").arg(i+1)); label->setText(tr("GVAR%1").arg(i+1));
gvLayout->addWidget(label, i, col++, 1, 1); gvLayout->addWidget(label, i+1, col++, 1, 1);
// GVar name // GVar name
int nameLen = firmware->getCapability(GvarsName); int nameLen = firmware->getCapability(GvarsName);
if (nameLen > 0) { if (nameLen > 0) {
@ -166,7 +181,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
gvNames[i]->setProperty("index", i); gvNames[i]->setProperty("index", i);
gvNames[i]->setMaxLength(nameLen); gvNames[i]->setMaxLength(nameLen);
connect(gvNames[i], SIGNAL(editingFinished()), this, SLOT(GVName_editingFinished())); connect(gvNames[i], SIGNAL(editingFinished()), this, SLOT(GVName_editingFinished()));
gvLayout->addWidget(gvNames[i], i, col++, 1, 1); gvLayout->addWidget(gvNames[i], i+1, col++, 1, 1);
} }
if (phaseIdx > 0) { if (phaseIdx > 0) {
// GVar link to another GVar // GVar link to another GVar
@ -177,7 +192,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
gvUse[i]->setCurrentIndex(phase.gvars[i] - 1024); gvUse[i]->setCurrentIndex(phase.gvars[i] - 1024);
} }
connect(gvUse[i], SIGNAL(currentIndexChanged(int)), this, SLOT(phaseGVUse_currentIndexChanged(int))); connect(gvUse[i], SIGNAL(currentIndexChanged(int)), this, SLOT(phaseGVUse_currentIndexChanged(int)));
gvLayout->addWidget(gvUse[i], i, col++, 1, 1); gvLayout->addWidget(gvUse[i], i+1, col++, 1, 1);
} }
// GVar value // GVar value
gvValues[i] = new QSpinBox(ui->gvGB); gvValues[i] = new QSpinBox(ui->gvGB);
@ -185,7 +200,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
connect(gvValues[i], SIGNAL(editingFinished()), this, SLOT(phaseGVValue_editingFinished())); connect(gvValues[i], SIGNAL(editingFinished()), this, SLOT(phaseGVValue_editingFinished()));
gvValues[i]->setMinimum(-1024); gvValues[i]->setMinimum(-1024);
gvValues[i]->setMaximum(1024); gvValues[i]->setMaximum(1024);
gvLayout->addWidget(gvValues[i], i, col++, 1, 1); gvLayout->addWidget(gvValues[i], i+1, col++, 1, 1);
// Popups // Popups
if (IS_TARANIS(board) && phaseIdx == 0) { if (IS_TARANIS(board) && phaseIdx == 0) {
@ -193,7 +208,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
gvPopups[i]->setProperty("index", i); gvPopups[i]->setProperty("index", i);
gvPopups[i]->setText(tr("Popup enabled")); gvPopups[i]->setText(tr("Popup enabled"));
connect(gvPopups[i], SIGNAL(toggled(bool)), this, SLOT(phaseGVPopupToggled(bool))); connect(gvPopups[i], SIGNAL(toggled(bool)), this, SLOT(phaseGVPopupToggled(bool)));
gvLayout->addWidget(gvPopups[i], i, col++, 1, 1); gvLayout->addWidget(gvPopups[i], i+1, col++, 1, 1);
} }
} }
} }