Merge pull request #7633 from yasendimov/pr_custom-example-theme

PR Custom example theme

custom-example/res/Custom/Widgets/CustomToolBarButton.qml

@@ -40,7 +40,7 @@ Button {
             width:                  height
             sourceSize.height:      parent.height
             fillMode:               Image.PreserveAspectFit
-            color:                  (mouseArea.pressed || button.checked) ? qgcPal.colorOrange : qgcPal.buttonText
+            color:                  (mouseArea.pressed || button.checked) ? qgcPal.primaryButton : qgcPal.buttonText
             source:                 button.icon.source
             anchors.verticalCenter: parent.verticalCenter
         }
@@ -48,7 +48,7 @@ Button {
             id:                     _label
             visible:                text !== ""
             text:                   button.text
-            color:                  (mouseArea.pressed || button.checked) ? qgcPal.colorOrange : qgcPal.buttonText
+            color:                  (mouseArea.pressed || button.checked) ? qgcPal.primaryButton : qgcPal.buttonText
             anchors.verticalCenter: parent.verticalCenter
         }
     }

custom-example/res/CustomCameraControl.qml

@@ -88,7 +88,7 @@ Item {
             id:             backgroundRect
             width:          buttonsRow.width  + (ScreenTools.defaultFontPixelWidth  * 4)
             height:         buttonsRow.height + (ScreenTools.defaultFontPixelHeight)
-            color:          qgcPal.windowShade
+            color:          qgcPal.window
             radius:         height * 0.5
             visible:        _camera && _camera.modelName === "DSC-QX30" && QGroundControl.videoManager.hasThermal
             anchors.horizontalCenter: parent.horizontalCenter
@@ -198,7 +198,7 @@ Item {
             id:             cameraRect
             height:         cameraCol.height
             width:          cameraCol.width + (ScreenTools.defaultFontPixelWidth * 4)
-            color:          qgcPal.windowShade
+            color:          qgcPal.window
             radius:         ScreenTools.defaultFontPixelWidth * 0.5
             anchors.horizontalCenter: parent.horizontalCenter
             Column {
@@ -274,7 +274,7 @@ Item {
                             fillMode:           Image.PreserveAspectFit
                             mipmap:             true
                             smooth:             true
-                            color:              qgcPal.windowShade
+                            color:              qgcPal.window
                             visible: {
                                 if(_cameraPhotoMode && !_cameraPhotoIdle && !_cameraElapsedMode) {
                                     return true
@@ -426,7 +426,7 @@ Item {
         ZoomControl {
             id:             zoomControl
             visible:        _hasZoom
-            mainColor:      qgcPal.windowShade
+            mainColor:      qgcPal.window
             contentColor:   qgcPal.text
             fontPointSize:  ScreenTools.defaultFontPointSize * 1.25
             zoomLevelVisible: false

custom-example/res/CustomFlyView.qml

@@ -251,7 +251,7 @@ Item {
     //-- Vehicle Indicator
     Rectangle {
         id:                     vehicleIndicator
-        color:                  qgcPal.windowShade
+        color:                  qgcPal.window
         width:                  vehicleStatusGrid.width  + (ScreenTools.defaultFontPixelWidth  * 3)
         height:                 vehicleStatusGrid.height + (ScreenTools.defaultFontPixelHeight * 1.5)
         radius:                 2
@@ -460,7 +460,7 @@ Item {
 
     //-- Attitude Indicator
     Rectangle {
-        color:                  qgcPal.windowShade
+        color:                  qgcPal.window
         width:                  attitudeIndicator.width * 0.5
         height:                 vehicleIndicator.height
         visible:                _showAttitude
@@ -581,7 +581,7 @@ Item {
                     }
                     QGCLabel {
                         text:           qsTr("The vehicle will automatically cancel the flight and return to land. Ensure a clear line of sight between transmitter and vehicle. Ensure the takeoff location is clear.")
-                width:          connectionLostArmed.width * 0.75
+                        width:          connectionLostArmed.width * 0.75
                         wrapMode:       Text.WordWrap
                         color:          qgcPal.alertText
                         font.family:    ScreenTools.demiboldFontFamily

src/QmlControls/ToolStrip.qml

@@ -16,7 +16,7 @@ import QGroundControl.Controls      1.0
 
 Rectangle {
     id:         _root
-    color:      qgcPal.windowShade
+    color:      qgcPal.window
     width:      _idealWidth < repeater.contentWidth ? repeater.contentWidth : _idealWidth
     height:     toolStripColumn.height + (toolStripColumn.anchors.margins * 2)
     radius:     ScreenTools.defaultFontPixelWidth / 2