Merge branch 'master' into issue1182

Conflicts:
	src/QGCApplication.cc
	src/QGCFileDialog.cc
	src/QGCFileDialog.h
	src/ui/MainWindow.cc
	src/ui/QGCBaseParamWidget.cc
	src/ui/WaypointList.cc
	src/ui/designer/QGCToolWidget.cc
	src/ui/linechart/LinechartWidget.cc

Merging master
Applied changes to file open/save dialogs.

files/pixhawk/hexarotor/widgets/mavconn.qgw

-[MAVCONN%20Control]
-QGC_TOOL_WIDGET_ITEMS\1\TYPE=COMMANDBUTTON
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_DESCRIPTION=DO: Control Video
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_BUTTONTEXT=CAPTURE
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_COMMANDID=200
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAMS_VISIBLE=false
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM1=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM2=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM3=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM4=2
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM5=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM6=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM7=0
-QGC_TOOL_WIDGET_ITEMS\2\TYPE=COMMANDBUTTON
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_DESCRIPTION=DO: Control Video
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_BUTTONTEXT=STOP
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_COMMANDID=200
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAMS_VISIBLE=false
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM1=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM2=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM3=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM4=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM5=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM6=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM7=0
-QGC_TOOL_WIDGET_ITEMS\3\TYPE=COMMANDBUTTON
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_DESCRIPTION=PREFLIGHT: Calibration
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_BUTTONTEXT=CALIBRATE
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_COMMANDID=241
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAMS_VISIBLE=false
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM1=1
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM2=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM3=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM4=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM5=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM6=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM7=0
-QGC_TOOL_WIDGET_ITEMS\4\TYPE=SLIDER
-QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_DESCRIPTION=Setpoint ON<->OFF
-QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_PARAMID=
-QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_COMPONENTID=0
-QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_MIN=1
-QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_MAX=0
-QGC_TOOL_WIDGET_ITEMS\5\TYPE=SLIDER
-QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_DESCRIPTION=Glob. Loc ON<->OFF
-QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_PARAMID=
-QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_COMPONENTID=0
-QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_MIN=1
-QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_MAX=0
-QGC_TOOL_WIDGET_ITEMS\6\TYPE=SLIDER
-QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_DESCRIPTION=GPS ENU HL<->ASL
-QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_PARAMID=
-QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_COMPONENTID=0
-QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_MIN=0
-QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_MAX=1
-QGC_TOOL_WIDGET_ITEMS\7\TYPE=SLIDER
-QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_DESCRIPTION=Yaw PX<->ASL
-QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_PARAMID=
-QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_COMPONENTID=0
-QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_MIN=0
-QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_MAX=1
-QGC_TOOL_WIDGET_ITEMS\size=7

files/pixhawk/quadrotor/parameter_tooltips/tooltips.txt

-EEPROM,variable name,Min,Max,Default,Multiplier,Enabled (0 = no, 1 = yes),Comment
-HDNG2RLL_P, 0, 5, 0.7, 1, 1, NAV_ROLL_P - Navigation control gains. Tuning values for the navigation control PID loops. The P term is the primary tuning value. This determines how the control deflection varies in proportion to the required correction.
-SYS_TYPE, 0, 15, 1, 1, 1, System type (airframe)
\ No newline at end of file

files/pixhawk/quadrotor/widgets/mavconn.qgw

-[MAVCONN%20Control]
-QGC_TOOL_WIDGET_ITEMS\1\TYPE=COMMANDBUTTON
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_DESCRIPTION=START Recording
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_BUTTONTEXT=CAPTURE
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_COMMANDID=200
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAMS_VISIBLE=false
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM1=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM2=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM3=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM4=2
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM5=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM6=0
-QGC_TOOL_WIDGET_ITEMS\1\QGC_COMMAND_BUTTON_PARAM7=0
-QGC_TOOL_WIDGET_ITEMS\2\TYPE=COMMANDBUTTON
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_DESCRIPTION=STOP Recording
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_BUTTONTEXT=STOP
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_COMMANDID=200
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAMS_VISIBLE=false
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM1=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM2=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM3=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM4=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM5=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM6=0
-QGC_TOOL_WIDGET_ITEMS\2\QGC_COMMAND_BUTTON_PARAM7=0
-QGC_TOOL_WIDGET_ITEMS\3\TYPE=COMMANDBUTTON
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_DESCRIPTION=PREFLIGHT: Calibration
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_BUTTONTEXT=CALIBRATE
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_COMMANDID=241
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAMS_VISIBLE=false
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM1=1
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM2=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM3=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM4=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM5=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM6=0
-QGC_TOOL_WIDGET_ITEMS\3\QGC_COMMAND_BUTTON_PARAM7=0
-QGC_TOOL_WIDGET_ITEMS\size=3

files/px4/parameter_tooltips/tooltips.txt

-^ Name            ^ Min    ^ Max    ^ Default  ^ Multiplier  ^ Enabled ^  Comment ^
-| BAT_V_EMPTY     | 0.9    | 100.0  | 3.2      | 1           | 1       | Voltage of an empty battery cell  |
-| BAT_V_FULL      | 1.0    | 200.0  | 4.05     | 1           | 1       | Voltage of a full battery cell    |
-| BAT_N_CELLS     | 1      | 100    | 3        | 1           | 1       | Number of SERIAL battery cells. Typically this ranges from 2S to 6S in small-scale UAVs  |
-| BAT_V_SCALING   | 0.001  | 1.0    | 0.00838  | 1           | 1       | Conversion from ADC ticks to battery voltage. Depends on the connected board, calibrate with a multimeter.  |
-| MC_ATTRATE_P    | 0.0    | 20.0   | 0.20     | 1           | 1       | Multirotor attitude rate control P gain. This gain controls how much of the motor thrust should be used to control angular velocity. A larger number will increase the control response, but will make the system also more twitchy. |
-| MC_ATTRATE_D    | 0.0    | 20.0   | 0.05     | 1           | 1       | Multirotor attitude rate control D gain. A large value will allow to damp oscillations due to a high P gain, but will make the system response suspectible to noise.|
-| MC_ATT_P    | 0.0    | 20.0   | 0.20     | 1           | 1       | Multirotor attitude control proportional (P) gain. This defines how strong the response of the system will be to an attitude error|
-| MC_ATT_D    | 0.0    | 20.0   | 0.05     | 1           | 1       | Multirotor attitude control D gain. A large value will allow to damp oscillations due to a high P gain, but will make the system response suspectible to noise.|
-| FW_ROLLRATE_P    | 0.0    | 20.0   | 0.30     | 1           | 1       | Fixed wing roll rate control P gain. This gain controls how strong the ailerons or rudder should be actuated in order to achieve a certain roll rate. A larger number will increase the control response, but will make the system also more twitchy. |
-| FW_HEADING_P    | 0.0    | 20.0   | 4.00     | 1           | 1       | Fixed wing heading error to bank angle gain |
\ No newline at end of file

qgroundcontrol.pro

@@ -452,7 +452,6 @@ HEADERS += \
     src/ui/QGCHilFlightGearConfiguration.h \
     src/ui/QGCHilJSBSimConfiguration.h \
     src/ui/QGCHilXPlaneConfiguration.h \
-    src/ui/submainwindow.h \
     src/ui/uas/UASQuickView.h \
     src/ui/uas/UASQuickViewItem.h \
     src/ui/linechart/ChartPlot.h \
@@ -481,7 +480,6 @@ HEADERS += \
     src/ui/px4_configuration/PX4Bootloader.h \
     src/ui/px4_configuration/PX4FirmwareUpgradeThread.h \
     src/ui/px4_configuration/PX4FirmwareUpgrade.h \
-    src/ui/menuactionhelper.h \
     src/uas/UASManagerInterface.h \
     src/uas/QGCUASParamManagerInterface.h \
     src/uas/QGCUASFileManager.h \
@@ -497,7 +495,8 @@ HEADERS += \
     src/QGCPalette.h \
     src/QGCQmlWidgetHolder.h \
     src/ui/QGCParamTreeWidget.h \
-    src/ui/QGCMapRCToParamDialog.h
+    src/ui/QGCMapRCToParamDialog.h \
+    src/QGCDockWidget.h \
 
 SOURCES += \
     src/main.cc \
@@ -598,7 +597,6 @@ SOURCES += \
     src/ui/QGCHilFlightGearConfiguration.cc \
     src/ui/QGCHilJSBSimConfiguration.cc \
     src/ui/QGCHilXPlaneConfiguration.cc \
-    src/ui/submainwindow.cpp \
     src/ui/uas/UASQuickViewItem.cc \
     src/ui/uas/UASQuickView.cc \
     src/ui/linechart/ChartPlot.cc \
@@ -627,7 +625,6 @@ SOURCES += \
     src/ui/px4_configuration/PX4Bootloader.cc \
     src/ui/px4_configuration/PX4FirmwareUpgradeThread.cc \
     src/ui/px4_configuration/PX4FirmwareUpgrade.cc \
-    src/ui/menuactionhelper.cpp \
     src/uas/QGCUASFileManager.cc \
     src/ui/QGCUASFileView.cc \
     src/CmdLineOptParser.cc \
@@ -640,7 +637,8 @@ SOURCES += \
     src/QGCPalette.cc \
     src/QGCQmlWidgetHolder.cpp \
     src/ui/QGCParamTreeWidget.cpp \
-    src/ui/QGCMapRCToParamDialog.cpp
+    src/ui/QGCMapRCToParamDialog.cpp \
+    src/QGCDockWidget.cc \
 
 #
 # Unit Test specific configuration goes here

src/QGCApplication.cc

@@ -476,15 +476,12 @@ void QGCApplication::criticalMessageBoxOnMainThread(const QString& title, const
 
 void QGCApplication::saveTempFlightDataLogOnMainThread(QString tempLogfile)
 {
-    QString defaultSuffix("mavlink");
     QString saveFilename = QGCFileDialog::getSaveFileName(
         MainWindow::instance(),
-        tr("Select file to save Flight Data Log"),
+        tr("Save Flight Data Log"),
         qgcApp()->mavlinkLogFilesLocation(),
         tr("Flight Data Log (*.mavlink)"),
-        0,0,
-        &defaultSuffix,
-        true);
+        "mavlink");
     if (!saveFilename.isEmpty()) {
         QFile::copy(tempLogfile, saveFilename);
     }

src/QGCConfig.h

@@ -12,7 +12,7 @@
 
 // If you need to make an incompatible changes to stored settings, bump this version number
 // up by 1. This will caused store settings to be cleared on next boot.
-#define QGC_SETTINGS_VERSION 2
+#define QGC_SETTINGS_VERSION 3
 
 #define QGC_APPLICATION_NAME "QGroundControl"
 #define QGC_ORG_NAME "QGroundControl.org"

src/QGCDockWidget.cc

+/*=====================================================================
+ 
+ QGroundControl Open Source Ground Control Station
+ 
+ (c) 2009 - 2014 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ 
+ This file is part of the QGROUNDCONTROL project
+ 
+ QGROUNDCONTROL is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ 
+ QGROUNDCONTROL is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+ 
+ ======================================================================*/
+
+#include "QGCDockWidget.h"
+
+#include <QCloseEvent>
+
+QGCDockWidget::QGCDockWidget(const QString& title, QWidget *parent, Qt::WindowFlags flags) :
+    QDockWidget(title, parent, flags)
+{
+    
+}
+
+// Instead of destroying the widget just hide it
+void QGCDockWidget::closeEvent(QCloseEvent* event)
+{
+    event->ignore();
+    setVisible(false);
+}

src/QGCDockWidget.h

+/*=====================================================================
+ 
+ QGroundControl Open Source Ground Control Station
+ 
+ (c) 2009 - 2014 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ 
+ This file is part of the QGROUNDCONTROL project
+ 
+ QGROUNDCONTROL is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ 
+ QGROUNDCONTROL is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+ 
+ ======================================================================*/
+
+#ifndef QGCDockWidget_h
+#define QGCDockWidget_h
+
+#include <QDockWidget>
+
+/// @file
+///     @brief Subclass of QDockWidget so we can intercept the closeEvent.
+///
+///     @author Don Gagne <don@thegagnes.com>
+
+class QGCDockWidget : public QDockWidget {
+    Q_OBJECT
+    
+public:
+    QGCDockWidget(const QString& title, QWidget *parent = 0, Qt::WindowFlags flags = 0);
+
+    void closeEvent(QCloseEvent* event);
+};
+
+
+#endif

src/QGCFileDialog.cc

@@ -35,7 +35,7 @@ QString QGCFileDialog::getExistingDirectory(
     const QString& dir,
     Options options)
 {
-    _validate(NULL, options);
+    _validate(options);
     
 #ifdef QT_DEBUG
     if (qgcApp()->runningUnitTests()) {
@@ -52,18 +52,17 @@ QString QGCFileDialog::getOpenFileName(
     const QString& caption,
     const QString& dir,
     const QString& filter,
-    QString* selectedFilter,
     Options options)
 {
-    _validate(selectedFilter, options);
+    _validate(options);
     
 #ifdef QT_DEBUG
     if (qgcApp()->runningUnitTests()) {
-        return UnitTest::_getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
+        return UnitTest::_getOpenFileName(parent, caption, dir, filter, options);
     } else
 #endif
     {
-        return QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options);
+        return QFileDialog::getOpenFileName(parent, caption, dir, filter, NULL, options);
     }
 }
 
@@ -72,49 +71,49 @@ QStringList QGCFileDialog::getOpenFileNames(
     const QString& caption,
     const QString& dir,
     const QString& filter,
-    QString* selectedFilter,
     Options options)
 {
-    _validate(selectedFilter, options);
+    _validate(options);
     
 #ifdef QT_DEBUG
     if (qgcApp()->runningUnitTests()) {
-        return UnitTest::_getOpenFileNames(parent, caption, dir, filter, selectedFilter, options);
+        return UnitTest::_getOpenFileNames(parent, caption, dir, filter, options);
     } else
 #endif
     {
-        return QFileDialog::getOpenFileNames(parent, caption, dir, filter, selectedFilter, options);
+        return QFileDialog::getOpenFileNames(parent, caption, dir, filter, NULL, options);
     }
 }
 
-QString QGCFileDialog::getSaveFileName(QWidget* parent,
+QString QGCFileDialog::getSaveFileName(
+    QWidget* parent,
     const QString& caption,
     const QString& dir,
     const QString& filter,
-    QString* selectedFilter,
-    Options options,
-    QString* defaultSuffix,
-    bool strict)
+    const QString& defaultSuffix,
+    bool strict,
+    Options options)
 {
-    _validate(selectedFilter, options);
+    _validate(options);
 
 #ifdef QT_DEBUG
     if (qgcApp()->runningUnitTests()) {
-        return UnitTest::_getSaveFileName(parent, caption, dir, filter, selectedFilter, options, defaultSuffix);
+        return UnitTest::_getSaveFileName(parent, caption, dir, filter, defaultSuffix, options);
     } else
 #endif
     {
+        QString defaultSuffixCopy(defaultSuffix);
         QFileDialog dlg(parent, caption, dir, filter);
         dlg.setAcceptMode(QFileDialog::AcceptSave);
         if (options) {
             dlg.setOptions(options);
         }
-        if (defaultSuffix) {
+        if (!defaultSuffixCopy.isEmpty()) {
             //-- Make sure dot is not present
-            if (defaultSuffix->startsWith(".")) {
-                defaultSuffix->remove(0,1);
+            if (defaultSuffixCopy.startsWith(".")) {
+                defaultSuffixCopy.remove(0,1);
             }
-            dlg.setDefaultSuffix(*defaultSuffix);
+            dlg.setDefaultSuffix(defaultSuffixCopy);
         }
         while (true) {
             if (dlg.exec()) {
@@ -131,16 +130,15 @@ QString QGCFileDialog::getSaveFileName(QWidget* parent,
                             return result;
                         }
                         //-- Do we have a default extension?
-                        QString localDefaultSuffix;
-                        if (!defaultSuffix) {
+                        if (defaultSuffixCopy.isEmpty()) {
                             //-- We don't, so get the first one in the filter
-                            localDefaultSuffix = _getFirstExtensionInFilter(filter);
-                            defaultSuffix = &localDefaultSuffix;
+                            defaultSuffixCopy = _getFirstExtensionInFilter(filter);
                         }
-                        Q_ASSERT(defaultSuffix->isEmpty() == false);
+                        //-- If this is set to strict, we have to have a default extension
+                        Q_ASSERT(defaultSuffixCopy.isEmpty() == false);
                         //-- Forcefully append our desired extension
                         result += ".";
-                        result += *defaultSuffix;
+                        result += defaultSuffixCopy;
                         //-- Check and see if this new file already exists
                         fi.setFile(result);
                         if (fi.exists()) {
@@ -203,17 +201,13 @@ QString QGCFileDialog::_getFirstExtensionInFilter(const QString& filter) {
 }
 
 /// @brief Validates and updates the parameters for the file dialog calls
-void QGCFileDialog::_validate(QString* selectedFilter, Options& options)
+void QGCFileDialog::_validate(Options& options)
 {
     // You can't use QGCFileDialog if QGCApplication is not created yet.
     Q_ASSERT(qgcApp());
     
     Q_ASSERT_X(QThread::currentThread() == qgcApp()->thread(), "Threading issue", "QGCFileDialog can only be called from main thread");
     
-    // Support for selectedFilter is not yet implemented through the unit test framework
-    Q_UNUSED(selectedFilter);
-    Q_ASSERT(selectedFilter == NULL);
-    
     // On OSX native dialog can hang so we always use Qt dialogs
     options |= DontUseNativeDialog;
     

src/QGCFileDialog.h

@@ -31,10 +31,21 @@
 ///     @author Don Gagne <don@thegagnes.com>
 
 /*!
-     Subclass of <a href="http://qt-project.org/doc/qt-5/qfiledialog.html">QFileDialog</a> which re-implements the static public functions. The reason for this
-     is that the <a href="http://qt-project.org/doc/qt-5/qfiledialog.html">QFileDialog</a> implementations of these use the native os dialogs. On OSX these
-     these can intermittently hang. So instead here we use the native dialogs. It also allows
-     use to catch these dialogs for unit testing.
+    Subclass of <a href="http://qt-project.org/doc/qt-5/qfiledialog.html">QFileDialog</a> which re-implements the static public functions. The reason for this
+    is that the <a href="http://qt-project.org/doc/qt-5/qfiledialog.html">QFileDialog</a> implementations of these use the native os dialogs. On OSX these
+    these can intermittently hang. So instead here we use the native dialogs. It also allows
+    use to catch these dialogs for unit testing.
+    @remark If you need to know what type of file was returned by these functions, you can use something like:
+    @code{.cpp}
+    QString filename = QGCFileDialog::getSaveFileName(this, tr("Save File"), "~/", "Foo files (*.foo);;All Files (*.*)", "foo");
+    if (!filename.isEmpty()) {
+        QFileInfo fi(filename);
+        QString fileExtension(fi.suffix());
+        if (fileExtension == QString("foo")) {
+            // do something
+        }
+    }
+    @endcode
 */
 
 class QGCFileDialog : public QFileDialog {
@@ -62,7 +73,6 @@ public:
       @param[in] caption The caption displayed at the top of the dialog.
       @param[in] dir The initial directory shown to the user.
       @param[in] filter The filter used for selecting the file type.
-      @param[out] selectedFilter **NOT IMPLEMENTED - Set to NULL** Returns the filter that the user selected in the file dialog.
       @param[in] options Set the various options that affect the look and feel of the dialog.
       @return The full path and filename to be opened or \c QString("") if none.
       @sa <a href="http://qt-project.org/doc/qt-5/qfiledialog.html#getOpenFileName">QFileDialog::getOpenFileName()</a>
@@ -72,7 +82,6 @@ public:
         const QString& caption = QString(),
         const QString& dir = QString(),
         const QString& filter = QString(),
-        QString* selectedFilter = 0,
         Options options = 0);
     
     //! Static helper that invokes a File Open dialog where the user can select one or more files to be opened.
@@ -81,7 +90,6 @@ public:
       @param[in] caption The caption displayed at the top of the dialog.
       @param[in] dir The initial directory shown to the user.
       @param[in] filter The filter used for selecting the file type.
-      @param[out] selectedFilter **NOT IMPLEMENTED - Set to NULL** Returns the filter that the user selected in the file dialog.
       @param[in] options Set the various options that affect the look and feel of the dialog.
       @return A <a href="http://qt-project.org/doc/qt-5/qstringlist.html">QStringList</a> object containing zero or more files to be opened.
       @sa <a href="http://qt-project.org/doc/qt-5/qfiledialog.html#getOpenFileNames">QFileDialog::getOpenFileNames()</a>
@@ -91,7 +99,6 @@ public:
         const QString& caption = QString(),
         const QString& dir = QString(),
         const QString& filter = QString(),
-        QString* selectedFilter = 0,
         Options options = 0);
     
     //! Static helper that invokes a File Save dialog where the user can select a directory and enter a filename to be saved.
@@ -100,10 +107,9 @@ public:
       @param[in] caption The caption displayed at the top of the dialog.
       @param[in] dir The initial directory shown to the user.
       @param[in] filter The filter used for selecting the file type.
-      @param[out] selectedFilter **NOT IMPLEMENTED - Set to NULL** Returns the filter that the user selected in the file dialog.
-      @param[in] options Set the various options that affect the look and feel of the dialog.
       @param[in] defaultSuffix Specifies a string that will be added to the filename if it has no suffix already. The suffix is typically used to indicate the file type (e.g. "txt" indicates a text file).
       @param[in] strict Makes the default suffix mandatory. Only files with those extensions will be allowed.
+      @param[in] options Set the various options that affect the look and feel of the dialog.
       @return The full path and filename to be used to save the file or \c QString("") if none.
       @sa <a href="http://qt-project.org/doc/qt-5/qfiledialog.html#getSaveFileName">QFileDialog::getSaveFileName()</a>
       @remark If a default suffix is given, it will be appended to the filename if the user does not enter one themselves. That is, if the user simply enters \e foo and the default suffix is set to \e bar,
@@ -114,18 +120,17 @@ public:
         const QString& caption = QString(),
         const QString& dir = QString(),
         const QString& filter = QString(),
-        QString* selectedFilter = 0,
-        Options options = 0,
-        QString* defaultSuffix = 0,
-        bool strict = false);
-    
+        const QString& defaultSuffix = QString(),
+        bool strict = false,
+        Options options = 0);
+
 private slots:
-    /// @brief The exec slot is private becasue when only want QGCFileDialog users to use the static methods. Otherwise it will break
-    ///         unit testing.
+    /// @brief The exec slot is private because we only want QGCFileDialog users to use the static methods. Otherwise it will break
+    ///        unit testing.
     int exec(void) { return QGCFileDialog::exec(); }
     
 private:
-    static void    _validate(QString* selectedFilter, Options& options);
+    static void    _validate(Options& options);
     static bool    _validateExtension(const QString& filter, const QString& extension);
     static QString _getFirstExtensionInFilter(const QString& filter);
 };

src/VehicleSetup/SetupView.cc

@@ -51,7 +51,7 @@ SetupView::SetupView(QWidget* parent) :
     
     setResizeMode(SizeRootObjectToView);
     
-    _setActiveUAS(NULL);
+    _setActiveUAS(UASManager::instance()->getActiveUAS());
 }
 
 SetupView::~SetupView()
@@ -120,7 +120,7 @@ void SetupView::_setConnectedView(void)
 
 void SetupView::_firmwareButtonClicked(void)
 {
-    if (_uasCurrent->isArmed()) {
+    if (_uasCurrent && _uasCurrent->isArmed()) {
         QGCMessageBox::warning("Setup", "Firmware Update cannot be performed while vehicle is armed.");
         return;
     }

src/qgcunittest/UnitTest.cc

@@ -273,10 +273,11 @@ QString UnitTest::_fileDialogResponseSingle(enum FileDialogType type)
     return retFile;
 }
 
-QString UnitTest::_getExistingDirectory(QWidget* parent,
-                                        const QString& caption,
-                                        const QString& dir,
-                                        QFileDialog::Options options)
+QString UnitTest::_getExistingDirectory(
+    QWidget* parent,
+    const QString& caption,
+    const QString& dir,
+    QFileDialog::Options options)
 {
     Q_UNUSED(parent);
     Q_UNUSED(caption);
@@ -286,12 +287,12 @@ QString UnitTest::_getExistingDirectory(QWidget* parent,
     return _fileDialogResponseSingle(getExistingDirectory);
 }
 
-QString UnitTest::_getOpenFileName(QWidget* parent,
-                                   const QString& caption,
-                                   const QString& dir,
-                                   const QString& filter,
-                                   QString* selectedFilter,
-                                   QFileDialog::Options options)
+QString UnitTest::_getOpenFileName(
+    QWidget* parent,
+    const QString& caption,
+    const QString& dir,
+    const QString& filter,
+    QFileDialog::Options options)
 {
     Q_UNUSED(parent);
     Q_UNUSED(caption);
@@ -299,18 +300,15 @@ QString UnitTest::_getOpenFileName(QWidget* parent,
     Q_UNUSED(filter);
     Q_UNUSED(options);
     
-    // Support for selectedFilter is not yet implemented
-    Q_ASSERT(selectedFilter == NULL);
-
     return _fileDialogResponseSingle(getOpenFileName);
 }
 
-QStringList UnitTest::_getOpenFileNames(QWidget* parent,
-                                        const QString& caption,
-                                        const QString& dir,
-                                        const QString& filter,
-                                        QString* selectedFilter,
-                                        QFileDialog::Options options)
+QStringList UnitTest::_getOpenFileNames(
+    QWidget* parent,
+    const QString& caption,
+    const QString& dir,
+    const QString& filter,
+    QFileDialog::Options options)
 {
     Q_UNUSED(parent);
     Q_UNUSED(caption);
@@ -318,9 +316,6 @@ QStringList UnitTest::_getOpenFileNames(QWidget* parent,
     Q_UNUSED(filter);
     Q_UNUSED(options);
 
-    // Support for selectedFilter is not yet implemented
-    Q_ASSERT(selectedFilter == NULL);
-
     QStringList retFiles;
     
     if (!_fileDialogResponseSet || _fileDialogExpectedType != getOpenFileNames) {
@@ -340,13 +335,13 @@ QStringList UnitTest::_getOpenFileNames(QWidget* parent,
     return retFiles;
 }
 
-QString UnitTest::_getSaveFileName(QWidget* parent,
-                                   const QString& caption,
-                                   const QString& dir,
-                                   const QString& filter,
-                                   QString* selectedFilter,
-                                   QFileDialog::Options options,
-                                   QString* defaultSuffix)
+QString UnitTest::_getSaveFileName(
+    QWidget* parent,
+    const QString& caption,
+    const QString& dir,
+    const QString& filter,
+    const QString& defaultSuffix,
+    QFileDialog::Options options)
 {
     Q_UNUSED(parent);
     Q_UNUSED(caption);
@@ -354,11 +349,9 @@ QString UnitTest::_getSaveFileName(QWidget* parent,
     Q_UNUSED(filter);
     Q_UNUSED(options);
 
-    if(defaultSuffix)
-        Q_ASSERT(defaultSuffix->startsWith(".") == false);
-
-    // Support for selectedFilter is not yet implemented
-    Q_ASSERT(selectedFilter == NULL);
+    if(!defaultSuffix.isEmpty()) {
+        Q_ASSERT(defaultSuffix.startsWith(".") == false);
+    }
 
     return _fileDialogResponseSingle(getSaveFileName);
 }

src/qgcunittest/UnitTest.h

@@ -118,33 +118,34 @@ private:
     
     // When the app is running in unit test mode the QGCFileDialog methods are re-routed here.
     
-    static QString _getExistingDirectory(QWidget* parent,
-                                         const QString& caption,
-                                         const QString& dir,
-                                         QFileDialog::Options options);
-    
-    static QString _getOpenFileName(QWidget* parent,
-                                    const QString& caption,
-                                    const QString& dir,
-                                    const QString& filter,
-                                    QString* selectedFilter,
-                                    QFileDialog::Options options);
-    
-    static QStringList _getOpenFileNames(QWidget* parent,
-                                         const QString& caption,
-                                         const QString& dir,
-                                         const QString& filter,
-                                         QString* selectedFilter,
-                                         QFileDialog::Options options);
-    
-    static QString _getSaveFileName(QWidget* parent,
-                                    const QString& caption,
-                                    const QString& dir,
-                                    const QString& filter,
-                                    QString* selectedFilter,
-                                    QFileDialog::Options options,
-                                    QString* defaultSuffix);
-    
+    static QString _getExistingDirectory(
+        QWidget* parent,
+        const QString& caption,
+        const QString& dir,
+        QFileDialog::Options options);
+    
+    static QString _getOpenFileName(
+        QWidget* parent,
+        const QString& caption,
+        const QString& dir,
+        const QString& filter,
+        QFileDialog::Options options);
+    
+    static QStringList _getOpenFileNames(
+        QWidget* parent,
+        const QString& caption,
+        const QString& dir,
+        const QString& filter,
+        QFileDialog::Options options);
+    
+    static QString _getSaveFileName(
+        QWidget* parent,
+        const QString& caption,
+        const QString& dir,
+        const QString& filter,
+        const QString& defaultSuffix,
+        QFileDialog::Options options);
+
     static QString _fileDialogResponseSingle(enum FileDialogType type);
 
     // This allows the private calls to the file dialog methods

src/ui/MainWindow.ui

@@ -62,7 +62,6 @@
     <addaction name="separator"/>
     <addaction name="actionMuteAudioOutput"/>
     <addaction name="actionSettings"/>
-    <addaction name="actionAdvanced_Mode"/>
     <addaction name="separator"/>
     <addaction name="actionExit"/>
    </widget>

src/ui/QGCBaseParamWidget.cc

@@ -105,17 +105,11 @@ void QGCBaseParamWidget::saveParametersToFile()
 {
     if (!mav)
         return;
-    QString defaultSuffix("params");
     QString fileName = QGCFileDialog::getSaveFileName(
-        this,
-        tr("Save Parameters"),
-        qgcApp()->savedParameterFilesLocation(),
-        tr("Parameter File (*.params)"),
-        0, 0,
-        &defaultSuffix,
-        true);
+        this, tr("Save Parameters"), qgcApp()->savedParameterFilesLocation(), tr("Parameter File (*.params)"), "params", true);