X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fqml%2FShortcutArea.qml;h=4be6d9f48e0ae8fc8acd5e3d185195ed18db580a;hb=4eb645957cea169d10dd7543c5bb5a294fc737ad;hp=9ef870128f8627471966d05de5029316a1fa2fbe;hpb=67e88567cb97213348031728d59652b7c10d0e19;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/qml/ShortcutArea.qml b/HomeScreen/qml/ShortcutArea.qml
index 9ef8701..4be6d9f 100644
--- a/HomeScreen/qml/ShortcutArea.qml
+++ b/HomeScreen/qml/ShortcutArea.qml
@@ -17,41 +17,67 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
-import HomeScreen 1.0
 
 Item {
     id: root
     width: 785
     height: 218
 
-    ApplicationLauncher {
-        id: launcher
-    }
-
-    LayoutHandler {
-        id: layoutHandler
-    }
 
     ListModel {
         id: applicationModel
         ListElement {
             name: 'Home'
             application: 'home@0.1'
+            label: 'HOME'
         }
         ListElement {
             name: 'Multimedia'
-            application: 'radio@0.1'
+            application: 'mediaplayer@0.1'
+            label: 'MULTIMEDIA'
         }
         ListElement {
             name: 'HVAC'
             application: 'hvac@0.1'
+            label: 'HVAC'
         }
         ListElement {
             name: 'Navigation'
-            application: 'controls@0.1'
+            application: 'navigation@0.1'
+            label: 'NAVIGATION'
         }
     }
+    function languageChanged(lang) {
+        if(lang === "fr") {
+            applicationModel.setProperty(0, "label", 'ACCEUIL')
+
+            applicationModel.setProperty(2, "label", 'MULTIMÉDIA')
+            applicationModel.setProperty(2, "name", 'Multimedia')
+            applicationModel.setProperty(2, "application", 'mediaplayer@0.1')
+
+            applicationModel.setProperty(3, "label", 'CLIMATISATION')
+            applicationModel.setProperty(3, "name", 'HVAC')
+            applicationModel.setProperty(3, "application", 'hvac@0.1')
+
+            applicationModel.setProperty(1, "label", 'NAVIGATION')
+            applicationModel.setProperty(1, "name", 'Navigation')
+            applicationModel.setProperty(1, "application", 'navigation@0.1')
+        } else {
+            applicationModel.setProperty(0, "label", 'HOME')
 
+            applicationModel.setProperty(1, "label", 'MULTIMEDIA')
+            applicationModel.setProperty(1, "name", 'Multimedia')
+            applicationModel.setProperty(1, "application", 'mediaplayer@0.1')
+
+            applicationModel.setProperty(2, "label", 'HVAC')
+            applicationModel.setProperty(2, "name", 'HVAC')
+            applicationModel.setProperty(2, "application", 'hvac@0.1')
+
+            applicationModel.setProperty(3, "label", 'NAVIGATION')
+            applicationModel.setProperty(3, "name", 'Navigation')
+            applicationModel.setProperty(3, "application", 'navigation@0.1')
+        }
+    }
     property int currentIndex: -1 // TODO: to be moved to whereever right
     property int pid: -1
 
@@ -67,10 +93,31 @@ Item {
                 active: model.index === root.currentIndex
                 onClicked: {
                     root.currentIndex = active ? -1 : model.index
-                    pid = launcher.launch(model.application)
-                    layoutHandler.makeMeVisible(pid)
+                    if (0 === model.index) {
+                        appLauncherAreaLauncher.visible = true
+                        applicationArea.visible = false
+                        layoutHandler.hideAppLayer()
+                    }
+                    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!")
+                        }
+                    }
                 }
             }
         }
     }
+    Component.onCompleted: {
+        root.currentIndex = 0
+        appLauncherAreaLauncher.visible = true
+        applicationArea.visible = false
+        layoutHandler.hideAppLayer()
+    }
 }