X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fqml%2FShortcutArea.qml;h=33ec53998c815529ee86c87ba31f11cbe7f3011a;hb=8f71f12c3622466f813ea12b64ee34e8b4102341;hp=1d4a7c064545051f6eb312c478723bed074b3efd;hpb=79714c0aa8fc461d77b75d6c5dae6a1a7d726954;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/qml/ShortcutArea.qml b/HomeScreen/qml/ShortcutArea.qml
index 1d4a7c0..33ec539 100644
--- a/HomeScreen/qml/ShortcutArea.qml
+++ b/HomeScreen/qml/ShortcutArea.qml
@@ -17,42 +17,68 @@
 
 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: 'webapps-rabbit@0.0'
+            application: 'home@0.1'
+            label: 'HOME'
         }
         ListElement {
             name: 'Multimedia'
-            application: 'smarthome@0.1'
+            application: 'mediaplayer@0.1'
+            label: 'MULTIMEDIA'
         }
         ListElement {
             name: 'HVAC'
-            application: 'hvac'
+            application: 'hvac@0.1'
+            label: 'HVAC'
         }
         ListElement {
             name: 'Navigation'
-            application: 'navigation'
+            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
 
     RowLayout {
@@ -64,13 +90,34 @@ Item {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 name: model.name
-                active: model.index === root.currentIndex
+                active: model.application === launcher.current
                 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()
+                        launcher.current = ''
+                    }
+                    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()
+    }
 }