Fixes, working on uploading story

qgroundcontrol.pro

@@ -146,13 +146,16 @@ include(src/apps/mavlinkgen/mavlinkgen.pri)
 exists(qupgrade) {
     SOURCES += qupgrade/src/apps/qupgrade/qgcfirmwareupgradeworker.cpp \
                qupgrade/src/apps/qupgrade/uploader.cpp \
-               qupgrade/src/apps/qupgrade/dialog_bare.cpp
+               qupgrade/src/apps/qupgrade/dialog_bare.cpp \
+               qupgrade/src/apps/qupgrade/boardwidget.cpp
 
     HEADERS += qupgrade/src/apps/qupgrade/qgcfirmwareupgradeworker.h \
                qupgrade/src/apps/qupgrade/uploader.h \
-               qupgrade/src/apps/qupgrade/dialog_bare.h
+               qupgrade/src/apps/qupgrade/dialog_bare.h \
+               qupgrade/src/apps/qupgrade/boardwidget.h
 
-    FORMS += qupgrade/src/apps/qupgrade/dialog_bare.ui
+    FORMS += qupgrade/src/apps/qupgrade/dialog_bare.ui \
+             qupgrade/src/apps/qupgrade/boardwidget.ui
 
     linux*:CONFIG += qesp_linux_udev
 

src/ui/MainWindow.cc

@@ -1456,11 +1456,6 @@ void MainWindow::connectCommonActions()
         ui.actionSoftwareConfig->setChecked(true);
         ui.actionSoftwareConfig->activate(QAction::Trigger);
     }
-    if (currentView == VIEW_FIRMWAREUPDATE)
-    {
-        ui.actionFirmwareUpdateView->setChecked(true);
-        ui.actionFirmwareUpdateView->activate(QAction::Trigger);
-    }
     if (currentView == VIEW_TERMINAL)
     {
         ui.actionTerminalView->setChecked(true);
@@ -1509,7 +1504,6 @@ void MainWindow::connectCommonActions()
         connect(ui.actionTerminalView,SIGNAL(triggered()),this,SLOT(loadTerminalView()));
     }
 
-    connect(ui.actionFirmwareUpdateView, SIGNAL(triggered()), this, SLOT(loadFirmwareUpdateView()));
     connect(ui.actionMavlinkView, SIGNAL(triggered()), this, SLOT(loadMAVLinkView()));
 
     // Help Actions