registerShortcut

[apps/homescreen.git] / homescreen / qml / StatusArea.qml

diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml
index 3fc3079..961cd88 100644 (file)
--- 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,15 +98,23 @@ 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'
                         font.pixelSize: 32
                     }
                 }
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        homescreenHandler.killRunningApplications()
+                    }
+                }
             }
         }
         ColumnLayout {
@@ -91,11 +123,33 @@ Item {
             Layout.fillHeight: true
             Layout.preferredWidth: 76
             spacing: -10
+            Rectangle {
+                Layout.preferredWidth: 77
+                Layout.preferredHeight: 55
+                opacity: 0
+            }
+
+            Image {
+                id: bt_icon
+                Layout.preferredWidth: 77
+                Layout.preferredHeight: 55
+                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
+                    Layout.preferredHeight: 55
                     source: model.modelData
                     fillMode: Image.PreserveAspectFit
                 }