From f5c3f3cf6860ccbc6495d4b52a318e01d68845a1 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Mon, 27 Feb 2017 19:28:14 -0800
Subject: [PATCH] New CameraWidget for instrument panel page

---
 qgroundcontrol.qrc                     |  1 +
 src/FlightMap/Widgets/CameraWidget.qml | 54 ++++++++++++++++++++++++++
 src/FlightMap/qmldir                   | 29 +++++++-------
 3 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 src/FlightMap/Widgets/CameraWidget.qml

diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 512e9dcd0..53dad4533 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -143,6 +143,7 @@
         <file alias="QGroundControl/FlightMap/QGCPitchIndicator.qml">src/FlightMap/Widgets/QGCPitchIndicator.qml</file>
         <file alias="QGroundControl/FlightMap/QGCVideoBackground.qml">src/FlightMap/QGCVideoBackground.qml</file>
         <file alias="QGroundControl/FlightMap/qmldir">src/FlightMap/qmldir</file>
+        <file alias="QGroundControl/FlightMap/CameraWidget.qml">src/FlightMap/Widgets/CameraWidget.qml</file>
         <file alias="QGroundControl/FlightMap/ValuesWidget.qml">src/FlightMap/Widgets/ValuesWidget.qml</file>
         <file alias="QGroundControl/FlightMap/VehicleHealthWidget.qml">src/FlightMap/Widgets/VehicleHealthWidget.qml</file>
         <file alias="QGroundControl/FlightMap/VehicleMapItem.qml">src/FlightMap/MapItems/VehicleMapItem.qml</file>
diff --git a/src/FlightMap/Widgets/CameraWidget.qml b/src/FlightMap/Widgets/CameraWidget.qml
new file mode 100644
index 000000000..8e0ec95ce
--- /dev/null
+++ b/src/FlightMap/Widgets/CameraWidget.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+ *
+ *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick          2.4
+import QtQuick.Layouts  1.2
+
+import QGroundControl               1.0
+import QGroundControl.Controls      1.0
+import QGroundControl.ScreenTools   1.0
+
+/// Camera controls used in InstrumentSwipeView
+QGCFlickable {
+    id:                 _root
+    height:             Math.min(maxHeight, column.height)
+    contentHeight:      column.height
+    flickableDirection: Flickable.VerticalFlick
+    clip:               true
+
+    property var    qgcView
+    property color  textColor
+    property var    maxHeight
+
+    property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+
+    MouseArea {
+        anchors.fill:   parent
+        onClicked:      showNextPage()
+    }
+
+    Column {
+        id:         column
+        width:      parent.width
+        spacing:    ScreenTools.defaultFontPixelHeight
+
+        QGCLabel {
+            anchors.horizontalCenter:   parent.horizontalCenter
+            color:                      textColor
+            text:                       qsTr("Camera Controls")
+        }
+
+        QGCButton {
+            anchors.horizontalCenter:   parent.horizontalCenter
+            text:                       qsTr("Trigger Camera")
+            onClicked:                  _activeVehicle.triggerCamera()
+            enabled:                    _activeVehicle
+        }
+    }
+}
diff --git a/src/FlightMap/qmldir b/src/FlightMap/qmldir
index 84cdd15c3..8d6f8eded 100644
--- a/src/FlightMap/qmldir
+++ b/src/FlightMap/qmldir
@@ -5,20 +5,21 @@ FlightMap           1.0 FlightMap.qml
 QGCVideoBackground  1.0 QGCVideoBackground.qml
 
 # Widgets
-CenterMapDropButton             1.0 CenterMapDropButton.qml
-CenterMapDropPanel              1.0 CenterMapDropPanel.qml
-InstrumentSwipeView             1.0 InstrumentSwipeView.qml
-MapFitFunctions                 1.0 MapFitFunctions.qml
-MapScale                        1.0 MapScale.qml
-QGCArtificialHorizon            1.0 QGCArtificialHorizon.qml
-QGCAttitudeHUD                  1.0 QGCAttitudeHUD.qml
-QGCAttitudeWidget               1.0 QGCAttitudeWidget.qml
-QGCCompassWidget                1.0 QGCCompassWidget.qml
-QGCPitchIndicator               1.0 QGCPitchIndicator.qml
-QGCSlider                       1.0 QGCSlider.qml
-ValuesWidget                    1.0 ValuesWidget.qml
-VehicleHealthWidget             1.0 VehicleHealthWidget.qml
-VibrationWidget                 1.0 VibrationWidget.qml
+CameraWidget            1.0 CameraWidget.qml
+CenterMapDropButton     1.0 CenterMapDropButton.qml
+CenterMapDropPanel      1.0 CenterMapDropPanel.qml
+InstrumentSwipeView     1.0 InstrumentSwipeView.qml
+MapFitFunctions         1.0 MapFitFunctions.qml
+MapScale                1.0 MapScale.qml
+QGCArtificialHorizon    1.0 QGCArtificialHorizon.qml
+QGCAttitudeHUD          1.0 QGCAttitudeHUD.qml
+QGCAttitudeWidget       1.0 QGCAttitudeWidget.qml
+QGCCompassWidget        1.0 QGCCompassWidget.qml
+QGCPitchIndicator       1.0 QGCPitchIndicator.qml
+QGCSlider               1.0 QGCSlider.qml
+ValuesWidget            1.0 ValuesWidget.qml
+VehicleHealthWidget     1.0 VehicleHealthWidget.qml
+VibrationWidget         1.0 VibrationWidget.qml
 
 # Map items
 MissionItemIndicator    1.0 MissionItemIndicator.qml
-- 
2.22.0