registerShortcut

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

diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index d7e97f0..217aa9f 100644 (file)
--- 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.
@@ -24,55 +24,41 @@ Item {
     width: 785
     height: 218
 
-
-    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'
-        }
-    }
-
     property int pid: -1
 
     RowLayout {
         anchors.fill: parent
         spacing: 2
         Repeater {
-            model: applicationModel
+            id: repeater
+            model: shortcutAppModel
             delegate: ShortcutIcon {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                name: model.name
-                active: model.name === launcher.current
+                name: shortcutAppModel.getName(model.index)
+                icon: shortcutAppModel.getIcon(model.index)
+                isBlank: shortcutAppModel.isBlank(model.index)
+                active: shortcutAppModel.getName(model.index).toLowerCase() === 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.appid)
+                   console.log("launcher.current====="+homescreenHandler.getCurrentApplication())
+                    if(launcher.current === shortcutAppModel.getName(model.index)) {
+                        return
+                    }                    
+                   homescreenHandler.tapShortcut(shortcutAppModel.getId(model.index), false)
                 }
             }
         }
     }
+
+    Connections {
+        target: shortcutAppModel
+        onUpdateShortcut: {
+            for(var i = 0; i < 4; i++) {
+                var item = repeater.itemAt(i)
+                item.name = shortcutAppModel.getName(i)
+                item.icon = shortcutAppModel.getIcon(i)
+                item.isBlank = shortcutAppModel.isBlank(i)
+            }
+        }
+    }
 }