X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=launcher%2Fqml%2FLauncher.qml;h=befce07ea047aa3f8d6d25ec08b1c762c7a2b487;hb=refs%2Fchanges%2F55%2F26955%2F2;hp=26e42fc91d8c3b77310dafc8c00dad632a6c8c88;hpb=5fbb59e80e4f870a1badd694d2efcd8cd941cdfb;p=apps%2Flauncher.git

diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml
index 26e42fc..befce07 100644
--- a/launcher/qml/Launcher.qml
+++ b/launcher/qml/Launcher.qml
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 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.
@@ -16,25 +16,24 @@
  * limitations under the License.
  */
 import QtQuick 2.6
-import QtQuick.Window 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
+import QtQuick.Window 2.13
 import AppModel 1.0
 
-Window {
-    visible: true
-    flags: Qt.FramelessWindowHint
-    width: container.width * container.scale
-    height: container.height * container.scale
+ApplicationWindow {
 
-    property int pid: -1
+    id: root 
+    //width: container.width
+    //height: container.height
+    flags: Qt.FramelessWindowHint
+    visible: true
 
     Item {
         id: container
         anchors.centerIn: parent
-        width: 1080
-        height: 1487
-        scale: screenInfo.scale_factor()
+        width: Window.width
+        height: Window.height
 
         Image {
           anchors.centerIn: parent
@@ -62,27 +61,45 @@ Window {
             height: grid.cellHeight
         }
 
+        Connections {
+            target: homescreenHandler
+            onAppListUpdate: {
+                console.warn("applist update in Launcher.qml")
+                applicationModel.updateApplist(info);
+            }
+        }
+        Connections {
+            target: homescreenHandler
+            onInitAppList: {
+                console.warn("applist init in Launcher.qml")
+                applicationModel.initAppList(data);
+            }
+        }
+
         MouseArea {
             id: loc
             anchors.fill: parent
             property string currentId: ''
             property int newIndex: -1
             property int index: grid.indexAt(loc.mouseX, loc.mouseY)
+	    property string output_screen: ''
             x: 62
             y: 264
             onPressAndHold: currentId = applicationModel.id(newIndex = index)
             onReleased: {
+                if(loc.index < 0) {
+                    return
+                }
+
+	        //if (applicationModel.appid(loc.index) === 'tbtnavi' ||
+		//    applicationModel.appid(loc.index) === 'hvac') {
+		//	output_screen = 'Virtual-1'
+		//}
                 if (currentId === '') {
-                    pid = launcher.launch(applicationModel.id(loc.index))
-                    if (1 < pid) {
-                    }
-                    else {
-                        console.warn("app cannot be launched!")
-                    }
+                    homescreenHandler.tapShortcut(applicationModel.appid(loc.index), output_screen)
                 } else {
                     currentId = ''
                 }
-                homescreenHandler.tapShortcut(applicationModel.appid(loc.index))
             }
             onPositionChanged: {
                 if (loc.currentId === '') return