diff options
| author | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2016-10-10 10:34:10 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2016-10-12 12:53:10 +0000 |
| commit | 9defbe5b3286e3fabcbae594211bf8294f766eb4 (patch) | |
| tree | 3b877b502467e75bcb2eab8ebdec35341e27bf7a | |
| parent | da835a1346ef5ff97030479712830bb5556de545 (diff) | |
| download | neptune-ui-9defbe5b3286e3fabcbae594211bf8294f766eb4.tar.gz | |
Updated API for System Monitor
* Updated API to launch system monitor
* Always enable dial animation
Change-Id: I309804188c84ba0f9f3b2843f0b5b27cc81eb23f
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
| -rw-r--r-- | imports/system/models/VehicleModel.qml | 8 | ||||
| -rw-r--r-- | sysui/Cloud/Settings/SettingsScreen.qml | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/imports/system/models/VehicleModel.qml b/imports/system/models/VehicleModel.qml index 4e46252..9010d2d 100644 --- a/imports/system/models/VehicleModel.qml +++ b/imports/system/models/VehicleModel.qml @@ -37,7 +37,7 @@ import QtApplicationManager 1.0 QtObject { id: root - property bool dialAnimation: navigationControl.navigationRunning + property bool dialAnimation: true property real speed: navigationControl.navigationRunning ? navigationControl.navigationSpeed : 0 @@ -91,10 +91,8 @@ QtObject { interval: 4000 property bool higherValue: false onTriggered: { - if (navigationControl.navigationRunning) - root.speed = higherValue ? (navigationControl.navigationSpeed - 5) : (navigationControl.navigationSpeed +5) - else - root.speed = higherValue ? (0) : (120) + root.speed = higherValue ? (navigationControl.navigationSpeed) : (navigationControl.navigationSpeed +5) + higherValue = !higherValue } } diff --git a/sysui/Cloud/Settings/SettingsScreen.qml b/sysui/Cloud/Settings/SettingsScreen.qml index d2b4936..d96fe62 100644 --- a/sysui/Cloud/Settings/SettingsScreen.qml +++ b/sysui/Cloud/Settings/SettingsScreen.qml @@ -69,7 +69,7 @@ UIElement { } else if (titleText === "SYSTEM MONITOR") { systemMonitorLoader.active = true - ApplicationManagerInterface.applicationSurfaceReady(systemMonitorLoader.item) + ApplicationManagerInterface.applicationSurfaceReady(systemMonitorLoader.item, false) } } } |