From 21b110ce200de3a926c00e886e6aafecc4ceda07 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 8 Mar 2017 14:49:30 -0800 Subject: [PATCH] Add showTouchAreas and showAdvancedUI --- src/QmlControls/QGroundControlQmlGlobal.cc | 2 ++ src/QmlControls/QGroundControlQmlGlobal.h | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/QmlControls/QGroundControlQmlGlobal.cc b/src/QmlControls/QGroundControlQmlGlobal.cc index af893774e..59a4579c3 100644 --- a/src/QmlControls/QGroundControlQmlGlobal.cc +++ b/src/QmlControls/QGroundControlQmlGlobal.cc @@ -32,6 +32,8 @@ QGroundControlQmlGlobal::QGroundControlQmlGlobal(QGCApplication* app) , _corePlugin(NULL) , _firmwarePluginManager(NULL) , _settingsManager(NULL) + , _showTouchAreas(false) + , _showAdvancedUI(false) { // We clear the parent on this object since we run into shutdown problems caused by hybrid qml app. Instead we let it leak on shutdown. setParent(NULL); diff --git a/src/QmlControls/QGroundControlQmlGlobal.h b/src/QmlControls/QGroundControlQmlGlobal.h index 047e3f86e..24c0aa58c 100644 --- a/src/QmlControls/QGroundControlQmlGlobal.h +++ b/src/QmlControls/QGroundControlQmlGlobal.h @@ -73,6 +73,9 @@ public: Q_PROPERTY(QString qgcVersion READ qgcVersion CONSTANT) + Q_PROPERTY(bool showTouchAreas MEMBER _showTouchAreas NOTIFY showTouchAreasChanged) + Q_PROPERTY(bool showAdvancedUI MEMBER _showAdvancedUI NOTIFY showAdvancedUIChanged) + Q_INVOKABLE void saveGlobalSetting (const QString& key, const QString& value); Q_INVOKABLE QString loadGlobalSetting (const QString& key, const QString& defaultValue); Q_INVOKABLE void saveBoolGlobalSetting (const QString& key, bool value); @@ -153,6 +156,9 @@ public: QString qgcVersion(void) const { return qgcApp()->applicationVersion(); } + bool showTouchAreas(void) const { return _showTouchAreas; } ///< Show visible extents of touch areas + bool showAdvancedUI(void) const { return _showAdvancedUI; } ///< Show hidden advanced UI + // Overrides from QGCTool virtual void setToolbox(QGCToolbox* toolbox); @@ -162,6 +168,8 @@ signals: void mavlinkSystemIDChanged (int id); void flightMapPositionChanged (QGeoCoordinate flightMapPosition); void flightMapZoomChanged (double flightMapZoom); + void showTouchAreasChanged (bool showTouchAreas); + void showAdvancedUIChanged (bool showAdvancedUI); private: FlightMapSettings* _flightMapSettings; @@ -178,6 +186,9 @@ private: QGeoCoordinate _flightMapPosition; double _flightMapZoom; + + bool _showTouchAreas; + bool _showAdvancedUI; }; #endif -- 2.22.0