Expand/Colapse Controllers

Adjust colors
Remove unused image

qgcresources.qrc

@@ -123,6 +123,7 @@
         <file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
         <file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
         <file alias="Help.svg">src/FlightMap/Images/Help.svg</file>
+        <file alias="Home.svg">src/FlightMap/Images/Home.svg</file>
         <file alias="HelpBlack.svg">src/FlightMap/Images/HelpBlack.svg</file>
         <file alias="MapAddMission.svg">src/FlightMap/Images/MapAddMission.svg</file>
         <file alias="MapAddMissionBlack.svg">src/FlightMap/Images/MapAddMissionBlack.svg</file>
@@ -175,6 +176,7 @@
     </qresource>
     <qresource prefix="/airmap">
         <file alias="advisory-icon.svg">src/Airmap/images/advisory-icon.svg</file>
+        <file alias="expand.svg">src/Airmap/images/expand.svg</file>
         <file alias="pencil.svg">src/Airmap/images/pencil.svg</file>
     </qresource>
     <qresource prefix="/res">

src/Airmap/AirspaceControl.qml

@@ -63,6 +63,16 @@ Item {
                 anchors.verticalCenter: parent.verticalCenter
             }
         }
+        QGCColoredImage {
+            width:                  height
+            height:                 ScreenTools.defaultFontPixelWidth * 2.5
+            sourceSize.height:      height
+            source:                 "qrc:/airmap/expand.svg"
+            color:                  _colorWhite
+            anchors.right:          parent.right
+            anchors.rightMargin:    ScreenTools.defaultFontPixelWidth
+            anchors.verticalCenter: parent.verticalCenter
+        }
         MouseArea {
             anchors.fill:   parent
             onClicked:      colapsed = false
@@ -115,11 +125,6 @@ Item {
                         }
                     }
                 }
-                MouseArea {
-                    anchors.fill:   parent
-                    enabled:        !colapsed
-                    onClicked:      colapsed = true
-                }
             }
             //-- Contents (Brown Box)
             Rectangle {
@@ -189,7 +194,7 @@ Item {
                                 }
                                 Rectangle {
                                     id:                     regButton
-                                    height:                 regLabel.height + ScreenTools.defaultFontPixelHeight
+                                    height:                 regLabel.height + ScreenTools.defaultFontPixelHeight * 0.5
                                     radius:                 2
                                     color:                  _colorMidBrown
                                     Layout.fillWidth:       true

src/FlightMap/Images/HomeBlack.svg

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve">
-<g>
-	<polygon points="70.2,41.7 36,1.797 1.8,41.7 10.35,41.7 10.35,70.203 27.45,70.203 27.45,47.401 44.55,47.401 44.55,70.203 
-		61.65,70.203 61.65,41.7 	"/>
-</g>
-</svg>

src/PlanView/GeoFenceEditor.qml

@@ -42,7 +42,7 @@ QGCFlickable {
                 anchors.left:       parent.left
                 anchors.top:        parent.top
                 text:               qsTr("GeoFence")
-                color:              "black"
+                anchors.leftMargin: ScreenTools.defaultFontPixelWidth
             }
 
             Rectangle {

src/PlanView/RallyPointEditorHeader.qml

@@ -28,7 +28,6 @@ QGCFlickable {
             anchors.left:       parent.left
             anchors.top:        parent.top
             text:               qsTr("Rally Points")
-            color:              "black"
         }
 
         Rectangle {

src/PlanView/RallyPointItemEditor.qml

@@ -17,8 +17,7 @@ Rectangle {
     property var rallyPoint ///< RallyPoint object associated with editor
     property var controller ///< RallyPointController
 
-    property bool   _currentItem:       rallyPoint ? rallyPoint == controller.currentRallyPoint : false
-    property color  _outerTextColor:    _currentItem ? "black" : qgcPal.text
+    property bool   _currentItem:       rallyPoint ? rallyPoint === controller.currentRallyPoint : false
 
     readonly property real  _margin:            ScreenTools.defaultFontPixelWidth / 2
     readonly property real  _radius:            ScreenTools.defaultFontPixelWidth / 2
@@ -47,10 +46,9 @@ Rectangle {
             anchors.left:           indicator.right
             anchors.verticalCenter: parent.verticalCenter
             text:                   qsTr("Rally Point")
-            color:                  _outerTextColor
         }
 
-        Image {
+        QGCColoredImage {
             id:                     hamburger
             anchors.rightMargin:    _margin
             anchors.right:          parent.right
@@ -59,14 +57,12 @@ Rectangle {
             height:                 width
             sourceSize.height:      height
             source:                 "qrc:/qmlimages/Hamburger.svg"
-
+            color:                  qgcPal.text
             MouseArea {
                 anchors.fill:   parent
                 onClicked:      hamburgerMenu.popup()
-
                 Menu {
                     id: hamburgerMenu
-
                     MenuItem {
                         text:           qsTr("Delete")
                         onTriggered:    controller.removePoint(rallyPoint)
@@ -74,7 +70,7 @@ Rectangle {
                 }
             }
         }
-    } // Item - titleBar
+    }
 
     Rectangle {
         id:                 valuesRect

src/QGCPalette.cc

@@ -73,13 +73,13 @@ void QGCPalette::_buildMap(void)
     DECLARE_QGC_COLOR(alertBackground,      "#eecc44", "#eecc44", "#eecc44", "#eecc44")
     DECLARE_QGC_COLOR(alertBorder,          "#808080", "#808080", "#808080", "#808080")
     DECLARE_QGC_COLOR(alertText,            "#000000", "#000000", "#000000", "#000000")
-    DECLARE_QGC_COLOR(missionItemEditor,    "#585858", "#8cb3be", "#585858", "#8cb3be")
+    DECLARE_QGC_COLOR(missionItemEditor,    "#585858", "#a39fd3", "#585858", "#4e4480")
 
     // Colors are not affecting by theming
     DECLARE_QGC_COLOR(mapWidgetBorderLight, "#ffffff", "#ffffff", "#ffffff", "#ffffff")
     DECLARE_QGC_COLOR(mapWidgetBorderDark,  "#000000", "#000000", "#000000", "#000000")
     DECLARE_QGC_COLOR(brandingPurple,       "#4A2C6D", "#4A2C6D", "#4A2C6D", "#4A2C6D")
-    DECLARE_QGC_COLOR(brandingBlue,         "#48D6FF", "#48D6FF", "#48D6FF", "#48D6FF")
+    DECLARE_QGC_COLOR(brandingBlue,         "#48D6FF", "#6045c5", "#48D6FF", "#6045c5")
 }
 
 void QGCPalette::setColorGroupEnabled(bool enabled)

src/QmlControls/QmlTest.qml

@@ -841,6 +841,38 @@ Rectangle {
                     text: palette.alertText
                 }
 
+                // missionItemEditor
+                Loader {
+                    sourceComponent: rowHeader
+                    property var text: "missionItemEditor"
+                }
+                ClickableColor {
+                    property var palette: QGCPalette { colorGroupEnabled: false }
+                    color: palette.missionItemEditor
+                    onColorSelected: palette.missionItemEditor = color
+                }
+                ClickableColor {
+                    property var palette: QGCPalette { colorGroupEnabled: true }
+                    color: palette.missionItemEditor
+                    onColorSelected: palette.missionItemEditor = color
+                }
+                Text {
+                    width: 80
+                    height: 20
+                    color: "black"
+                    horizontalAlignment: Text.AlignHCenter
+                    property var palette: QGCPalette { colorGroupEnabled: false }
+                    text: palette.missionItemEditor
+                }
+                Text {
+                    width: 80
+                    height: 20
+                    color: "black"
+                    horizontalAlignment: Text.AlignHCenter
+                    property var palette: QGCPalette { colorGroupEnabled: true }
+                    text: palette.missionItemEditor
+                }
+
             }
 
             Column {