diff --git a/companion/src/images/wizard/bank.png b/companion/src/images/wizard/bank.png index 5697f3eed..e92416a9d 100644 Binary files a/companion/src/images/wizard/bank.png and b/companion/src/images/wizard/bank.png differ diff --git a/companion/src/images/wizard/conclusion.png b/companion/src/images/wizard/conclusion.png index 8b188491d..87a1fa247 100644 Binary files a/companion/src/images/wizard/conclusion.png and b/companion/src/images/wizard/conclusion.png differ diff --git a/companion/src/images/wizard/multirotor.png b/companion/src/images/wizard/multirotor.png index c99203dbd..064eeb1c9 100644 Binary files a/companion/src/images/wizard/multirotor.png and b/companion/src/images/wizard/multirotor.png differ diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index 6b20bcc61..f708322ce 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -186,7 +186,6 @@ void MdiChild::modelEdit() void MdiChild::wizardEdit() { -return modelEdit(); // TODO FOR BERTRAND- REMOVE THIS LINE TO TURN THE WIZARD BACK ON int row = ui->modelsList->currentRow(); if (row > 0) { checkAndInitModel(row); diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizarddialog.cpp index 77df3bc80..e5c5ba9d8 100644 --- a/companion/src/wizarddialog.cpp +++ b/companion/src/wizarddialog.cpp @@ -209,6 +209,7 @@ ModelSelectionPage::ModelSelectionPage(WizardDialog *dlg, QString image, QString planeRB->setChecked(true); multirotorRB = new QRadioButton(tr("Multirotor")); helicopterRB = new QRadioButton(tr("Helicopter")); + helicopterRB->setDisabled(true); //TODO REMOVE TO ENABLE HELICOPTERS registerField("evaluate.name*", nameLineEdit); @@ -745,8 +746,8 @@ ConclusionPage::ConclusionPage(WizardDialog *dlg, QString image, QString title, registerField("evaluate.proceed*", proceedCB); QLayout *l = layout(); - l->addWidget(textLabel); l->addWidget(proceedCB); + l->addWidget(textLabel); } void ConclusionPage::initializePage(){