X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fqml%2FShortcutArea.qml;h=b33df22801a5309db0174e566f746757640fe67d;hb=e7ab450f4827c66dbcb67f49317c045512e22789;hp=14c7b6be9508e7fe2dc0bc078adea525c23d1c1d;hpb=0592a405aa68f3baf6773795efa5522e4ee16779;p=apps%2Fhomescreen.git

diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index 14c7b6b..b33df22 100644
--- a/homescreen/qml/ShortcutArea.qml
+++ b/homescreen/qml/ShortcutArea.qml
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (c) 2017 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.
@@ -20,27 +21,41 @@ import QtQuick.Layouts 1.1
 
 Item {
     id: root
-    width: 785
-    height: 218
+    width: 700
+    height: 110
+
+    Timer {
+        id:informationTimer
+        interval: 3000
+        running: false
+        repeat: true
+        onTriggered: {
+            bottomInformation.visible = false
+        }
+    }
 
 
     ListModel {
         id: applicationModel
         ListElement {
-            name: 'Home'
-            application: ''
+            name: 'launcher'
+            application: 'launcher@0.1'
         }
         ListElement {
-            name: 'Multimedia'
+            name: 'MediaPlayer'
             application: 'mediaplayer@0.1'
         }
         ListElement {
-            name: 'HVAC'
-            application: 'hvac@0.1'
+            name: 'navigation'
+            application: 'navigation@0.1'
+        }
+        ListElement {
+            name: 'Phone'
+            application: 'phone@0.1'
         }
         ListElement {
-            name: 'Navigation'
-            application: 'navigation@0.1'
+            name: 'settings'
+            application: 'settings@0.1'
         }
     }
 
@@ -48,35 +63,66 @@ Item {
 
     RowLayout {
         anchors.fill: parent
-        spacing: 2
+        spacing: 75
         Repeater {
             model: applicationModel
             delegate: ShortcutIcon {
-                Layout.fillWidth: true
-                Layout.fillHeight: true
+//                Layout.fillWidth: true
+//                Layout.fillHeight: true
+                width: 60
+                height: 60
                 name: model.name
-                active: model.application === launcher.current
+                active: model.name === launcher.current
                 onClicked: {
-                    if (0 === model.index) {
-                        appLauncherAreaLauncher.visible = true
-                        applicationArea.visible = false
-                        layoutHandler.hideAppLayer()
-                        launcher.current = ''
+                    if(model.application === 'navigation@0.1') {
+                        pid = launcher.launch('browser@5.0')
+                    } else {
+                        pid = launcher.launch(model.application.toLowerCase())
+                    }
+
+                    if (1 < pid) {
+                        applicationArea.visible = true
                     }
                     else {
-                        pid = launcher.launch(model.application)
-                        if (1 < pid) {
-                            applicationArea.visible = true
-                            appLauncherAreaLauncher.visible = false
-                            layoutHandler.makeMeVisible(pid)
-                            layoutHandler.showAppLayer(pid)
-                        }
-                        else {
-                            console.warn("app cannot be launched!")
-                        }
+                        console.warn(model.application)
+                        console.warn("app cannot be launched!")
+                    }
+                    if(model.name === 'Navigation') {
+                        homescreenHandler.tapShortcut('browser')
+                    } else {
+                        homescreenHandler.tapShortcut(model.name)
                     }
                 }
             }
         }
     }
+    Rectangle {
+        id: bottomInformation
+        width: parent.width
+        height: parent.height-20
+        anchors.bottom: parent.bottom
+        color: "gray"
+        z: 1
+        opacity: 0.8
+        visible: false
+
+        Text {
+            id: informationText
+            anchors.centerIn: parent
+            font.pixelSize: 25
+            font.letterSpacing: 5
+            horizontalAlignment: Text.AlignHCenter
+            color: "white"
+            text: ""
+        }
+    }
+
+    Connections {
+        target: homescreenHandler
+        onInformation: {
+            informationText.text = text
+            bottomInformation.visible = true
+            informationTimer.restart()
+        }
+    }
 }