diff options
author | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2016-10-05 14:07:27 +0200 |
---|---|---|
committer | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2016-10-06 06:48:25 +0000 |
commit | 36c8b839bb1da7decebaa2bc7deb0cca04e3f478 (patch) | |
tree | e6fd01b87cd2ebcdd2f590b64acc62af0a8621ee /sysui | |
parent | e720488817423b25de1b21afe5c69a9743210890 (diff) |
Moved VehicleService to system model
Vehicle service should be part of the system UI
and not available to an app. It is renamed and moved
to system models.
Change-Id: Ic00c4cc1835ab4ec7a134fc60fd6dbacb63944cf
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'sysui')
-rw-r--r-- | sysui/Cluster/Fuel.qml | 4 | ||||
-rw-r--r-- | sysui/Cluster/LeftDial.qml | 6 | ||||
-rw-r--r-- | sysui/Cluster/Middle.qml | 2 | ||||
-rw-r--r-- | sysui/Cluster/RightDial.qml | 14 |
4 files changed, 14 insertions, 12 deletions
diff --git a/sysui/Cluster/Fuel.qml b/sysui/Cluster/Fuel.qml index 2beabec..3cf1d58 100644 --- a/sysui/Cluster/Fuel.qml +++ b/sysui/Cluster/Fuel.qml @@ -32,7 +32,7 @@ import QtQuick 2.1 import utils 1.0 import controls 1.0 -import service.vehicle 1.0 +import models 1.0 Item { id: root @@ -40,7 +40,7 @@ Item { width: 0.73 * Style.clusterHeight height: width -1 - property real value: VehicleService.fuel <= 0.3 ? (VehicleService.fuel + 0.1) : VehicleService.fuel + property real value: VehicleModel.fuel <= 0.3 ? (VehicleModel.fuel + 0.1) : VehicleModel.fuel Behavior on value { NumberAnimation { diff --git a/sysui/Cluster/LeftDial.qml b/sysui/Cluster/LeftDial.qml index d2adfd1..9321b70 100644 --- a/sysui/Cluster/LeftDial.qml +++ b/sysui/Cluster/LeftDial.qml @@ -32,7 +32,7 @@ import QtQuick 2.1 import QtGraphicalEffects 1.0 import utils 1.0 -import service.vehicle 1.0 +import models 1.0 Item { id: root @@ -80,7 +80,7 @@ Item { font.pixelSize: 60 font.letterSpacing: 4 color: Style.colorWhite - text: VehicleService.displaySpeed + text: VehicleModel.displaySpeed } Rectangle { @@ -126,7 +126,7 @@ Item { anchors.centerIn: overlay anchors.verticalCenterOffset: 2 fillImage: "cluster/dial_fill_color_left" - value: VehicleService.speed / 240 + value: VehicleModel.speed / 240 Tracer {} } diff --git a/sysui/Cluster/Middle.qml b/sysui/Cluster/Middle.qml index 89c0829..b0b5f2c 100644 --- a/sysui/Cluster/Middle.qml +++ b/sysui/Cluster/Middle.qml @@ -53,6 +53,8 @@ Item { ListView { id: stack anchors.fill: parent + anchors.bottomMargin: 20 + anchors.topMargin: 25 orientation: ListView.Horizontal snapMode: ListView.SnapOneItem highlightMoveDuration: 300 diff --git a/sysui/Cluster/RightDial.qml b/sysui/Cluster/RightDial.qml index 1efa2bf..faaf94b 100644 --- a/sysui/Cluster/RightDial.qml +++ b/sysui/Cluster/RightDial.qml @@ -32,7 +32,7 @@ import QtQuick 2.1 import utils 1.0 import controls 1.0 -import service.vehicle 1.0 +import models 1.0 import service.navigation 1.0 Item { @@ -102,7 +102,7 @@ Item { height: width radius: width color: "transparent" - border.color: (VehicleService.fuel < 0.4 || NavigationService.traficAlert) ? Style.colorOrange : "white" + border.color: (VehicleModel.fuel < 0.4 || NavigationService.traficAlert) ? Style.colorOrange : "white" border.width: rect.borderWidth anchors.centerIn: parent anchors.horizontalCenterOffset: -3 @@ -110,7 +110,7 @@ Item { property int borderWidth: 3 SequentialAnimation { - running: (VehicleService.fuel < 0.4 || NavigationService.traficAlert) + running: (VehicleModel.fuel < 0.4 || NavigationService.traficAlert) loops: Animation.Infinite NumberAnimation { @@ -160,8 +160,8 @@ Item { anchors.topMargin: 20 anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenterOffset: 5 - source: VehicleService.rightDialIcon - scale: VehicleService.rightIconScale + source: VehicleModel.rightDialIcon + scale: VehicleModel.rightIconScale } Item { @@ -187,7 +187,7 @@ Item { horizontalAlignment: Text.AlignHCenter font.pixelSize: 0.05 * root.height font.bold: true - text: VehicleService.rightDialMainText + text: VehicleModel.rightDialMainText } } } @@ -212,6 +212,6 @@ Item { fillImage: "cluster/dial_fill_color" circleRadius: "0.29" dialCursor: "cluster/dial_cursor_right" - value: VehicleService.rightDialValue + value: VehicleModel.rightDialValue } } |