Make it possible to have a build without Airmap

Fr33zz · Jan 27, 2018 · a5e8264 · a5e8264
1 parent f55279d
commit a5e8264
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 5 deletions.
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
@@ -1075,6 +1075,9 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
         src/Airmap/AirspaceManagement.cc \
         src/Airmap/AirspaceController.cc \
         src/Airmap/AirMapSettings.cc
+} else {
+    RESOURCES += \
+        src/Airmap/dummy/airmap_dummy.qrc
 }
 
 #-------------------------------------------------------------------------------------

diff --git a/src/Airmap/QGroundControl.Airmap.qmldir b/src/Airmap/QGroundControl.Airmap.qmldir
@@ -1,4 +1,6 @@
-Module QGroundControl.Airmap
+Module
+
+QGroundControl.Airmap
 
 AirspaceControl         1.0 AirspaceControl.qml
 AirspaceRegulation      1.0 AirspaceRegulation.qml
diff --git a/src/Airmap/dummy/AirspaceControl.qml b/src/Airmap/dummy/AirspaceControl.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.3
+Item {
+    property bool   colapsed:       true
+    property bool   showColapse:    false
+}
diff --git a/src/Airmap/dummy/AirspaceRegulation.qml b/src/Airmap/dummy/AirspaceRegulation.qml
@@ -0,0 +1,3 @@
+import QtQuick 2.3
+Item {
+}
diff --git a/src/Airmap/dummy/QGroundControl.Airmap.qmldir b/src/Airmap/dummy/QGroundControl.Airmap.qmldir
@@ -0,0 +1,4 @@
+Module QGroundControl.Airmap
+
+AirspaceControl         1.0 AirspaceControl.qml
+AirspaceRegulation      1.0 AirspaceRegulation.qml
diff --git a/src/Airmap/dummy/airmap_dummy.qrc b/src/Airmap/dummy/airmap_dummy.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/qml">
+        <file alias="QGroundControl/Airmap/qmldir">QGroundControl.Airmap.qmldir</file>
+        <file alias="QGroundControl/Airmap/AirspaceControl.qml">AirspaceControl.qml</file>
+        <file alias="QGroundControl/Airmap/AirspaceRegulation.qml">AirspaceRegulation.qml</file>
+    </qresource>
+</RCC>
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
@@ -96,9 +96,13 @@ QGCView {
     }
 
     on_EnableAirMapChanged: {
-        if(_enableAirMap) {
-            planControlColapsed = true
-            airspaceControl.colapsed = false
+        if(QGroundControl.airmapSupported) {
+            if(_enableAirMap) {
+                planControlColapsed = true
+                airspaceControl.colapsed = false
+            } else {
+                planControlColapsed = false
+            }
         } else {
             planControlColapsed = false
         }
@@ -565,14 +569,16 @@ QGCView {
                         width:                  height
                         height:                 ScreenTools.defaultFontPixelWidth * 2.5
                         sourceSize.height:      height
-                        source:                 "qrc:/airmap/expand.svg"
+                        source:                 QGroundControl.airmapSupported ? "qrc:/airmap/expand.svg" : ""
                         color:                  "white"
+                        visible:                QGroundControl.airmapSupported
                         anchors.right:          parent.right
                         anchors.rightMargin:    ScreenTools.defaultFontPixelWidth
                         anchors.verticalCenter: parent.verticalCenter
                     }
                     MouseArea {
                         anchors.fill:   parent
+                        enabled:        QGroundControl.airmapSupported
                         onClicked: {
                             airspaceControl.colapsed = true
                             planControlColapsed = false