X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fqml%2FShortcutArea.qml;h=a8ce1279cceceae761d2c382738964f83580bbb9;hb=7dcc687d179c645f4ccf7fffdb507e18b8d562c4;hp=e0c9182f363b236dda4ade790120447dc83cf6f8;hpb=85392e71f90a0322fdc08359ef1d829cdcf67381;p=apps%2Fhomescreen.git

diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index e0c9182..a8ce127 100644
--- a/homescreen/qml/ShortcutArea.qml
+++ b/homescreen/qml/ShortcutArea.qml
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * 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.
@@ -28,18 +28,22 @@ Item {
     ListModel {
         id: applicationModel
         ListElement {
+            appid: 'launcher'
             name: 'launcher'
             application: 'launcher@0.1'
         }
         ListElement {
+            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'
         }
@@ -58,15 +62,7 @@ Item {
                 name: model.name
                 active: model.name === launcher.current
                 onClicked: {
-                    pid = launcher.launch(model.application)
-                    if (1 < pid) {
-                        applicationArea.visible = true
-                    }
-                    else {
-                        console.warn(model.application)
-                        console.warn("app cannot be launched!")
-                    }
-                    homescreenHandler.tapShortcut(model.name)
+                    homescreenHandler.tapShortcut(model.appid)
                 }
             }
         }