Merge pull request #4388 from DonLakeFlyer/AlternateInstrument

Alternate instrument fixes

src/FlightDisplay/FlightDisplayViewWidgets.qml

@@ -106,10 +106,13 @@ Item {
         pitchAngle:             _pitch
         groundSpeedFact:        _groundSpeedFact
         airSpeedFact:           _airSpeedFact
-        isSatellite:            _isSatellite
+        lightBorders:           _lightWidgetBorders
+        qgcView:                _root.qgcView
+        maxHeight:              parent.height - (anchors.margins * 2)
         z:                      QGroundControl.zOrderWidgets
     }
 
+    /*
     ValuesWidget {
         anchors.topMargin:          ScreenTools.defaultFontPixelHeight
         anchors.top:                instrumentGadgetAlternate.bottom
@@ -119,7 +122,7 @@ Item {
         textColor:                  _isSatellite ? "white" : "black"
         visible:                    _useAlternateInstruments
         maxHeight:                  virtualJoystickMultiTouch.visible ? virtualJoystickMultiTouch.y - y : parent.height - anchors.margins - y
-    }
+    }*/
 
     //-- Guided mode buttons
     Rectangle {

src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml

@@ -14,20 +14,25 @@ import QGroundControl.Controls      1.0
 import QGroundControl.ScreenTools   1.0
 import QGroundControl.FactSystem    1.0
 import QGroundControl.FlightMap     1.0
+import QGroundControl.Palette       1.0
 
 /// Instrument panel shown when virtual thumbsticks are visible
 Rectangle {
-    id:     root
-    height: _outerRadius * 2
-    radius: _outerRadius
-    color:  isSatellite ? Qt.rgba(1,1,1,0.75) : Qt.rgba(0,0,0,0.75)
+    id:             root
+    height:         _outerRadius * 2
+    radius:         _outerRadius
+    color:          qgcPal.window
+    border.width:   1
+    border.color:   lightBorders ? qgcPal.mapWidgetBorderLight : qgcPal.mapWidgetBorderDark
 
     property alias  heading:        compass.heading
     property alias  rollAngle:      attitude.rollAngle
     property alias  pitchAngle:     attitude.pitchAngle
     property real   size:           _defaultSize
-    property bool   isSatellite:    false
     property bool   active:         false
+    property bool   lightBorders:   true
+    property var    qgcView
+    property real   maxHeight
 
     property Fact   _emptyFact:         Fact { }
     property Fact   groundSpeedFact:    _emptyFact
@@ -45,6 +50,9 @@ Rectangle {
     property real   _labelFontSize: ScreenTools.defaultFontPointSize * 0.75 * _sizeRatio
     property real   _spacing:       ScreenTools.defaultFontPixelHeight * 0.33
     property real   _topBottomMargin: (size * 0.05) / 2
+    property real   _availableValueHeight: maxHeight - (root.height + _valuesItem.anchors.topMargin)
+
+    QGCPalette { id: qgcPal }
 
     QGCAttitudeWidget {
         id:                 attitude
@@ -63,4 +71,48 @@ Rectangle {
         active:             root.active
         anchors.verticalCenter: parent.verticalCenter
     }
+
+    Image {
+        id:                         gearThingy
+        anchors.bottomMargin:       _topBottomMargin
+        anchors.bottom:             parent.bottom
+        anchors.horizontalCenter:   parent.horizontalCenter
+        source:                     qgcPal.globalTheme == QGCPalette.Light ? "/res/gear-black.svg" : "/res/gear-white.svg"
+        mipmap:                     true
+        opacity:                    0.5
+        width:                      root.height * 0.15
+        sourceSize.width:           width
+        fillMode:                   Image.PreserveAspectFit
+    }
+
+    MouseArea {
+        anchors.fill:   parent
+        onClicked:      _valuesWidget.showPicker()
+    }
+
+    Item {
+        id:                 _valuesItem
+        anchors.topMargin:  ScreenTools.defaultFontPixelHeight / 4
+        anchors.top:        parent.bottom
+        width:              parent.width
+        height:             _valuesWidget.height
+
+        Rectangle {
+            anchors.fill:   _valuesWidget
+            color:          qgcPal.window
+        }
+
+        InstrumentSwipeView {
+            id:                 _valuesWidget
+            anchors.margins:    1
+            anchors.left:       parent.left
+            anchors.right:      parent.right
+            qgcView:            root.qgcView
+            textColor:          qgcPal.text
+            backgroundColor:    qgcPal.window
+            maxHeight:          _availableValueHeight
+        }
+    }
+
+
 }