From 5b4fced5106d06df3d6ef9be148f3040da5cac81 Mon Sep 17 00:00:00 2001
From: ephy <ephy>
Date: Fri, 19 Mar 2010 15:23:36 +0000
Subject: [PATCH] GCS/coreplugin: Move creation of uavgadget modes to
 extensionsInitialized() + add index to IUAVGadget

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@336 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/plugins/coreplugin/coreplugin.cpp | 32 +++++++++++---------
 ground/src/plugins/coreplugin/iuavgadget.h   |  4 +++
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ground/src/plugins/coreplugin/coreplugin.cpp b/ground/src/plugins/coreplugin/coreplugin.cpp
index 43241cf29..dd155977d 100644
--- a/ground/src/plugins/coreplugin/coreplugin.cpp
+++ b/ground/src/plugins/coreplugin/coreplugin.cpp
@@ -62,27 +62,29 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
     Q_UNUSED(arguments)
     const bool success = m_mainWindow->init(errorMessage);
     if (success) {
-        UAVGadgetMode *uavGadgetMode;
-        UAVGadgetManager *m_uavGadgetManager = new UAVGadgetManager(CoreImpl::instance(), m_mainWindow);
-        m_uavGadgetManager->hide();
-        uavGadgetMode = new UAVGadgetMode(m_uavGadgetManager, QString("Mode 1"),
-                                            QIcon(":/core/images/openpilot_logo_64.png"), 80, QString("Mode1"));
-        m_uavGadgetManager->setUAVGadgetMode(uavGadgetMode);
-        m_uavGadgetModes.append(uavGadgetMode);
-        addObject(uavGadgetMode);
-        m_uavGadgetManager = new UAVGadgetManager(CoreImpl::instance(), m_mainWindow);
-        m_uavGadgetManager->hide();
-        uavGadgetMode = new UAVGadgetMode(m_uavGadgetManager, QString("Mode 2"),
-                                            QIcon(":/core/images/plus.png"), 60, QString("Mode2"));
-        m_uavGadgetManager->setUAVGadgetMode(uavGadgetMode);
-        m_uavGadgetModes.append(uavGadgetMode);
-        addObject(uavGadgetMode);
+        // nothing right now
     }
     return success;
 }
 
 void CorePlugin::extensionsInitialized()
 {
+    UAVGadgetMode *uavGadgetMode;
+    UAVGadgetManager *m_uavGadgetManager = new UAVGadgetManager(CoreImpl::instance(), m_mainWindow);
+    m_uavGadgetManager->hide();
+    uavGadgetMode = new UAVGadgetMode(m_uavGadgetManager, QString("Mode 1"),
+                                      QIcon(":/core/images/openpilot_logo_64.png"), 90, QString("Mode1"));
+    m_uavGadgetManager->setUAVGadgetMode(uavGadgetMode);
+    m_uavGadgetModes.append(uavGadgetMode);
+    addObject(uavGadgetMode);
+    m_uavGadgetManager = new UAVGadgetManager(CoreImpl::instance(), m_mainWindow);
+    m_uavGadgetManager->hide();
+    uavGadgetMode = new UAVGadgetMode(m_uavGadgetManager, QString("Mode 2"),
+                                      QIcon(":/core/images/plus.png"), 60, QString("Mode2"));
+    m_uavGadgetManager->setUAVGadgetMode(uavGadgetMode);
+    m_uavGadgetModes.append(uavGadgetMode);
+    addObject(uavGadgetMode);
+
     m_mainWindow->extensionsInitialized();
 }
 
diff --git a/ground/src/plugins/coreplugin/iuavgadget.h b/ground/src/plugins/coreplugin/iuavgadget.h
index dc11fcc16..c52ecda4c 100644
--- a/ground/src/plugins/coreplugin/iuavgadget.h
+++ b/ground/src/plugins/coreplugin/iuavgadget.h
@@ -53,6 +53,10 @@ public:
 //    virtual void loadConfiguration(QString ) = 0;
 //    virtual QStringList getConfigurationNames() = 0;
     virtual QWidget *toolBar() = 0;
+    virtual void setIndex(int index) { m_index = index; }
+    virtual int index() { return m_index; }
+private:
+    int m_index;
 };
 
 } // namespace Core