From 7d29d877baafe52cc0e0bbdf7d86deff61073651 Mon Sep 17 00:00:00 2001
From: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Date: Tue, 28 May 2019 14:00:55 +0800
Subject: registerShortcut

Change-Id: I66dbf6f12a890e67908594ed238556f5456b7ed7
---
 homescreen/qml/ShortcutArea.qml | 52 ++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

(limited to 'homescreen/qml/ShortcutArea.qml')

diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index a8ce127..217aa9f 100644
--- a/homescreen/qml/ShortcutArea.qml
+++ b/homescreen/qml/ShortcutArea.qml
@@ -24,47 +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: {
-                    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)
+            }
+        }
+    }
 }
-- 
cgit 1.2.3-korg