From 889639c9330a15b7f564734d6622129e0e2a2ebf Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Wed, 15 May 2019 17:38:00 -0400
Subject: [PATCH] Add some of the Analyze panels to mobile builds

---
 qgroundcontrol.pro              | 10 +++---
 src/AnalyzeView/AnalyzeView.qml | 69 ++++++++++++++++++++++++++---------------
 src/QGCApplication.cc           |  5 +--
 3 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 0243230..ce03bba 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -614,6 +614,8 @@ HEADERS += \
     src/uas/UASInterface.h \
     src/uas/UASMessageHandler.h \
     src/UTM.h \
+    src/AnalyzeView/GeoTagController.h \
+    src/AnalyzeView/ExifParser.h \
 
 
 AndroidBuild {
@@ -648,8 +650,6 @@ HEADERS += \
 
 !MobileBuild {
 HEADERS += \
-    src/AnalyzeView/GeoTagController.h \
-    src/AnalyzeView/ExifParser.h \
     src/GPS/Drivers/src/gps_helper.h \
     src/GPS/Drivers/src/rtcm.h \
     src/GPS/Drivers/src/ashtech.h \
@@ -663,7 +663,6 @@ HEADERS += \
     src/GPS/satellite_info.h \
     src/GPS/vehicle_gps_position.h \
     src/Joystick/JoystickSDL.h \
-    src/QGCQFileDialog.h \
     src/RunGuard.h \
     src/comm/LogReplayLink.h \
     src/comm/QGCHilLink.h \
@@ -790,6 +789,8 @@ SOURCES += \
     src/uas/UAS.cc \
     src/uas/UASMessageHandler.cc \
     src/UTM.cpp \
+    src/AnalyzeView/GeoTagController.cc \
+    src/AnalyzeView/ExifParser.cc \
 
 DebugBuild {
 SOURCES += \
@@ -811,8 +812,6 @@ contains(DEFINES, QGC_ENABLE_BLUETOOTH) {
 
 !MobileBuild {
 SOURCES += \
-    src/AnalyzeView/GeoTagController.cc \
-    src/AnalyzeView/ExifParser.cc \
     src/GPS/Drivers/src/gps_helper.cpp \
     src/GPS/Drivers/src/rtcm.cpp \
     src/GPS/Drivers/src/ashtech.cpp \
@@ -822,7 +821,6 @@ SOURCES += \
     src/GPS/GPSProvider.cc \
     src/GPS/RTCM/RTCMMavlink.cc \
     src/Joystick/JoystickSDL.cc \
-    src/QGCQFileDialog.cc \
     src/RunGuard.cc \
     src/comm/LogReplayLink.cc \
     src/comm/QGCJSBSimLink.cc \
diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml
index 43386fa..2e5344d 100644
--- a/src/AnalyzeView/AnalyzeView.qml
+++ b/src/AnalyzeView/AnalyzeView.qml
@@ -88,34 +88,53 @@ Rectangle {
                 visible:                !ScreenTools.isShortScreen
             }
 
-            Repeater {
-                id: buttonRepeater
-
-                model: ListModel {
-                    ListElement {
-                        buttonImage:        "/qmlimages/LogDownloadIcon"
-                        buttonText:         qsTr("Log Download")
-                        pageSource:         "LogDownloadPage.qml"
-                    }
-                    ListElement {
-                        buttonImage:        "/qmlimages/GeoTagIcon"
-                        buttonText:         qsTr("GeoTag Images")
-                        pageSource:         "GeoTagPage.qml"
-                    }
-                    ListElement {
-                        buttonImage:        "/qmlimages/MavlinkConsoleIcon"
-                        buttonText:         qsTr("MAVLink Console")
-                        pageSource:         "MavlinkConsolePage.qml"
-                    }
-                    ListElement {
-                        buttonImage:        "/qmlimages/MAVLinkInspector"
-                        buttonText:         qsTr("MAVLink Inspector")
-                        pageSource:         "MAVLinkInspectorPage.qml"
-                    }
+            ListModel {
+                id: desktopModel
+                ListElement {
+                    buttonImage:        "/qmlimages/LogDownloadIcon"
+                    buttonText:         qsTr("Log Download")
+                    pageSource:         "LogDownloadPage.qml"
+                }
+                ListElement {
+                    buttonImage:        "/qmlimages/GeoTagIcon"
+                    buttonText:         qsTr("GeoTag Images")
+                    pageSource:         "GeoTagPage.qml"
+                }
+                ListElement {
+                    buttonImage:        "/qmlimages/MavlinkConsoleIcon"
+                    buttonText:         qsTr("MAVLink Console")
+                    pageSource:         "MavlinkConsolePage.qml"
                 }
+                ListElement {
+                    buttonImage:        "/qmlimages/MAVLinkInspector"
+                    buttonText:         qsTr("MAVLink Inspector")
+                    pageSource:         "MAVLinkInspectorPage.qml"
+                }
+            }
 
-                Component.onCompleted: itemAt(0).checked = true
+            ListModel {
+                id: mobileModel
+                ListElement {
+                    buttonImage:        "/qmlimages/LogDownloadIcon"
+                    buttonText:         qsTr("Log Download")
+                    pageSource:         "LogDownloadPage.qml"
+                }
+                ListElement {
+                    buttonImage:        "/qmlimages/MavlinkConsoleIcon"
+                    buttonText:         qsTr("MAVLink Console")
+                    pageSource:         "MavlinkConsolePage.qml"
+                }
+                ListElement {
+                    buttonImage:        "/qmlimages/MAVLinkInspector"
+                    buttonText:         qsTr("MAVLink Inspector")
+                    pageSource:         "MAVLinkInspectorPage.qml"
+                }
+            }
 
+            Repeater {
+                id:                     buttonRepeater
+                model:                  ScreenTools.isMobile ? mobileModel : desktopModel
+                Component.onCompleted: itemAt(0).checked = true
                 SubMenuButton {
                     imageResource:      buttonImage
                     setupIndicator:     false
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index ad3068f..0f4e282 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -99,6 +99,8 @@
 #include "FirmwareImage.h"
 #include "MavlinkConsoleController.h"
 #include "MAVLinkInspectorController.h"
+#include "GeoTagController.h"
+
 #ifndef __mobile__
 #include "FirmwareUpgradeController.h"
 #endif
@@ -108,7 +110,6 @@
 #endif
 
 #ifndef __mobile__
-#include "GeoTagController.h"
 #include "GPS/GPSManager.h"
 #endif
 
@@ -461,8 +462,8 @@ void QGCApplication::_initCommon()
 #ifndef NO_SERIAL_LINK
     qmlRegisterType<FirmwareUpgradeController>      (kQGCControllers,                       1, 0, "FirmwareUpgradeController");
 #endif
-    qmlRegisterType<GeoTagController>               (kQGCControllers,                       1, 0, "GeoTagController");
 #endif
+    qmlRegisterType<GeoTagController>               (kQGCControllers,                       1, 0, "GeoTagController");
     qmlRegisterType<MavlinkConsoleController>       (kQGCControllers,                       1, 0, "MavlinkConsoleController");
     qmlRegisterType<MAVLinkInspectorController>     (kQGCControllers,                       1, 0, "MAVLinkInspectorController");