X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fqml%2FStatusArea.qml;h=4a8fbc0ae6e9acc160b3438c5c20548a049b23df;hb=refs%2Fheads%2Fquillback;hp=ab14a23c019240818a5200f3879880e93af9fafd;hpb=85392e71f90a0322fdc08359ef1d829cdcf67381;p=apps%2Fhomescreen.git diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml index ab14a23..4a8fbc0 100644 --- a/homescreen/qml/StatusArea.qml +++ b/homescreen/qml/StatusArea.qml @@ -1,6 +1,7 @@ /* * Copyright (C) 2016 The Qt Company Ltd. * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH + * Copyright (c) 2017, 2018 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +22,8 @@ import HomeScreen 1.0 Item { id: root - width: 295 - height: 218 + //width: 295 + //height: 216 property date now: new Date Timer { @@ -36,13 +37,13 @@ Item { onConditionChanged: { var icon = '' - if (condition.indexOf("clouds") != -1) { + if (condition.indexOf("clouds") !== -1) { icon = "WeatherIcons_Cloudy-01.png" - } else if (condition.indexOf("thunderstorm") != -1) { + } else if (condition.indexOf("thunderstorm") !== -1) { icon = "WeatherIcons_Thunderstorm-01.png" - } else if (condition.indexOf("snow") != -1) { + } else if (condition.indexOf("snow") !== -1) { icon = "WeatherIcons_Snow-01.png" - } else if (condition.indexOf("rain") != -1) { + } else if (condition.indexOf("rain") !== -1) { icon = "WeatherIcons_Rain-01.png" } @@ -116,8 +117,25 @@ Item { Layout.fillHeight: true Layout.preferredWidth: 76 spacing: -10 + + Image { + id: bt_icon + Layout.preferredWidth: 77 + Layout.preferredHeight: 73 + source: connStatus ? './images/Status/HMI_Status_Bluetooth_On-01.png' : './images/Status/HMI_Status_Bluetooth_Inactive-01.png' + fillMode: Image.PreserveAspectFit + property string deviceName: "none" + property bool connStatus: false + Connections { + target: bluetooth + + onPowerChanged: { + bt_icon.connStatus = state + } + } + } Repeater { - model: StatusBarModel {} + model: StatusBarModel { objectName: "statusBar" } delegate: Image { Layout.preferredWidth: 77 Layout.preferredHeight: 73