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

Model Wizard turned back on.

Browse Source 
Helicopter part diasabled since it is not finished. The rest should work.
This commit is contained in:
Kjell Kernen
2014-03-31 16:12:00 +02:00
parent 684b7529b6
commit efcdaa31d6
5 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/images/wizard/bank.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 21 KiB

companion/src/images/wizard/conclusion.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 21 KiB

companion/src/images/wizard/multirotor.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 19 KiB

companion/src/mdichild.cpp
-1
View File
@@ -186,7 +186,6 @@ void MdiChild::modelEdit()
void MdiChild::wizardEdit() void MdiChild::wizardEdit()
{ {
return modelEdit(); // TODO FOR BERTRAND- REMOVE THIS LINE TO TURN THE WIZARD BACK ON
int row = ui->modelsList->currentRow(); int row = ui->modelsList->currentRow();
if (row > 0) { if (row > 0) {
checkAndInitModel(row); checkAndInitModel(row);
companion/src/wizarddialog.cpp
+2 -1
View File
@@ -209,6 +209,7 @@ ModelSelectionPage::ModelSelectionPage(WizardDialog *dlg, QString image, QString
planeRB->setChecked(true); planeRB->setChecked(true);
multirotorRB = new QRadioButton(tr("Multirotor")); multirotorRB = new QRadioButton(tr("Multirotor"));
helicopterRB = new QRadioButton(tr("Helicopter")); helicopterRB = new QRadioButton(tr("Helicopter"));
helicopterRB->setDisabled(true); //TODO REMOVE TO ENABLE HELICOPTERS
registerField("evaluate.name*", nameLineEdit); registerField("evaluate.name*", nameLineEdit);
@@ -745,8 +746,8 @@ ConclusionPage::ConclusionPage(WizardDialog *dlg, QString image, QString title,
registerField("evaluate.proceed*", proceedCB); registerField("evaluate.proceed*", proceedCB);
QLayout *l = layout(); QLayout *l = layout();
l->addWidget(textLabel);
l->addWidget(proceedCB); l->addWidget(proceedCB);
l->addWidget(textLabel);
} }
void ConclusionPage::initializePage(){ void ConclusionPage::initializePage(){