X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fqml%2FStatusArea.qml;h=14ccb8f7f3e4e1e4fe761248ebd9f8ccb637b89a;hb=refs%2Fchanges%2F34%2F22534%2F1;hp=3fc30797d148dd2448b025288d70376c4b8c8d8b;hpb=0592a405aa68f3baf6773795efa5522e4ee16779;p=apps%2Fhomescreen.git

diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml
index 3fc3079..14ccb8f 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.
@@ -17,7 +18,6 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.0
 import HomeScreen 1.0
 
 Item {
@@ -31,6 +31,30 @@ Item {
         onTriggered: root.now = new Date
     }
 
+    Connections {
+        target: weather
+
+        onConditionChanged: {
+            var icon = ''
+
+            if (condition.indexOf("clouds") !== -1) {
+                icon = "WeatherIcons_Cloudy-01.png"
+            } else if (condition.indexOf("thunderstorm") !== -1) {
+                icon = "WeatherIcons_Thunderstorm-01.png"
+            } else if (condition.indexOf("snow") !== -1) {
+                icon = "WeatherIcons_Snow-01.png"
+            } else if (condition.indexOf("rain") !== -1) {
+                icon = "WeatherIcons_Rain-01.png"
+            }
+
+            condition_item.source = icon ? './images/Weather/' + icon : ''
+        }
+
+        onTemperatureChanged: {
+            temperature_item.text = temperature.split(".")[0] + '°F'
+        }
+    }
+
     RowLayout {
         anchors.fill: parent
         spacing: 0
@@ -74,9 +98,11 @@ Item {
                     Layout.fillHeight: true
                     Layout.preferredHeight: 20
                     Image {
+                        id: condition_item
                         source: './images/Weather/WeatherIcons_Rain-01.png'
                     }
                     Text {
+                        id: temperature_item
                         text: '64°F'
                         color: 'white'
                         font.family: 'Helvetica'
@@ -91,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