Merge pull request #2701 from dogmaphobic/master

Making Map and Video view persistent.

qgroundcontrol.qrc

@@ -59,6 +59,7 @@
         <file alias="QGroundControl/Controls/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file>
         <file alias="QGroundControl/Controls/QGCColoredImage.qml">src/QmlControls/QGCColoredImage.qml</file>
         <file alias="QGroundControl/Controls/QGCFlickable.qml">src/QmlControls/QGCFlickable.qml</file>
+        <file alias="QGroundControl/Controls/QGCPipable.qml">src/QmlControls/QGCPipable.qml</file>
         <file alias="QGroundControl/Controls/QGCFlickableVerticalIndicator.qml">src/QmlControls/QGCFlickableVerticalIndicator.qml</file>
         <file alias="QGroundControl/Controls/QGCFlickableHorizontalIndicator.qml">src/QmlControls/QGCFlickableHorizontalIndicator.qml</file>
         <file alias="QGroundControl/Controls/QGCComboBox.qml">src/QmlControls/QGCComboBox.qml</file>

src/FlightDisplay/FlightDisplayViewWidgets.qml

@@ -118,8 +118,8 @@ Item {
         anchors.margins:    ScreenTools.defaultFontPixelHeight
         anchors.right:      parent.right
         anchors.bottom:     parent.bottom
-        width:              _pipSize
-        height:             _pipSize * (9/16)
+        width:              pipSize
+        height:             pipSize * (9/16)
         color:              Qt.rgba(0,0,0,0.75)
         Column {
             id:                 instruments

src/FlightDisplay/qmldir

 Module QGroundControl.FlightDisplay
 
 FlightDisplayView           1.0 FlightDisplayView.qml
+FlightDisplayViewMap        1.0 FlightDisplayViewMap.qml
 

src/QmlControls/QGCPipable.qml

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+import QtQuick                      2.5
+import QtQuick.Controls             1.3
+
+import QGroundControl               1.0
+import QGroundControl.ScreenTools   1.0
+import QGroundControl.Controls      1.0
+import QGroundControl.Palette       1.0
+
+Item {
+    id: pip
+
+    property bool isHidden:  false
+    property bool isDark:    false
+
+    signal  activated()
+    signal  hideIt(bool state)
+
+    MouseArea {
+        anchors.fill: parent
+        enabled:      !isHidden
+        onClicked: {
+            pip.activated()
+        }
+    }
+
+    //-- PIP Corner Indicator
+    Image {
+        id:             closePIP
+        source:         "/qmlimages/PiP.svg"
+        mipmap:         true
+        fillMode:       Image.PreserveAspectFit
+        anchors.left:   parent.left
+        anchors.bottom: parent.bottom
+        visible:        !isHidden
+        height:         ScreenTools.defaultFontPixelSize * 2.5
+        width:          ScreenTools.defaultFontPixelSize * 2.5
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                pip.hideIt(true)
+            }
+        }
+    }
+
+    //-- Show PIP
+    Rectangle {
+        id:                     openPIP
+        anchors.left :          parent.left
+        anchors.bottom:         parent.bottom
+        height:                 ScreenTools.defaultFontPixelSize * 2
+        width:                  ScreenTools.defaultFontPixelSize * 2
+        radius:                 ScreenTools.defaultFontPixelSize / 3
+        visible:                isHidden
+        color:                  isDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5)
+        Image {
+            width:              parent.width  * 0.75
+            height:             parent.height * 0.75
+            source:             "/res/buttonRight.svg"
+            mipmap:             true
+            fillMode:           Image.PreserveAspectFit
+            anchors.verticalCenter:     parent.verticalCenter
+            anchors.horizontalCenter:   parent.horizontalCenter
+        }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                pip.hideIt(false)
+            }
+        }
+    }
+}

src/QmlControls/QGroundControl.Controls.qmldir

@@ -21,6 +21,7 @@ QGCComboBox             1.0 QGCComboBox.qml
 QGCFlickable            1.0 QGCFlickable.qml
 QGCLabel                1.0 QGCLabel.qml
 QGCMovableItem          1.0 QGCMovableItem.qml
+QGCPipable              1.0 QGCPipable.qml
 QGCRadioButton          1.0 QGCRadioButton.qml
 QGCTextField            1.0 QGCTextField.qml
 QGCToolBarButton        1.0 QGCToolBarButton.qml