agl-compositor: Conversion to agl-compositor

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

diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index 14c7b6b..489b1e0 100644 (file)
--- 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, 2018, 2019 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,28 +18,30 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
+import QtQuick.Window 2.2
 
 Item {
     id: root
-    width: 785
-    height: 218
-
 
     ListModel {
         id: applicationModel
         ListElement {
-            name: 'Home'
-            application: ''
+            appid: 'launcher'
+            name: 'launcher'
+            application: 'launcher@0.1'
         }
         ListElement {
-            name: 'Multimedia'
+            appid: 'mediaplayer'
+            name: 'MediaPlayer'
             application: 'mediaplayer@0.1'
         }
         ListElement {
+            appid: 'hvac'
             name: 'HVAC'
             application: 'hvac@0.1'
         }
         ListElement {
+            appid: 'navigation'
             name: 'Navigation'
             application: 'navigation@0.1'
         }
@@ -48,35 +51,19 @@ Item {
 
     RowLayout {
         anchors.fill: parent
-        spacing: 2
+        spacing: 0
         Repeater {
             model: applicationModel
             delegate: ShortcutIcon {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 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 = ''
-                    }
-                    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.log("Activating: " + model.appid)
+                    homescreenHandler.tapShortcut(model.appid)
                 }
             }
-        }
+       }
     }
 }