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

Merge branch 'kilrah/667_extended_limits' into next

Browse Source 
Conflicts:
	companion/src/modeledit/modeledit.cpp
This commit is contained in:
Andre Bernet
2014-04-03 21:22:15 +02:00
parent 144952f46d 31823c0c95
commit 573e8600e3
5 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/modeledit.cpp
+6 -2
View File
@@ -25,18 +25,22 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
setWindowIcon(CompanionIcon("edit.png"));
restoreGeometry(g.modelEditGeo());
ui->pushButton->setIcon(CompanionIcon("simulate.png"));
addTab(new Setup(this, model, generalSettings), tr("Setup"));
Setup * setupPanel = new Setup(this, model, generalSettings);
addTab(setupPanel, tr("Setup"));
addTab(new HeliPanel(this, model, generalSettings), tr("Heli"));
addTab(new FlightModes(this, model, generalSettings), tr("Flight Modes"));
addTab(new InputsPanel(this, model, generalSettings), tr("Inputs"));
addTab(new MixesPanel(this, model, generalSettings), tr("Mixes"));
addTab(new Channels(this, model, generalSettings), tr("Servos"));
Channels * chnPanel = new Channels(this, model, generalSettings);
addTab(chnPanel, tr("Servos"));
addTab(new Curves(this, model, generalSettings), tr("Curves"));
addTab(new LogicalSwitchesPanel(this, model, generalSettings), tr("Logical Switches"));
if (GetEepromInterface()->getCapability(CustomFunctions))
addTab(new CustomFunctionsPanel(this, model, generalSettings), tr("Special Functions"));
if (GetEepromInterface()->getCapability(Telemetry) & TM_HASTELEMETRY)
addTab(new TelemetryPanel(this, model, generalSettings), tr("Telemetry"));
connect(setupPanel, SIGNAL(extendedLimitsToggled()), chnPanel, SLOT(refreshExtendedLimits()));
}
ModelEdit::~ModelEdit()