Further cleanup

src/ui/MainWindow.cc

@@ -57,7 +57,6 @@ This file is part of the QGROUNDCONTROL project
 #include "MAVLinkDecoder.h"
 #include "QGCMAVLinkMessageSender.h"
 #include "QGCRGBDView.h"
-#include "QGCFirmwareUpdate.h"
 #include "QGCStatusBar.h"
 #include "UASQuickView.h"
 #include "QGCDataPlot2D.h"
@@ -1414,8 +1413,9 @@ void MainWindow::connectCommonActions()
     perspectives->addAction(ui.actionMissionView);
     //perspectives->addAction(ui.actionConfiguration_2);
     perspectives->addAction(ui.actionHardwareConfig);
-    perspectives->addAction(ui.actionSoftwareConfig);
-    perspectives->addAction(ui.actionFirmwareUpdateView);
+    if (getCustomMode() == CUSTOM_MODE_APM) {
+        perspectives->addAction(ui.actionSoftwareConfig);
+    }
     perspectives->addAction(ui.actionTerminalView);
     perspectives->addAction(ui.actionUnconnectedView);
     perspectives->setExclusive(true);
@@ -2027,9 +2027,9 @@ void MainWindow::loadViewState()
         case VIEW_MAVLINK:
             centerStack->setCurrentWidget(mavlinkView);
             break;
-        case VIEW_FIRMWAREUPDATE:
-            centerStack->setCurrentWidget(firmwareUpdateWidget);
-            break;
+//        case VIEW_FIRMWAREUPDATE:
+//            centerStack->setCurrentWidget(firmwareUpdateWidget);
+//            break;
         case VIEW_MISSION:
             centerStack->setCurrentWidget(plannerView);
             break;
@@ -2190,17 +2190,6 @@ void MainWindow::loadMAVLinkView()
     }
 }
 
-void MainWindow::loadFirmwareUpdateView()
-{
-    if (currentView != VIEW_FIRMWAREUPDATE)
-    {
-        storeViewState();
-        currentView = VIEW_FIRMWAREUPDATE;
-        ui.actionFirmwareUpdateView->setChecked(true);
-        loadViewState();
-    }
-}
-
 //void MainWindow::loadDataView(QString fileName)
 //{
 //    // Plot is now selected, now load data from file

src/ui/MainWindow.h

@@ -240,8 +240,6 @@ public slots:
     void loadOperatorView();
     /** @brief Load MAVLink XML generator view */
     void loadMAVLinkView();
-    /** @brief Load firmware update view */
-    void loadFirmwareUpdateView();
     /** @brief Load Terminal Console views */
     void loadTerminalView();
 

src/ui/px4_configuration/QGCPX4AirframeConfig.cc

@@ -23,33 +23,33 @@ QGCPX4AirframeConfig::QGCPX4AirframeConfig(QWidget *parent) :
     ui->planeComboBox->addItem(tr("Hobbyking Bixler 1/2"), 101);
 
     connect(ui->planePushButton, SIGNAL(clicked()), this, SLOT(planeSelected()));
-    connect(ui->planeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(planeSelected(int)));
+    connect(ui->planeComboBox, SIGNAL(activated(int)), this, SLOT(planeSelected(int)));
 
     ui->flyingWingComboBox->addItem(tr("Bormatec Camflyer Q"), 30);
     ui->flyingWingComboBox->addItem(tr("Phantom FPV"), 31);
 
     connect(ui->flyingWingPushButton, SIGNAL(clicked()), this, SLOT(flyingWingSelected()));
-    connect(ui->flyingWingComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(flyingWingSelected(int)));
+    connect(ui->flyingWingComboBox, SIGNAL(activated(int)), this, SLOT(flyingWingSelected(int)));
 
     ui->quadXComboBox->addItem(tr("Standard 10\" Quad"), 1);
     ui->quadXComboBox->addItem(tr("DJI F330 8\" Quad"), 10);
     ui->quadXComboBox->addItem(tr("Turnigy Talon v2 X550 Quad"), 666);
 
     connect(ui->quadXPushButton, SIGNAL(clicked()), this, SLOT(quadXSelected()));
-    connect(ui->quadXComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(quadXSelected(int)));
+    connect(ui->quadXComboBox, SIGNAL(activated(int)), this, SLOT(quadXSelected(int)));
 
     connect(ui->quadPlusPushButton, SIGNAL(clicked()), this, SLOT(quadPlusSelected()));
-    connect(ui->quadPlusComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(quadPlusSelected(int)));
+    connect(ui->quadPlusComboBox, SIGNAL(activated(int)), this, SLOT(quadPlusSelected(int)));
 
-    connect(ui->hexaXComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(hexaXSelected(int)));
+    connect(ui->hexaXComboBox, SIGNAL(activated(int)), this, SLOT(hexaXSelected(int)));
 
-    connect(ui->hexaPlusComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(hexaPlusSelected(int)));
+    connect(ui->hexaPlusComboBox, SIGNAL(activated(int)), this, SLOT(hexaPlusSelected(int)));
 
-    connect(ui->octoXComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(octoXSelected(int)));
+    connect(ui->octoXComboBox, SIGNAL(activated(int)), this, SLOT(octoXSelected(int)));
 
-    connect(ui->octoPlusComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(octoPlusSelected(int)));
+    connect(ui->octoPlusComboBox, SIGNAL(activated(int)), this, SLOT(octoPlusSelected(int)));
 
-    connect(ui->hComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(hSelected(int)));
+    connect(ui->hComboBox, SIGNAL(activated(int)), this, SLOT(hSelected(int)));
 
     ui->hComboBox->addItem(tr("TBS Discovery"), 15);
     ui->hComboBox->addItem(tr("H Custom"), 16);