Custom plugin work

QGCCommon.pri

@@ -38,7 +38,6 @@ linux {
         equals(ANDROID_TARGET_ARCH, x86)  {
             CONFIG += Androidx86Build
             DEFINES += __androidx86__
-            DEFINES += QGC_DISABLE_UVC
             message("Android x86 build")
         } else {
             message("Android Arm build")
@@ -77,9 +76,10 @@ linux {
         error("Unsupported Qt version, 5.5.x or greater is required for iOS")
     }
     message("iOS build")
-    CONFIG += iOSBuild MobileBuild app_bundle
+    CONFIG  += iOSBuild MobileBuild app_bundle NoSerialBuild
     DEFINES += __ios__
     DEFINES += QGC_NO_GOOGLE_MAPS
+    DEFINES += NO_SERIAL_LINK
     QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
     QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 # Universal
     QMAKE_LFLAGS += -Wl,-no_pie

qgcresources.qrc

@@ -181,6 +181,7 @@
         <file alias="TrashDelete.svg">resources/TrashDelete.svg</file>
         <file alias="XDelete.svg">resources/XDelete.svg</file>
         <file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
+        <file alias="waves.svg">resources/waves.svg</file>
         <file>resources/icons/qgroundcontrol.ico</file>
     </qresource>
     <qresource prefix="/res/firmware">

qgroundcontrol.pro

@@ -503,7 +503,7 @@ contains(DEFINES, QGC_ENABLE_BLUETOOTH) {
     src/comm/BluetoothLink.h \
 }
 
-!iOSBuild {
+!NoSerialBuild {
 HEADERS += \
     src/comm/QGCSerialPortInfo.h \
     src/comm/SerialLink.h \
@@ -651,7 +651,7 @@ SOURCES += \
     src/comm/MockLinkMissionItemHandler.cc \
 }
 
-!iOSBuild {
+!NoSerialBuild {
 SOURCES += \
     src/comm/QGCSerialPortInfo.cc \
     src/comm/SerialLink.cc \

resources/waves.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M61.452,7.063c-0.11,0-0.323,0.015-0.33,0.016C32.528,9.599,9.732,32.398,7.227,61.027
+	c-0.002,0.02-0.018,0.282-0.019,0.306C7.207,61.351,7.2,61.496,7.2,61.559c0,1.848,1.498,3.346,3.346,3.346
+	c1.795,0,3.259-1.413,3.341-3.186l-0.002-0.001c2.179-25.436,22.389-45.714,47.777-47.968l0,0c1.696-0.107,3.051-1.479,3.131-3.181
+	c0.003-0.053,0.003-0.105,0.003-0.159C64.797,8.561,63.3,7.063,61.452,7.063z"/>
+<path class="st0" d="M61.456,20.364c-0.12,0-0.238,0.009-0.354,0.021c-0.002,0-0.048,0.004-0.052,0.005
+	c-21.451,2.476-38.521,19.918-40.563,40.773c0,0-0.026,0.274-0.026,0.416c0,1.848,1.498,3.346,3.346,3.346
+	c1.795,0,3.259-1.413,3.341-3.186c0.001-0.018,0.001-0.036,0.001-0.054c2.098-18.107,16.431-32.48,34.513-34.632v-0.016
+	c1.696-0.106,3.055-1.463,3.134-3.167c0.003-0.052,0.003-0.105,0.003-0.158C64.801,21.862,63.303,20.364,61.456,20.364z"/>
+<path class="st0" d="M61.452,33.719c-0.211,0-0.423,0.021-0.624,0.058c-13.781,2.338-24.693,13.295-26.965,27.101
+	c-0.008,0.037-0.013,0.074-0.02,0.11c-0.036,0.202-0.061,0.481-0.061,0.603c0,1.848,1.498,3.346,3.346,3.346
+	c0.133,0,0.264-0.008,0.392-0.023c1.563-0.182,2.797-1.443,2.939-3.018c0.004-0.049,0.027-0.27,0.033-0.306
+	c1.93-10.765,10.411-19.238,21.17-21.185c0,0,0.122-0.011,0.181-0.019c1.611-0.188,2.872-1.521,2.949-3.164
+	c0.003-0.053,0.003-0.105,0.003-0.159C64.797,35.217,63.3,33.719,61.452,33.719z"/>
+</svg>

src/FlightDisplay/FlightDisplayView.qml

@@ -34,7 +34,7 @@ QGCView {
     QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
 
     property var _activeVehicle:        QGroundControl.multiVehicleManager.activeVehicle
-    property bool _mainIsMap:           QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_mainIsMapKey,  true) : true
+    property bool _mainIsMap:           QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_mainIsMapKey,  QGroundControl.mainViewIsMap) : true
     property bool _isPipVisible:        QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_PIPVisibleKey, true) : false
 
     property real _roll:                _activeVehicle ? _activeVehicle.roll.value    : _defaultRoll

src/FlightDisplay/FlightDisplayViewWidgets.qml

@@ -140,10 +140,10 @@ Item {
     }
 
     QGCLabel {
-        id:         flyLabel
-        text:       qsTr("Fly")
-        color:      mapPal.text
-        visible:    !ScreenTools.isShortScreen
+        id:                         flyLabel
+        text:                       qsTr("Fly")
+        color:                      mapPal.text
+        visible:                    !ScreenTools.isShortScreen && _mainIsMap
         anchors.topMargin:          _toolButtonTopMargin
         anchors.horizontalCenter:   toolColumn.horizontalCenter
         anchors.top:                parent.top

src/FlightDisplay/VideoManager.cc

@@ -43,9 +43,24 @@ VideoManager::VideoManager(QGCApplication* app)
 {
     //-- Get saved settings
     QSettings settings;
+#if defined(NO_UDP_VIDEO) && defined(QGC_GST_STREAMING)
+    setVideoSource(settings.value(kVideoSourceKey, kRTSPStream).toString());
+#else
     setVideoSource(settings.value(kVideoSourceKey, kUDPStream).toString());
-    setUdpPort(settings.value(kVideoUDPPortKey, 5600).toUInt());
-    setRtspURL(settings.value(kVideoRTSPUrlKey, "rtsp://192.168.42.1:554/live").toString()); //-- Example RTSP URL
+#endif
+    //-- Check if core plugin defines its own video requirements
+    if(qgcApp()->qgcOptions()->definesVideo()) {
+        if(qgcApp()->qgcOptions()->videoUDPPort()) {
+            setUdpPort(qgcApp()->qgcOptions()->videoUDPPort());
+            setVideoSource(kUDPStream);
+        } else {
+            setVideoSource(kRTSPStream);
+            setRtspURL(qgcApp()->qgcOptions()->videoRSTPUrl());
+        }
+    } else {
+        setUdpPort(settings.value(kVideoUDPPortKey, 5600).toUInt());
+        setRtspURL(settings.value(kVideoRTSPUrlKey, "rtsp://192.168.42.1:554/live").toString()); //-- Example RTSP URL
+    }
     _init = true;
 #if defined(QGC_GST_STREAMING)
     _updateVideo();

src/QGCApplication.cc

@@ -87,7 +87,7 @@
 #include CUSTOMHEADER
 #endif
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     #include "SerialLink.h"
 #endif
 

src/QmlControls/QGroundControlQmlGlobal.cc

@@ -353,3 +353,68 @@ QMap<QString, FactMetaData*>& QGroundControlQmlGlobal::nameToMetaDataMap(void) {
 
     return map;
 }
+
+bool QGroundControlQmlGlobal::colapseSettings()
+{
+    return qgcApp()->qgcOptions()->colapseSettings();
+}
+
+bool QGroundControlQmlGlobal::mainViewIsMap()
+{
+    return qgcApp()->qgcOptions()->mainViewIsMap();
+}
+
+bool QGroundControlQmlGlobal::enableVirtualJoystick()
+{
+    return qgcApp()->qgcOptions()->enableVirtualJoystick();
+}
+
+bool QGroundControlQmlGlobal::enableAutoConnectOptions()
+{
+    return qgcApp()->qgcOptions()->enableAutoConnectOptions();
+}
+
+bool QGroundControlQmlGlobal::enableVideoSourceOptions()
+{
+    return qgcApp()->qgcOptions()->enableVideoSourceOptions();
+}
+
+bool QGroundControlQmlGlobal::hasCustomSettings()
+{
+    if(qgcApp()->customCorePlugin()) {
+        if(qgcApp()->customCorePlugin()->settingsQML()) {
+            return !qgcApp()->customCorePlugin()->settingsQML()->pageUrl().isEmpty();
+        }
+    }
+    return false;
+}
+
+QString QGroundControlQmlGlobal::customSettingsURL()
+{
+    if(qgcApp()->customCorePlugin()) {
+        if(qgcApp()->customCorePlugin()->settingsQML()) {
+            return qgcApp()->customCorePlugin()->settingsQML()->pageUrl();
+        }
+    }
+    return QString();
+}
+
+QString QGroundControlQmlGlobal::customSettingsTitle()
+{
+    if(qgcApp()->customCorePlugin()) {
+        if(qgcApp()->customCorePlugin()->settingsQML()) {
+            return qgcApp()->customCorePlugin()->settingsQML()->pageTitle();
+        }
+    }
+    return QString();
+}
+
+QString QGroundControlQmlGlobal::customSettingsLogoUrl()
+{
+    if(qgcApp()->customCorePlugin()) {
+        if(qgcApp()->customCorePlugin()->settingsQML()) {
+            return qgcApp()->customCorePlugin()->settingsQML()->pageIconUrl();
+        }
+    }
+    return QString();
+}

src/QmlControls/QGroundControlQmlGlobal.h

@@ -79,7 +79,6 @@ public:
     Q_PROPERTY(qreal                zOrderMapItems      READ zOrderMapItems         CONSTANT) ///< z order value for map items, for example: mission item indicators
 
     // Various QGC settings exposed to Qml
-    Q_PROPERTY(bool     isAdvancedMode          READ isAdvancedMode                                                 CONSTANT)                               ///< Global "Advance Mode" preference. Certain UI elements and features are different based on this.
     Q_PROPERTY(bool     isDarkStyle             READ isDarkStyle                WRITE setIsDarkStyle                NOTIFY isDarkStyleChanged)              // TODO: Should be in ScreenTools?
     Q_PROPERTY(bool     isAudioMuted            READ isAudioMuted               WRITE setIsAudioMuted               NOTIFY isAudioMutedChanged)
     Q_PROPERTY(bool     isSaveLogPrompt         READ isSaveLogPrompt            WRITE setIsSaveLogPrompt            NOTIFY isSaveLogPromptChanged)
@@ -87,6 +86,20 @@ public:
     Q_PROPERTY(bool     virtualTabletJoystick   READ virtualTabletJoystick      WRITE setVirtualTabletJoystick      NOTIFY virtualTabletJoystickChanged)
     Q_PROPERTY(qreal    baseFontPointSize       READ baseFontPointSize          WRITE setBaseFontPointSize          NOTIFY baseFontPointSizeChanged)
 
+    //-------------------------------------------------------------------------
+    //-- Options that can be set by plugins
+    Q_PROPERTY(bool     colapseSettings                 READ colapseSettings            CONSTANT)
+    Q_PROPERTY(bool     mainViewIsMap                   READ mainViewIsMap              CONSTANT)
+    Q_PROPERTY(bool     enableVirtualJoystick           READ enableVirtualJoystick      CONSTANT)
+    Q_PROPERTY(bool     enableAutoConnectOptions        READ enableAutoConnectOptions   CONSTANT)
+    Q_PROPERTY(bool     enableVideoSourceOptions        READ enableVideoSourceOptions   CONSTANT)
+
+    Q_PROPERTY(bool     hasCustomSettings               READ hasCustomSettings          CONSTANT)
+    Q_PROPERTY(QString  customSettingsURL               READ customSettingsURL          CONSTANT)
+    Q_PROPERTY(QString  customSettingsTitle             READ customSettingsTitle        CONSTANT)
+    Q_PROPERTY(QString  customSettingsLogoUrl           READ customSettingsLogoUrl      CONSTANT)
+
+    //-------------------------------------------------------------------------
     // MavLink Protocol
     Q_PROPERTY(bool     isVersionCheckEnabled   READ isVersionCheckEnabled      WRITE setIsVersionCheckEnabled      NOTIFY isVersionCheckEnabledChanged)
     Q_PROPERTY(int      mavlinkSystemID         READ mavlinkSystemID            WRITE setMavlinkSystemID            NOTIFY mavlinkSystemIDChanged)
@@ -185,6 +198,16 @@ public:
     bool    isVersionCheckEnabled   () { return _toolbox->mavlinkProtocol()->versionCheckEnabled(); }
     int     mavlinkSystemID         () { return _toolbox->mavlinkProtocol()->getSystemId(); }
 
+    bool    colapseSettings         ();
+    bool    mainViewIsMap           ();
+    bool    enableVirtualJoystick   ();
+    bool    enableAutoConnectOptions();
+    bool    enableVideoSourceOptions();
+    bool    hasCustomSettings       ();
+    QString customSettingsTitle     ();
+    QString customSettingsURL       ();
+    QString customSettingsLogoUrl   ();
+
     QGeoCoordinate lastKnownHomePosition() { return qgcApp()->lastKnownHomePosition(); }
 
     static Fact* offlineEditingFirmwareType     (void);
@@ -196,9 +219,6 @@ public:
     static Fact* speedUnits                     (void);
     static Fact* batteryPercentRemainingAnnounce(void);
 
-    //-- TODO: Make this into an actual preference.
-    bool    isAdvancedMode          () { return false; }
-
     void    setIsDarkStyle              (bool dark);
     void    setIsAudioMuted             (bool muted);
     void    setIsSaveLogPrompt          (bool prompt);

src/Vehicle/Vehicle.cc

@@ -933,7 +933,7 @@ void Vehicle::_sendMessageOnLink(LinkInterface* link, mavlink_message_t message)
 /// @return Direct usb connection link to board if one, NULL if none
 LinkInterface* Vehicle::priorityLink(void)
 {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     foreach (LinkInterface* link, _links) {
         if (link->isConnected()) {
             SerialLink* pSerialLink = qobject_cast<SerialLink*>(link);

src/VehicleSetup/SetupView.qml

@@ -257,6 +257,33 @@ Rectangle {
             }
 
             SubMenuButton {
+                imageResource:  "/res/gear-white.svg"
+                setupIndicator: false
+                exclusiveGroup: setupButtonGroup
+                text:           "General"
+                visible:        QGroundControl.colapseSettings
+                onClicked:      panelLoader.setSource("GeneralSettings.qml")
+            }
+
+            SubMenuButton {
+                imageResource:  QGroundControl.customSettingsLogoUrl
+                setupIndicator: false
+                exclusiveGroup: setupButtonGroup
+                text:           QGroundControl.customSettingsTitle
+                visible:        QGroundControl.colapseSettings && QGroundControl.hasCustomSettings
+                onClicked:      panelLoader.setSource(QGroundControl.customSettingsURL)
+            }
+
+            SubMenuButton {
+                imageResource:  "/res/waves.svg"
+                setupIndicator: false
+                exclusiveGroup: setupButtonGroup
+                text:           "MAVLink"
+                visible:        QGroundControl.colapseSettings
+                onClicked:      panelLoader.setSource("MavlinkSettings.qml")
+            }
+
+            SubMenuButton {
                 id:             summaryButton
                 imageResource: "/qmlimages/VehicleSummaryIcon.png"
                 setupIndicator: false

src/comm/LinkConfiguration.cc

@@ -15,12 +15,12 @@
 */
 
 #include "LinkConfiguration.h"
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
 #include "SerialLink.h"
 #endif
 #include "UDPLink.h"
 #include "TCPLink.h"
-#ifndef __mobile__
+#if !defined(__mobile__)
 #include "LogReplayLink.h"
 #endif
 #ifdef QGC_ENABLE_BLUETOOTH
@@ -79,7 +79,7 @@ LinkConfiguration* LinkConfiguration::createSettings(int type, const QString& na
 {
     LinkConfiguration* config = NULL;
     switch(type) {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
         case LinkConfiguration::TypeSerial:
             config = new SerialConfiguration(name);
             break;
@@ -117,7 +117,7 @@ LinkConfiguration* LinkConfiguration::duplicateSettings(LinkConfiguration* sourc
 {
     LinkConfiguration* dupe = NULL;
     switch(source->type()) {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
         case TypeSerial:
             dupe = new SerialConfiguration(dynamic_cast<SerialConfiguration*>(source));
             break;

src/comm/LinkConfiguration.h

@@ -46,7 +46,7 @@ public:
     ///  The link types supported by QGC
     ///  Any changes here MUST be reflected in LinkManager::linkTypeStrings()
     enum LinkType {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
         TypeSerial,     ///< Serial Link
 #endif
         TypeUdp,        ///< UDP Link

src/comm/LinkManager.cc

@@ -21,7 +21,7 @@
 #include <QDebug>
 #include <QSignalSpy>
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
 #include "QGCSerialPortInfo.h"
 #endif
 
@@ -85,7 +85,7 @@ LinkManager::LinkManager(QGCApplication* app)
     _autoconnectRTKGPS =     settings.value(_autoconnectRTKGPSKey, true).toBool();
     _autoconnectLibrePilot = settings.value(_autoconnectLibrePilotKey, true).toBool();
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     _activeLinkCheckTimer.setInterval(_activeLinkCheckTimeoutMSecs);
     _activeLinkCheckTimer.setSingleShot(false);
     connect(&_activeLinkCheckTimer, &QTimer::timeout, this, &LinkManager::_activeLinkCheck);
@@ -113,7 +113,7 @@ LinkInterface* LinkManager::createConnectedLink(LinkConfiguration* config)
     Q_ASSERT(config);
     LinkInterface* pLink = NULL;
     switch(config->type()) {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
         case LinkConfiguration::TypeSerial:
         {
             SerialConfiguration* serialConfig = dynamic_cast<SerialConfiguration*>(config);
@@ -373,7 +373,7 @@ void LinkManager::loadLinkConfigurationList()
                             LinkConfiguration* pLink = NULL;
                             bool autoConnect = settings.value(root + "/auto").toBool();
                             switch((LinkConfiguration::LinkType)type) {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
                                 case LinkConfiguration::TypeSerial:
                                     pLink = (LinkConfiguration*)new SerialConfiguration(name);
                                     break;
@@ -443,7 +443,7 @@ void LinkManager::loadLinkConfigurationList()
     _configurationsLoaded = true;
 }
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
 SerialConfiguration* LinkManager::_autoconnectConfigurationsContainsPort(const QString& portName)
 {
     QString searchPort = portName.trimmed();
@@ -488,7 +488,7 @@ void LinkManager::_updateAutoConnectLinks(void)
         emit linkConfigurationsChanged();
     }
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     QStringList currentPorts;
     QList<QGCSerialPortInfo> portList = QGCSerialPortInfo::availablePorts();
 
@@ -633,7 +633,7 @@ void LinkManager::_updateAutoConnectLinks(void)
         }
         delete pDeleteConfig;
     }
-#endif // __ios__
+#endif // NO_SERIAL_LINK
 }
 
 void LinkManager::shutdown(void)
@@ -704,7 +704,7 @@ QStringList LinkManager::linkTypeStrings(void) const
     static QStringList list;
     if(!list.size())
     {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
         list += "Serial";
 #endif
         list += "UDP";
@@ -727,7 +727,7 @@ void LinkManager::_updateSerialPorts()
 {
     _commPortList.clear();
     _commPortDisplayList.clear();
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     QList<QSerialPortInfo> portList = QSerialPortInfo::availablePorts();
     foreach (const QSerialPortInfo &info, portList)
     {
@@ -758,7 +758,7 @@ QStringList LinkManager::serialPorts(void)
 
 QStringList LinkManager::serialBaudRates(void)
 {
-#ifdef __ios__
+#ifdef NO_SERIAL_LINK
     QStringList foo;
     return foo;
 #else
@@ -791,7 +791,7 @@ bool LinkManager::endCreateConfiguration(LinkConfiguration* config)
 
 LinkConfiguration* LinkManager::createConfiguration(int type, const QString& name)
 {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     if((LinkConfiguration::LinkType)type == LinkConfiguration::TypeSerial)
         _updateSerialPorts();
 #endif
@@ -801,7 +801,7 @@ LinkConfiguration* LinkManager::createConfiguration(int type, const QString& nam
 LinkConfiguration* LinkManager::startConfigurationEditing(LinkConfiguration* config)
 {
     Q_ASSERT(config != NULL);
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     if(config->type() == LinkConfiguration::TypeSerial)
         _updateSerialPorts();
 #endif
@@ -815,7 +815,7 @@ void LinkManager::_fixUnnamed(LinkConfiguration* config)
     //-- Check for "Unnamed"
     if (config->name() == "Unnamed") {
         switch(config->type()) {
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
             case LinkConfiguration::TypeSerial: {
                 QString tname = dynamic_cast<SerialConfiguration*>(config)->portName();
 #ifdef Q_OS_WIN
@@ -895,7 +895,7 @@ bool LinkManager::isBluetoothAvailable(void)
     return qgcApp()->isBluetoothAvailable();
 }
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
 void LinkManager::_activeLinkCheck(void)
 {
     SerialLink* link = NULL;

src/comm/LinkManager.h

@@ -24,12 +24,12 @@
 #include "QGCToolbox.h"
 #include "ProtocolInterface.h"
 #include "MAVLinkProtocol.h"
-#ifndef __mobile__
+#if !defined(__mobile__)
 #include "LogReplayLink.h"
 #endif
 #include "QmlObjectListModel.h"
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     #include "SerialLink.h"
 #endif
 
@@ -199,7 +199,7 @@ private slots:
     void _linkConnected(void);
     void _linkDisconnected(void);
     void _linkConnectionRemoved(LinkInterface* link);
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     void _activeLinkCheck(void);
 #endif
 
@@ -210,7 +210,7 @@ private:
     void _fixUnnamed(LinkConfiguration* config);
     bool _setAutoconnectWorker(bool& currentAutoconnect, bool newAutoconnect, const char* autoconnectKey);
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     SerialConfiguration* _autoconnectConfigurationsContainsPort(const QString& portName);
 #endif
 
@@ -237,7 +237,7 @@ private:
     bool _autoconnectPX4Flow;
     bool _autoconnectRTKGPS;
     bool _autoconnectLibrePilot;
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     QTimer              _activeLinkCheckTimer;                  ///< Timer which checks for a vehicle showing up on a usb direct link
     QList<SerialLink*>  _activeLinkCheckList;                   ///< List of links we are waiting for a vehicle to show up on
     static const int    _activeLinkCheckTimeoutMSecs = 15000;   ///< Amount of time to wait for a heatbeat. Keep in mind ArduPilot stack heartbeat is slow to come.

src/main.cc

@@ -74,7 +74,7 @@ int WindowsCrtReportHook(int reportType, char* message, int* returnValue)
 
 #endif
 
-#ifdef __android__
+#if defined(__android__) && !defined(NO_SERIAL_LINK)
 #include <jni.h>
 #include "qserialport.h"
 
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
     // that we use these types in signals, and without calling qRegisterMetaType we can't queue
     // these signals. In general we don't queue these signals, but we do what the warning says
     // anyway to silence the debug output.
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
     qRegisterMetaType<QSerialPort::SerialPortError>();
 #endif
 #ifdef QGC_ENABLE_BLUETOOTH

src/uas/UAS.cc

@@ -36,7 +36,7 @@
 #include "MAVLinkProtocol.h"
 #include "QGCMAVLink.h"
 #include "LinkManager.h"
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
 #include "SerialLink.h"
 #endif
 #include "FirmwarePluginManager.h"

src/ui/MainWindow.cc

@@ -54,7 +54,7 @@
 #include "AppMessages.h"
 #endif
 
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
 #include "SerialLink.h"
 #endif
 

src/ui/MainWindow.h

@@ -33,9 +33,7 @@
 #include "UASInterface.h"
 #include "LogCompressor.h"
 #include "QGCMAVLinkInspector.h"
-#ifndef __mobile__
 #include "QGCMAVLinkLogPlayer.h"
-#endif
 #include "MAVLinkDecoder.h"
 #include "Vehicle.h"
 #include "QGCDockWidget.h"
@@ -117,12 +115,10 @@ signals:
 #endif //QGC_MOUSE_ENABLED_LINUX
 
 public:
-#ifndef __mobile__
     QGCMAVLinkLogPlayer* getLogPlayer()
     {
         return logPlayer;
     }
-#endif
 
 protected:
     void connectCommonActions();
@@ -133,9 +129,7 @@ protected:
     QSettings settings;
 
     QPointer<MAVLinkDecoder> mavlinkDecoder;
-#ifndef __mobile__
     QGCMAVLinkLogPlayer* logPlayer;
-#endif
 #ifdef QGC_MOUSE_ENABLED_WIN
     /** @brief 3d Mouse support (WIN only) */
     Mouse3DInput* mouseInput;               ///< 3dConnexion 3dMouse SDK
@@ -164,10 +158,7 @@ protected:
 private slots:
     void _closeWindow(void) { close(); }
     void _vehicleAdded(Vehicle* vehicle);
-
-#ifndef __mobile__
     void _showDockWidgetAction(bool show);
-#endif
 
 #ifdef UNITTEST_BUILD
     void _showQmlTestWidget(void);
@@ -179,22 +170,17 @@ private:
 
     void _openUrl(const QString& url, const QString& errorMessage);
 
-#ifndef __mobile__
     QMap<QString, QGCDockWidget*>   _mapName2DockWidget;
     QMap<QString, QAction*>         _mapName2Action;
-#endif
 
     void _storeCurrentViewState(void);
     void _loadCurrentViewState(void);
-
-#ifndef __mobile__
     bool _createInnerDockWidget(const QString& widgetName);
     void _buildCommonWidgets(void);
     void _hideAllDockWidgets(void);
     void _showDockWidget(const QString &name, bool show);
     void _loadVisibleWidgetsSettings(void);
     void _storeVisibleWidgetsSettings(void);
-#endif
 
     bool                    _lowPowerMode;           ///< If enabled, QGC reduces the update rates of all widgets
     bool                    _showStatusBar;

src/ui/QGCMAVLinkLogPlayer.cc

@@ -2,7 +2,7 @@
 #include <QtEndian>
 
 #include "MainWindow.h"
-#ifndef __ios__
+#ifndef NO_SERIAL_LINK
 #include "SerialLink.h"
 #endif
 #include "QGCMAVLinkLogPlayer.h"
@@ -17,7 +17,7 @@ QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(QWidget *parent) :
     QWidget(parent),
     _replayLink(NULL),
     _ui(new Ui::QGCMAVLinkLogPlayer)
-{    
+{
     _ui->setupUi(this);
     _ui->horizontalLayout->setAlignment(Qt::AlignTop);
 
@@ -26,7 +26,7 @@ QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(QWidget *parent) :
     connect(_ui->playButton, &QPushButton::clicked, this, &QGCMAVLinkLogPlayer::_playPauseToggle);
     connect(_ui->positionSlider, &QSlider::valueChanged, this, &QGCMAVLinkLogPlayer::_setPlayheadFromSlider);
     connect(_ui->positionSlider, &QSlider::sliderPressed, this, &QGCMAVLinkLogPlayer::_pause);
-    
+
 #if 0
     // Speed slider is removed from 3.0 release. Too broken to fix.
     connect(_ui->speedSlider, &QSlider::valueChanged, this, &QGCMAVLinkLogPlayer::_setAccelerationFromSlider);
@@ -36,10 +36,10 @@ QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(QWidget *parent) :
 #endif
 
     _enablePlaybackControls(false);
-    
+
     _ui->positionSlider->setMinimum(0);
     _ui->positionSlider->setMaximum(100);
-    
+
 }
 
 QGCMAVLinkLogPlayer::~QGCMAVLinkLogPlayer()
@@ -68,7 +68,7 @@ void QGCMAVLinkLogPlayer::_selectLogFileForPlayback(void)
         QGCMessageBox::information(tr("Log Replay"), tr("You must close all connections prior to replaying a log."));
         return;
     }
-    
+
     QString logFilename = QGCFileDialog::getOpenFileName(
         this,
         tr("Load MAVLink Log File"),
@@ -78,21 +78,21 @@ void QGCMAVLinkLogPlayer::_selectLogFileForPlayback(void)
     if (logFilename.isEmpty()) {
         return;
     }
-    
+
     LinkInterface* createConnectedLink(LinkConfiguration* config);
-    
+
     LogReplayLinkConfiguration* linkConfig = new LogReplayLinkConfiguration(QString("Log Replay"));
     linkConfig->setLogFilename(logFilename);
     linkConfig->setName(linkConfig->logFilenameShort());
     _ui->logFileNameLabel->setText(linkConfig->logFilenameShort());
     _replayLink = (LogReplayLink*)qgcApp()->toolbox()->linkManager()->createConnectedLink(linkConfig);
-    
+
     connect(_replayLink, &LogReplayLink::logFileStats, this, &QGCMAVLinkLogPlayer::_logFileStats);
     connect(_replayLink, &LogReplayLink::playbackStarted, this, &QGCMAVLinkLogPlayer::_playbackStarted);
     connect(_replayLink, &LogReplayLink::playbackPaused, this, &QGCMAVLinkLogPlayer::_playbackPaused);
     connect(_replayLink, &LogReplayLink::playbackPercentCompleteChanged, this, &QGCMAVLinkLogPlayer::_playbackPercentCompleteChanged);
     connect(_replayLink, &LogReplayLink::disconnected, this, &QGCMAVLinkLogPlayer::_replayLinkDisconnected);
-    
+
     _ui->positionSlider->setValue(0);
 #if 0
     _ui->speedSlider->setValue(0);
@@ -123,9 +123,9 @@ void QGCMAVLinkLogPlayer::_logFileStats(bool    logTimestamped,         ///< tru
 {
     Q_UNUSED(logTimestamped);
     Q_UNUSED(binaryBaudRate);
-    
+
     _logDurationSeconds = logDurationSeconds;
-    
+
     _ui->logStatsLabel->setText(_secondsToHMS(logDurationSeconds));
 }
 
@@ -174,9 +174,9 @@ void QGCMAVLinkLogPlayer::_setAccelerationFromSlider(int value)
     if (_replayLink) {
         _replayLink->setAccelerationFactor(value);
     }
-    
+
     // Factor: -100: 0.01x, 0: 1.0x, 100: 100x
-    
+
     float accelerationFactor;
     if (value < 0) {
         accelerationFactor = 0.01f;
@@ -189,7 +189,7 @@ void QGCMAVLinkLogPlayer::_setAccelerationFromSlider(int value)
     } else {
         accelerationFactor = 1.0f;
     }
-    
+
     _ui->speedLabel->setText(QString("Speed: %1X").arg(accelerationFactor, 5, 'f', 2, '0'));
 }
 #endif

src/ui/preferences/GeneralSettings.qml

@@ -364,6 +364,7 @@ QGCView {
                             text:       qsTr("Virtual Joystick")
                             checked:    QGroundControl.virtualTabletJoystick
                             onClicked:  QGroundControl.virtualTabletJoystick = checked
+                            visible:    QGroundControl.enableVirtualJoystick
                         }
                         //-----------------------------------------------------------------
                         //-- Map Providers
@@ -433,6 +434,7 @@ QGCView {
                     height:             autoConnectLabel.height
                     anchors.margins:    ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter: parent.horizontalCenter
+                    visible:            QGroundControl.enableAutoConnectOptions
                     QGCLabel {
                         id:             autoConnectLabel
                         text:           qsTr("Autoconnect to the following devices:")
@@ -443,6 +445,7 @@ QGCView {
                     height:         autoConnectCol.height + (ScreenTools.defaultFontPixelHeight * 2)
                     width:          qgcView.width * 0.8
                     color:          qgcPal.windowShade
+                    visible:        QGroundControl.enableAutoConnectOptions
                     anchors.margins: ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter: parent.horizontalCenter
                     Column {
@@ -494,6 +497,7 @@ QGCView {
                 Item {
                     width:              qgcView.width * 0.8
                     height:             videoLabel.height
+                    visible:            QGroundControl.enableVideoSourceOptions
                     anchors.margins:    ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter: parent.horizontalCenter
                     QGCLabel {
@@ -506,6 +510,7 @@ QGCView {
                     height:         videoCol.height + (ScreenTools.defaultFontPixelHeight * 2)
                     width:          qgcView.width * 0.8
                     color:          qgcPal.windowShade
+                    visible:        QGroundControl.enableVideoSourceOptions
                     anchors.margins: ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter: parent.horizontalCenter
                     Column {

src/ui/toolbar/MainToolBar.qml

@@ -338,6 +338,7 @@ Rectangle {
             source:             "/res/QGCLogoWhite"
             logo:               true
             onClicked:          toolBar.showSettingsView()
+            visible:            !QGroundControl.colapseSettings
         }
 
         QGCToolBarButton {