From fd3eaa2fef09b2a5c5dbf6bfe957294661e89042 Mon Sep 17 00:00:00 2001
From: m_thread <fredrik@arvidssons.org>
Date: Thu, 16 Jul 2015 16:48:34 +0200
Subject: [PATCH] LP-16 Buttons not shown when widget is in Wizard.

---
 .../plugins/setupwizard/pages/airframeinitialtuningpage.cpp | 2 +-
 .../src/plugins/setupwizard/vehicletemplateexportdialog.cpp | 2 +-
 .../plugins/setupwizard/vehicletemplateselectorwidget.cpp   | 6 +++++-
 .../src/plugins/setupwizard/vehicletemplateselectorwidget.h | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
index 556bfb315..1421af770 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
@@ -47,7 +47,7 @@ AirframeInitialTuningPage::~AirframeInitialTuningPage()
 
 void AirframeInitialTuningPage::initializePage()
 {
-    ui->selectorWidget->setTemplateInfo(getWizard()->getVehicleType(), getWizard()->getVehicleSubType());
+    ui->selectorWidget->setTemplateInfo(getWizard()->getVehicleType(), getWizard()->getVehicleSubType(), false);
 }
 
 bool AirframeInitialTuningPage::validatePage()
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
index ec995fcd8..5e0dae3dd 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
@@ -64,7 +64,7 @@ VehicleTemplateExportDialog::VehicleTemplateExportDialog(QWidget *parent) :
     m_uavoManager = pm->getObject<UAVObjectManager>();
     ui->Photo->setScene(new QGraphicsScene(this));
     ui->Type->setText(setupVehicleType());
-    ui->selectionWidget->setTemplateInfo(m_type, m_subType);
+    ui->selectionWidget->setTemplateInfo(m_type, m_subType, true);
 
     connect(ui->Name, SIGNAL(textChanged(QString)), this, SLOT(updateStatus()));
     connect(ui->Owner, SIGNAL(textChanged(QString)), this, SLOT(updateStatus()));
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp
index c27d61014..38aa26513 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.cpp
@@ -58,8 +58,9 @@ VehicleTemplateSelectorWidget::~VehicleTemplateSelectorWidget()
     delete ui;
 }
 
-void VehicleTemplateSelectorWidget::setTemplateInfo(int vehicleType, int vehicleSubType)
+void VehicleTemplateSelectorWidget::setTemplateInfo(int vehicleType, int vehicleSubType, bool showTemplateControls)
 {
+    ui->buttonFrame->setVisible(showTemplateControls);
     m_vehicleType    = vehicleType;
     m_vehicleSubType = vehicleSubType;
     updateTemplates();
@@ -297,6 +298,9 @@ void VehicleTemplateSelectorWidget::setupTemplateList()
         item->setData(Qt::UserRole + 2, QVariant::fromValue(vtemplate->editable()));
         if (vtemplate->editable()) {
             item->setData(Qt::ForegroundRole, QVariant::fromValue(QColor(Qt::darkGreen)));
+            item->setData(Qt::ToolTipRole, QVariant::fromValue(tr("Local template.")));
+        } else {
+            item->setData(Qt::ToolTipRole, QVariant::fromValue(tr("Built-in template.")));
         }
         item->setData(Qt::UserRole + 3, QVariant::fromValue(vtemplate->templatePath()));
     }
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.h
index e96dbda35..ef9d8d523 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateselectorwidget.h
@@ -72,7 +72,7 @@ class VehicleTemplateSelectorWidget : public QWidget {
 public:
     explicit VehicleTemplateSelectorWidget(QWidget *parent = 0);
     ~VehicleTemplateSelectorWidget();
-    void setTemplateInfo(int vehicleType, int vehicleSubType);
+    void setTemplateInfo(int vehicleType, int vehicleSubType, bool showTemplateControls);
     QJsonObject *selectedTemplate() const;
 public slots:
     void templateSelectionChanged();