1 files changed, 104 insertions, 35 deletions

diff --git a/doc/src/snippets/qtcluster/qml/dash_hybrid/DashboardForm.ui.qml b/doc/src/snippets/qtcluster/qml/dash_hybrid/DashboardForm.ui.qml
index 0d7bc535f..eb2aef4c6 100644
--- a/doc/src/snippets/qtcluster/qml/dash_hybrid/DashboardForm.ui.qml
+++ b/doc/src/snippets/qtcluster/qml/dash_hybrid/DashboardForm.ui.qml
@@ -55,31 +55,24 @@ DashboardBackground {
     property alias tachometer: tachometer
     property alias speedText: speedText
     property alias smallMeter: smallMeter
-
-    gadget2.green: tachometer.actualValue < 4000
-    gadget2.value: tachometer.actualValue
-    gadget2.maxValue: 8000
-    gadget.green: speedometer.actualValue < 100
-    gadget.value: speedometer.actualValue
+    property alias consumptionMeter: consumptionMeter
 
     anchors.fill: parent
 
     // Fuelmeter
-
     SmallMeter {
         id: fuelMeter
-        x: 432
-        y: 47
+        x: 740
+        y: 45
         value: ValueSource.fuelLevel
         opacity: dashboardEntity.meterOpacity
     }
 
     // Batterymeter
-
     SmallMeter {
         id: batteryMeter
-        x: 433
-        y: 47
+        x: 739
+        y: 45
         value: ValueSource.batteryLevel
         opacity: dashboardEntity.meterOpacity
         maxValueAngle: 317
@@ -93,20 +86,21 @@ DashboardBackground {
 
     // Consumptionmeter
 
-    ConsumptionMeter {
-        opacity: dashboardEntity.meterOpacity
-    }
     // Temperaturemeter
-
     TemperatureMeter {
         opacity: dashboardEntity.meterOpacity
+
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.rightMargin: 640
+        anchors.topMargin: 82
     }
-    // Turbometer
 
+    // Turbometer
     SmallMeter {
         id: smallMeter
-        x: 741
-        y: 47
+        x: 437
+        y: 45
         opacity: dashboardEntity.meterOpacity
 
         value: ValueSource.rpm / 2000.
@@ -119,16 +113,20 @@ DashboardBackground {
     }
 
     // Fpsmeter
-
     FpsMeter {
+        x: 582
         opacity: dashboardEntity.meterOpacity
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.rightMargin: 591
+        anchors.topMargin: 87
     }
 
     // Bottom Panel
-
     BottomPanel {
         id: bottompanel
-        y: 402
+        y: 412
+        anchors.horizontalCenterOffset: 0
     }
 
     SpeedometerNumbers {
@@ -143,23 +141,82 @@ DashboardBackground {
         id: speedometer
 
         opacity: dashboardEntity.meterOpacity
-        x: 35
-        y: 8
+        x: 34
+        y: 3
         actualValue: ValueSource.kph
+        maxValueAngle: 304
+
+        layer.enabled: opacity < 1
+
+        Gadget {
+            id: knobLeft
+            x: 113
+            y: 118
+
+            green: speedometer.actualValue < 100
+            value: speedometer.actualValue
+        }
     }
 
+
     LargeMeter {
         id: tachometer
         opacity: dashboardEntity.meterOpacity
-        x: 768
-        y: 8
+        x: 763
+        y: 2
+        actualValue: 6000
         minValueAngle: 55
         maxValueAngle: 255
         minimumValue: 0
         maximumValue: 8000
-        limitValue: 4000
+        limitValue: 7000
+
+        layer.enabled: opacity < 1
+
+        LargeMeter {
+            id: consumptionMeter
+            x: 1
+            y: -2
+            fillWidth: 22
+            limitValue: 22
+            angleOffset: 72
+            actualValue: 30
+            visible: true
+
+            minValueAngle: 379
+            maxValueAngle: 291
+            minimumValue: 0
+            maximumValue: 30
+        }
+
+        Gadget {
+            id: knobRight
+            x: 116
+            y: 117
+
+            green: tachometer.actualValue < 7000
+            value: tachometer.actualValue
+            maxValue: 8000
+
+            Text {
+                id: textEco
+                x: -56
+                y: 156
+
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: tachometer.actualValue > 6000 ? "POWER" : "ECO"
+                anchors.verticalCenterOffset: 3
+                anchors.horizontalCenterOffset: 7
+                visible: true
+                anchors.verticalCenter: parent.verticalCenter
+                font.pixelSize: 18
+                color: tachometer.actualValue <= 6000 ? "white" : "red"
+                opacity: dashboardEntity.meterOpacity
+            }
+        }
     }
 
+
     Text {
         id: speedText
         x: 74
@@ -172,6 +229,7 @@ DashboardBackground {
         opacity: dashboardEntity.meterOpacity
     }
 
+
     Text {
         id: speedUnitText
         anchors.top: speedText.bottom
@@ -181,15 +239,26 @@ DashboardBackground {
         anchors.horizontalCenter: speedText.horizontalCenter
         opacity: dashboardEntity.meterOpacity
     }
-    Text {
-        id: textEco
 
-        anchors.horizontalCenter: tachometer.horizontalCenter
-        text: tachometer.actualValue > 4000 ? "POWER" : "ECO"
-        anchors.verticalCenter: tachometer.verticalCenter
-        font.pixelSize: 18
-        color: tachometer.actualValue <= 4000 ? "white" : "red"
-        opacity: dashboardEntity.meterOpacity
+
+    Image {
+        id: knobSmallLeft
+        x: 460
+        y: 68
+        source: "image://etc/knob_small.png"
     }
 
+    Image {
+        id: knobSmallRight
+        x: 763
+        y: 70
+        source: "image://etc/knob_small.png"
+    }
+
+    Image {
+        id: knobSmallcenter
+        x: 610
+        y: 62
+        source: "image://etc/knob_small.png"
+    }
 }