fix zoom bug and reorganize hmi folder

64 files changed, 122 insertions, 131 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 157d036..f098236 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,10 @@ option(AMB_ON_DBUS_SESSION
         "Run amb on dbus session" ON)
 option(WITH_HTML_MIGRATION
         "Enable migration to the html based hmi" OFF)
+option(WITH_STYLESHEET
+        "Generate the style sheet" OFF)
 
+message(STATUS "WITH_STYLESHEET = ${WITH_STYLESHEET}")
 message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
 message(STATUS "WITH_PLUGIN_MIGRATION = ${WITH_PLUGIN_MIGRATION}")
 message(STATUS "AMB_ON_DBUS_SESSION = ${AMB_ON_DBUS_SESSION}")
@@ -81,7 +84,7 @@ endif()
 
 add_subdirectory(genivilogreplayer)
 
-add_subdirectory(hmi/qml/hmi-launcher)
+add_subdirectory(hmi)
 
 add_subdirectory(navigation/src/poi-service "${CMAKE_CURRENT_BINARY_DIR}/poi-service")
 
diff --git a/src/README.md b/src/README.md
index 84290c1..1352303 100644
--- a/src/README.md
+++ b/src/README.md
@@ -32,11 +32,11 @@ A script allows to clone the third parties code (i.e. positioning, navigation, n
 ./clone_and_build.sh
 ### Build
 A script allows either:
-to clean and rebuild all (including invoking cmake) 
-./build.sh -c
+to clean and rebuild all (invoking cmake) , including the HMI
+./build.sh -c -t
 or to build updated parts
 ./build.sh
-
+NB: with -t option a tarball is also generated (used by the GDP)
 ## How to test
 There's a file that contains some test case and the reminding issues (bug list)
 
@@ -75,14 +75,6 @@ You must build your code with position independent code if Qt was built with -re
 For Qt version 5.4, it's needed to fix Qt 5.4 QML -> C++ QVariant issues by unboxing the QVariant-QJSValue
 Potential issue may occur due to path change of freetype stuff. If necessary, add a link to /usr/include/freetype2/ into /usr/include 
 
-##How To Prepare the HMI
-
-There are two resolutions available, WVGA and XGA.
-For instance, for VGA:
-cd script
-./prepare.sh -i ../hmi/qml/Core/gimp/gdp-theme/800x480
-cd ../
-
 ##How to launch it in another area
 It's possible to test it (experimental) in another area.
 For instance, to locate the demo in Japan:
diff --git a/src/build.sh b/src/build.sh
index 195e4d5..4cf01d1 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -5,7 +5,8 @@ html="OFF"
 clean=0
 capi=0
 navit=0
-theme=0
+theme_option="-DWITH_STYLESHEET=OFF"
+pack_for_gdp=0
 commonapi_tools_option=""
 
 function check_path_for_capi
@@ -53,7 +54,8 @@ do
 		navit=1
 		;;
 	t)
-		theme=1
+		theme_option="-DWITH_STYLESHEET=ON"
+		pack_for_gdp=1
 		;;
 	\?)
 		echo "Usage:"
@@ -72,9 +74,6 @@ set -e
 if [ "$capi" = 1 ]
 then
 	check_path_for_capi
-	cp ./hmi/qml/Core/genivi-capi.js ./hmi/qml/Core/genivi.js
-else
-	cp ./hmi/qml/Core/genivi-origin.js ./hmi/qml/Core/genivi.js
 fi
 
 if [ "$clean" = 1 ]
@@ -127,9 +126,9 @@ if [ "$clean" = 1 ]
 then
 	if [ "$capi" = 0 ]
 	then
-		cmake -DWITH_HTML_MIGRATION=$html -DWITH_PLUGIN_MIGRATION=OFF -DWITH_DEBUG=$debug ../
+		cmake $theme_option -DWITH_HTML_MIGRATION=$html -DWITH_PLUGIN_MIGRATION=OFF -DWITH_DEBUG=$debug ../
 	else
-		cmake -DWITH_HTML_MIGRATION=$html -DWITH_PLUGIN_MIGRATION=ON -DWITH_DBUS_INTERFACE=OFF $commonapi_tools_option -DWITH_DEBUG=$debug ../
+		cmake $theme_option -DWITH_HTML_MIGRATION=$html -DWITH_PLUGIN_MIGRATION=ON -DWITH_DBUS_INTERFACE=OFF $commonapi_tools_option -DWITH_DEBUG=$debug ../
 		echo 'fix a bug in the generation of CommonAPI hpp'
 		sed -i -e 's/(const TimeStampedEnum::/(const ::v4::org::genivi::navigation::navigationcore::NavigationCoreTypes::TimeStampedEnum::/' ./navigation/franca/src-gen/v4/org/genivi/navigation/navigationcore/LocationInput.hpp
 		sed -i -e 's/(const TimeStampedEnum::/(const ::v4::org::genivi::navigation::navigationcore::NavigationCoreTypes::TimeStampedEnum::/' ./navigation/franca/src-gen/v4/org/genivi/navigation/navigationcore/MapMatchedPosition.hpp
@@ -143,13 +142,9 @@ fi
 make
 cd ../
 
-if [ "$theme" = 1 ]
+if [ "$pack_for_gdp" = 1 ]
 then
-	echo 'generate the hmi for gdp theme and pack it into a tarball'
-	cd script
-	./prepare.sh -c
-	./prepare.sh -i ../hmi/qml/Core/gimp/gdp-theme/800x480
-	tar czf ../hmi/qml/Core/referenceHMI.tar.gz ../hmi/qml/Core/images/ ../hmi/qml/Core/style-sheets/ ../hmi/qml/Core/translations/
-	cd ../
+	echo 'pack the hmi for gdp into a tarball'
+	tar czf referenceHMI.tar.gz ./hmi/images/ ./hmi/style-sheets/ ./hmi/translations/
 fi
 
diff --git a/src/hmi/CMakeLists.txt b/src/hmi/CMakeLists.txt
new file mode 100644
index 0000000..532093c
--- /dev/null
+++ b/src/hmi/CMakeLists.txt
@@ -0,0 +1,62 @@
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: hmi
+#
+# Author: Philippe Colliot
+#
+# Copyright (C) 2017, PCA Peugeot Citroën
+# 
+# License:
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#
+# @licence end@
+###########################################################################
+project(hmi)
+cmake_minimum_required(VERSION 2.8.11)
+message(STATUS ${PROJECT_NAME})
+
+add_definitions("-std=gnu++11")
+
+add_definitions("-fPIC")
+
+set(STYLESHEET_GENERATOR ./style_sheet_generator.sh)
+set(GIMP_FILES_DIRECTORY ./gimp/gdp-theme/800x480)
+set(STYLE_SHEETS_GENERATED_INDICATOR "./style-sheets/the-style-sheets-have-been-generated-css.js")
+
+if(${WITH_STYLESHEET})
+	FILE(GLOB IMAGE_FILES_TO_REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/images/*.png)
+	FILE(GLOB STYLESHEET_FILES_TO_REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/style-sheets/*-css.js)
+    	execute_process(
+		COMMAND rm -rf ${IMAGE_FILES_TO_REMOVE}
+		COMMAND rm -rf ${STYLESHEET_FILES_TO_REMOVE}
+		COMMAND bash ${STYLESHEET_GENERATOR} -i ${GIMP_FILES_DIRECTORY} -o ${CMAKE_CURRENT_SOURCE_DIR} -v -nl
+		COMMAND touch ${STYLE_SHEETS_GENERATED_INDICATOR}
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+	)
+endif()
+
+if (WITH_PLUGIN_MIGRATION)
+    execute_process(
+        COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/qml/Core/genivi-capi.js ${CMAKE_CURRENT_SOURCE_DIR}/qml/Core/genivi.js
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+else()
+    execute_process(
+        COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/qml/Core/genivi-origin.js ${CMAKE_CURRENT_SOURCE_DIR}/qml/Core/genivi.js
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+endif()
+
+add_subdirectory(hmi-launcher)
+
+
+
+
+
+
+
diff --git a/src/hmi/qml/Core/gimp/README.md b/src/hmi/gimp/README.md
index 449fa05..39d69ad 100644
--- a/src/hmi/qml/Core/gimp/README.md
+++ b/src/hmi/gimp/README.md
@@ -20,12 +20,8 @@ Genivi/Generate style sheet
 Choose the target (must be qml/Core)
 Press OK
 
-With the batch (Gimp not launched):
-Use ./prepare.sh
-Usage: prepare -i input_directory
-       prepare -c clean images and style sheets
-
-
+With the batch:
+build.sh -c -t (under src folder)
 
 
 
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
index 550d56b..550d56b 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
index ac7c57e..ac7c57e 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapGuidance.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapGuidance.xcf
index b5178cd..b5178cd 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapGuidance.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapGuidance.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapManeuver.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapManeuver.xcf
index a9467d6..a9467d6 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapManeuver.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapManeuver.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapRoute.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapRoute.xcf
index 89cf390..89cf390 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapRoute.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapRoute.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapScale.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScale.xcf
index 2e70727..2e70727 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapScale.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScale.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
index 27f6842..27f6842 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapScroll.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
index 7be59a8..7be59a8 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSimulation.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSimulation.xcf
index 5e3c8f1..5e3c8f1 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSimulation.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapSimulation.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapTop.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapTop.xcf
index 631edab..631edab 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapTop.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapTop.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppMain.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppMain.xcf
index 2f1e14f..2f1e14f 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppMain.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppMain.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
index f3cd72a..f3cd72a 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
index 7d6d9a6..7d6d9a6 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettings.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppSettings.xcf
index 49ab7ed..49ab7ed 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettings.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppSettings.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf
index 5b418c2..5b418c2 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/button-keyboard.xcf b/src/hmi/gimp/gdp-theme/800x480/button-keyboard.xcf
index d17386f..d17386f 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/button-keyboard.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/button-keyboard.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/LICENSE b/src/hmi/gimp/gdp-theme/LICENSE
index 47c14d8..47c14d8 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/LICENSE
+++ b/src/hmi/gimp/gdp-theme/LICENSE
diff --git a/src/hmi/qml/Core/gimp/generate-style-sheet.py b/src/hmi/gimp/generate-style-sheet.py
index c75b930..f3c9735 100644
--- a/src/hmi/qml/Core/gimp/generate-style-sheet.py
+++ b/src/hmi/gimp/generate-style-sheet.py
@@ -37,7 +37,7 @@ import string
 from gimpfu import *

 from gimpenums import *

 

-image_path = "Core/images/"

+image_path = "../images/"

 

 def format_color(color) :

 	return "Qt.rgba(%.2f, %.2f, %.2f, %.2f)" % (color[0]/255.0,color[1]/255.0,color[2]/255.0,color[3]/255.0)

diff --git a/src/hmi/qml/hmi-launcher/CMakeLists.txt b/src/hmi/hmi-launcher/CMakeLists.txt
index d081a62..33cca2c 100644
--- a/src/hmi/qml/hmi-launcher/CMakeLists.txt
+++ b/src/hmi/hmi-launcher/CMakeLists.txt
@@ -107,15 +107,15 @@ if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/constants.js)
             get_filename_component(FILE ${RAW_FILE} NAME_WE)
             execute_process(
                     OUTPUT_VARIABLE data_flow
-                    COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/../javascript.xsl ${RAW_FILE}
+                    COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/../qml/javascript.xsl ${RAW_FILE}
             )
             file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/constants.js ${data_flow})
     endforeach()
 endif()
 
 # set the paths into the resource.js file
-set(FILE_RESOURCE_IN ${CMAKE_CURRENT_SOURCE_DIR}/../Core/resource.js.in)
-set(FILE_RESOURCE_OUT ${CMAKE_CURRENT_SOURCE_DIR}/../Core/resource.js)
+set(FILE_RESOURCE_IN ${CMAKE_CURRENT_SOURCE_DIR}/../qml/Core/resource.js.in)
+set(FILE_RESOURCE_OUT ${CMAKE_CURRENT_SOURCE_DIR}/../qml/Core/resource.js)
 set(CONSTANTS_PATH ${CMAKE_CURRENT_BINARY_DIR})
 set(ICON_PATH ${NAVIT_PNG_BIN_DIR})
 configure_file(${FILE_RESOURCE_IN} ${FILE_RESOURCE_OUT} @ONLY)
diff --git a/src/hmi/qml/hmi-launcher/dbusif.cpp b/src/hmi/hmi-launcher/dbusif.cpp
index 85adec7..85adec7 100644
--- a/src/hmi/qml/hmi-launcher/dbusif.cpp
+++ b/src/hmi/hmi-launcher/dbusif.cpp
diff --git a/src/hmi/qml/hmi-launcher/dbusif.h b/src/hmi/hmi-launcher/dbusif.h
index c9d99ee..c9d99ee 100644
--- a/src/hmi/qml/hmi-launcher/dbusif.h
+++ b/src/hmi/hmi-launcher/dbusif.h
diff --git a/src/hmi/qml/hmi-launcher/dbusifsignal.h b/src/hmi/hmi-launcher/dbusifsignal.h
index c019fdd..c019fdd 100644
--- a/src/hmi/qml/hmi-launcher/dbusifsignal.h
+++ b/src/hmi/hmi-launcher/dbusifsignal.h
diff --git a/src/hmi/qml/hmi-launcher/hmi-launcher_fsa.service b/src/hmi/hmi-launcher/hmi-launcher_fsa.service
index 0df0e33..0df0e33 100644
--- a/src/hmi/qml/hmi-launcher/hmi-launcher_fsa.service
+++ b/src/hmi/hmi-launcher/hmi-launcher_fsa.service
diff --git a/src/hmi/qml/hmi-launcher/javascript.xsl b/src/hmi/hmi-launcher/javascript.xsl
index 721497f..721497f 100644
--- a/src/hmi/qml/hmi-launcher/javascript.xsl
+++ b/src/hmi/hmi-launcher/javascript.xsl
diff --git a/src/hmi/qml/hmi-launcher/lm_control.cpp b/src/hmi/hmi-launcher/lm_control.cpp
index 959eee4..959eee4 100644
--- a/src/hmi/qml/hmi-launcher/lm_control.cpp
+++ b/src/hmi/hmi-launcher/lm_control.cpp
diff --git a/src/hmi/qml/hmi-launcher/lm_control.h b/src/hmi/hmi-launcher/lm_control.h
index 50a2e5f..50a2e5f 100644
--- a/src/hmi/qml/hmi-launcher/lm_control.h
+++ b/src/hmi/hmi-launcher/lm_control.h
diff --git a/src/hmi/qml/hmi-launcher/main.cpp b/src/hmi/hmi-launcher/main.cpp
index 7e6b662..7e6b662 100644
--- a/src/hmi/qml/hmi-launcher/main.cpp
+++ b/src/hmi/hmi-launcher/main.cpp
diff --git a/src/hmi/qml/hmi-launcher/preference.cpp b/src/hmi/hmi-launcher/preference.cpp
index e07d64d..e07d64d 100644
--- a/src/hmi/qml/hmi-launcher/preference.cpp
+++ b/src/hmi/hmi-launcher/preference.cpp
diff --git a/src/hmi/qml/hmi-launcher/preference.h b/src/hmi/hmi-launcher/preference.h
index d55c891..d55c891 100644
--- a/src/hmi/qml/hmi-launcher/preference.h
+++ b/src/hmi/hmi-launcher/preference.h
diff --git a/src/hmi/qml/hmi-launcher/wheelarea.h b/src/hmi/hmi-launcher/wheelarea.h
index 64540af..64540af 100644
--- a/src/hmi/qml/hmi-launcher/wheelarea.h
+++ b/src/hmi/hmi-launcher/wheelarea.h
diff --git a/src/hmi/qml/hmi-launcher/wheelareaplugin.cpp b/src/hmi/hmi-launcher/wheelareaplugin.cpp
index 46f640a..46f640a 100644
--- a/src/hmi/qml/hmi-launcher/wheelareaplugin.cpp
+++ b/src/hmi/hmi-launcher/wheelareaplugin.cpp
diff --git a/src/hmi/qml/hmi-launcher/wheelareaplugin.h b/src/hmi/hmi-launcher/wheelareaplugin.h
index ed56e40..ed56e40 100644
--- a/src/hmi/qml/hmi-launcher/wheelareaplugin.h
+++ b/src/hmi/hmi-launcher/wheelareaplugin.h
diff --git a/src/hmi/qml/hmi-launcher/wheelareaplugin.json b/src/hmi/hmi-launcher/wheelareaplugin.json
index a3e7943..a3e7943 100644
--- a/src/hmi/qml/hmi-launcher/wheelareaplugin.json
+++ b/src/hmi/hmi-launcher/wheelareaplugin.json
diff --git a/src/hmi/qml/Core/images/.gitignore b/src/hmi/images/.gitignore
index aab52d9..aab52d9 100644
--- a/src/hmi/qml/Core/images/.gitignore
+++ b/src/hmi/images/.gitignore
diff --git a/src/hmi/qml/Core/images/README b/src/hmi/images/README
index 08d181f..08d181f 100644
--- a/src/hmi/qml/Core/images/README
+++ b/src/hmi/images/README
diff --git a/src/hmi/qml/Core/KButton.qml b/src/hmi/qml/Core/KButton.qml
index 353be63..29a84bc 100644
--- a/src/hmi/qml/Core/KButton.qml
+++ b/src/hmi/qml/Core/KButton.qml
@@ -31,7 +31,7 @@ import QtQuick 2.1
 
 Button {
 	id: button
-    source:"images/button-keyboard.png";
+    source:"../../images/button-keyboard.png";
 	width: keyboard.w
 	height: keyboard.h
 	pixelSize: 20
diff --git a/src/hmi/qml/Core/NavigationAppHMIMenu.qml b/src/hmi/qml/Core/NavigationAppHMIMenu.qml
index b47a65a..f55643d 100644
--- a/src/hmi/qml/Core/NavigationAppHMIMenu.qml
+++ b/src/hmi/qml/Core/NavigationAppHMIMenu.qml
@@ -25,7 +25,7 @@
 */
 import QtQuick 2.1 
 import "genivi.js" as Genivi;
-import "style-sheets/style-constants.js" as Constants;
+import "../../style-sheets/style-constants.js" as Constants;
 import lbs.plugin.wheelarea 1.0
 
 Rectangle {
diff --git a/src/hmi/qml/Core/StdButton.qml b/src/hmi/qml/Core/StdButton.qml
index 724f6a0..f69eecb 100644
--- a/src/hmi/qml/Core/StdButton.qml
+++ b/src/hmi/qml/Core/StdButton.qml
@@ -31,6 +31,6 @@ import QtQuick 2.1
 Button {
 	width: content.w
 	height: content.h
-    source:"images/button-keyboard.png"; //needed to avoid crash in dynamic creation of button in NavigationSettingsPreferences (to be fixed)
+    source:"../../images/button-keyboard.png"; //needed to avoid crash in dynamic creation of button in NavigationSettingsPreferences (to be fixed)
     explode: false
 }
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js
index 69ad243..a7b3e76 100644
--- a/src/hmi/qml/Core/genivi-capi.js
+++ b/src/hmi/qml/Core/genivi-capi.js
@@ -334,7 +334,7 @@ function setlang(language,country,script)
     g_country=country;
     g_script=script;
     translations = new Array;
-    Qt.include("translations/"+g_language + "_" + g_country+".js");
+    Qt.include("../../translations/"+g_language + "_" + g_country+".js");
     if(g_language==="eng"){
         keyboardLayout=englishLayout;
         kbdFirstLayout="ABC";
diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js
index 351ff5e..75df494 100644
--- a/src/hmi/qml/Core/genivi-origin.js
+++ b/src/hmi/qml/Core/genivi-origin.js
@@ -334,7 +334,7 @@ function setlang(language,country,script)
     g_country=country;
     g_script=script;
     translations = new Array;
-    Qt.include("translations/"+g_language + "_" + g_country+".js");
+    Qt.include("../../translations/"+g_language + "_" + g_country+".js");
     if(g_language==="eng"){
         keyboardLayout=englishLayout;
         kbdFirstLayout="ABC";
diff --git a/src/hmi/qml/NavigationApp.qml b/src/hmi/qml/NavigationApp.qml
index fa53f1c..dac51a9 100644
--- a/src/hmi/qml/NavigationApp.qml
+++ b/src/hmi/qml/NavigationApp.qml
@@ -28,8 +28,8 @@ import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Layouts 1.0
 import QtQuick.Dialogs 1.0
-import "Core/style-sheets/style-constants.js" as Constants;
-import "Core/style-sheets/NavigationAppBrowseMap-css.js" as StyleSheetMap;
+import "../style-sheets/style-constants.js" as Constants;
+import "../style-sheets/NavigationAppBrowseMap-css.js" as StyleSheetMap;
 import "Core/genivi.js" as Genivi;
 import lbs.plugin.dbusif 1.0
 
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index 61c2dcc..dcd45e0 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -27,17 +27,17 @@
 import QtQuick 2.1
 import "Core"
 import "Core/genivi.js" as Genivi;
-import "Core/style-sheets/style-constants.js" as Constants;
-import "Core/style-sheets/NavigationAppBrowseMap-css.js" as StyleSheetMap;
-import "Core/style-sheets/NavigationAppBrowseMapBottom-css.js" as StyleSheetBottom
-import "Core/style-sheets/NavigationAppBrowseMapRoute-css.js" as StyleSheetRoute
-import "Core/style-sheets/NavigationAppBrowseMapGuidance-css.js" as StyleSheetGuidance
-import "Core/style-sheets/NavigationAppBrowseMapScroll-css.js" as StyleSheetScroll
-import "Core/style-sheets/NavigationAppBrowseMapSimulation-css.js" as StyleSheetSimulation
-import "Core/style-sheets/NavigationAppBrowseMapTop-css.js" as StyleSheetTop
-import "Core/style-sheets/NavigationAppBrowseMapManeuver-css.js" as StyleSheetManeuver
-import "Core/style-sheets/NavigationAppBrowseMapSettings-css.js" as StyleSheetSettings;
-import "Core/style-sheets/NavigationAppBrowseMapScale-css.js" as StyleSheetScale;
+import "../style-sheets/style-constants.js" as Constants;
+import "../style-sheets/NavigationAppBrowseMap-css.js" as StyleSheetMap;
+import "../style-sheets/NavigationAppBrowseMapBottom-css.js" as StyleSheetBottom
+import "../style-sheets/NavigationAppBrowseMapRoute-css.js" as StyleSheetRoute
+import "../style-sheets/NavigationAppBrowseMapGuidance-css.js" as StyleSheetGuidance
+import "../style-sheets/NavigationAppBrowseMapScroll-css.js" as StyleSheetScroll
+import "../style-sheets/NavigationAppBrowseMapSimulation-css.js" as StyleSheetSimulation
+import "../style-sheets/NavigationAppBrowseMapTop-css.js" as StyleSheetTop
+import "../style-sheets/NavigationAppBrowseMapManeuver-css.js" as StyleSheetManeuver
+import "../style-sheets/NavigationAppBrowseMapSettings-css.js" as StyleSheetSettings;
+import "../style-sheets/NavigationAppBrowseMapScale-css.js" as StyleSheetScale;
 
 import lbs.plugin.dbusif 1.0
 
@@ -1015,8 +1015,8 @@ NavigationAppHMIMenu {
                     source:StyleSheetBottom.zoomin[Constants.SOURCE]; x:StyleSheetBottom.zoomin[Constants.X]; y:StyleSheetBottom.zoomin[Constants.Y]; width:StyleSheetBottom.zoomin[Constants.WIDTH]; height:StyleSheetBottom.zoomin[Constants.HEIGHT];
                     id:zoomin;  next:zoomout; prev:orientation;
                     onClicked: {
-                        if(currentZoomId<Genivi.maxZoomId){
-                            Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,1);
+                        if(currentZoomId>Genivi.minZoomId){
+                            Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,-1);
                         }
                     }
                 }
@@ -1034,8 +1034,8 @@ NavigationAppHMIMenu {
                     source:StyleSheetBottom.zoomout[Constants.SOURCE]; x:StyleSheetBottom.zoomout[Constants.X]; y:StyleSheetBottom.zoomout[Constants.Y]; width:StyleSheetBottom.zoomout[Constants.WIDTH]; height:StyleSheetBottom.zoomout[Constants.HEIGHT];
                     id:zoomout;  next:settings; prev:zoomin;
                     onClicked: {
-                        if(currentZoomId>Genivi.minZoomId){
-                            Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,-1);
+                        if(currentZoomId<Genivi.maxZoomId){
+                            Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,1);
                         }
                     }
                 }
diff --git a/src/hmi/qml/NavigationAppMain.qml b/src/hmi/qml/NavigationAppMain.qml
index fcf6edb..bcf161c 100644
--- a/src/hmi/qml/NavigationAppMain.qml
+++ b/src/hmi/qml/NavigationAppMain.qml
@@ -27,8 +27,8 @@
 import QtQuick 2.1
 import "Core"
 import "Core/genivi.js" as Genivi;
-import "Core/style-sheets/style-constants.js" as Constants;
-import "Core/style-sheets/NavigationAppMain-css.js" as StyleSheet;
+import "../style-sheets/style-constants.js" as Constants;
+import "../style-sheets/NavigationAppMain-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
 
 NavigationAppHMIMenu {
diff --git a/src/hmi/qml/NavigationAppPOI.qml b/src/hmi/qml/NavigationAppPOI.qml
index 9b8ebd9..1a74dbe 100644
--- a/src/hmi/qml/NavigationAppPOI.qml
+++ b/src/hmi/qml/NavigationAppPOI.qml
@@ -29,8 +29,8 @@
 import QtQuick 2.1 
 import "Core"
 import "Core/genivi.js" as Genivi;
-import "Core/style-sheets/style-constants.js" as Constants;
-import "Core/style-sheets/NavigationAppPOI-css.js" as StyleSheet;
+import "../style-sheets/style-constants.js" as Constants;
+import "../style-sheets/NavigationAppPOI-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
 
 NavigationAppHMIMenu {
diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml
index 0014c11..e058a3d 100644
--- a/src/hmi/qml/NavigationAppSearch.qml
+++ b/src/hmi/qml/NavigationAppSearch.qml
@@ -27,8 +27,8 @@
 import QtQuick 2.1
 import "Core"
 import "Core/genivi.js" as Genivi;
-import "Core/style-sheets/style-constants.js" as Constants;
-import "Core/style-sheets/NavigationAppSearch-css.js" as StyleSheet;
+import "../style-sheets/style-constants.js" as Constants;
+import "../style-sheets/NavigationAppSearch-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
 
 NavigationAppHMIMenu {
diff --git a/src/hmi/qml/NavigationAppSettings.qml b/src/hmi/qml/NavigationAppSettings.qml
index e50d76b..f8dd28d 100644
--- a/src/hmi/qml/NavigationAppSettings.qml
+++ b/src/hmi/qml/NavigationAppSettings.qml
@@ -29,8 +29,8 @@
 import QtQuick 2.1 
 import "Core"
 import "Core/genivi.js" as Genivi;
-import "Core/style-sheets/style-constants.js" as Constants;
-import "Core/style-sheets/NavigationAppSettings-css.js" as StyleSheet;
+import "../style-sheets/style-constants.js" as Constants;
+import "../style-sheets/NavigationAppSettings-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
 import lbs.plugin.preference 1.0
 
diff --git a/src/hmi/qml/NavigationAppTokyo.qml b/src/hmi/qml/NavigationAppTokyo.qml
index 85bd04d..262e234 100644
--- a/src/hmi/qml/NavigationAppTokyo.qml
+++ b/src/hmi/qml/NavigationAppTokyo.qml
@@ -28,8 +28,8 @@ import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Layouts 1.0
 import QtQuick.Dialogs 1.0
-import "Core/style-sheets/style-constants.js" as Constants;
-import "Core/style-sheets/NavigationAppBrowseMap-css.js" as StyleSheetMap;
+import "../style-sheets/style-constants.js" as Constants;
+import "../style-sheets/NavigationAppBrowseMap-css.js" as StyleSheetMap;
 import "Core/genivi.js" as Genivi;
 import lbs.plugin.dbusif 1.0
 
diff --git a/src/hmi/qml/NavigationAppTripComputer.qml b/src/hmi/qml/NavigationAppTripComputer.qml
index 99b4d22..f438613 100644
--- a/src/hmi/qml/NavigationAppTripComputer.qml
+++ b/src/hmi/qml/NavigationAppTripComputer.qml
@@ -27,8 +27,8 @@
 import QtQuick 2.1
 import "Core"
 import "Core/genivi.js" as Genivi;
-import "Core/style-sheets/style-constants.js" as Constants;
-import "Core/style-sheets/NavigationAppTripComputer-css.js" as StyleSheet;
+import "../style-sheets/style-constants.js" as Constants;
+import "../style-sheets/NavigationAppTripComputer-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
 
 NavigationAppHMIMenu {
diff --git a/src/hmi/qml/navigation.qmlproject b/src/hmi/qml/navigation.qmlproject
index 9989d01..2d95838 100644
--- a/src/hmi/qml/navigation.qmlproject
+++ b/src/hmi/qml/navigation.qmlproject
@@ -8,7 +8,7 @@ Project {
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
         directory: "."
-        filter: "NavigationApp*.qml"
+        filter: "*.qml"
     }
     JavaScriptFiles {
         directory: "./Core"
diff --git a/src/hmi/qml/Core/style-sheets/.gitignore b/src/hmi/style-sheets/.gitignore
index b7d5680..b7d5680 100644
--- a/src/hmi/qml/Core/style-sheets/.gitignore
+++ b/src/hmi/style-sheets/.gitignore
diff --git a/src/hmi/qml/Core/style-sheets/style-constants.js b/src/hmi/style-sheets/style-constants.js
index 32c62f7..32c62f7 100644
--- a/src/hmi/qml/Core/style-sheets/style-constants.js
+++ b/src/hmi/style-sheets/style-constants.js
diff --git a/src/script/style_sheet_generator.sh b/src/hmi/style_sheet_generator.sh
index d1082b4..d1082b4 100755
--- a/src/script/style_sheet_generator.sh
+++ b/src/hmi/style_sheet_generator.sh
diff --git a/src/hmi/qml/Core/translations/deu_DEU.js b/src/hmi/translations/deu_DEU.js
index 56674fc..56674fc 100644
--- a/src/hmi/qml/Core/translations/deu_DEU.js
+++ b/src/hmi/translations/deu_DEU.js
diff --git a/src/hmi/qml/Core/translations/eng_USA.js b/src/hmi/translations/eng_USA.js
index 643bba5..643bba5 100644
--- a/src/hmi/qml/Core/translations/eng_USA.js
+++ b/src/hmi/translations/eng_USA.js
diff --git a/src/hmi/qml/Core/translations/fra_FRA.js b/src/hmi/translations/fra_FRA.js
index 480da8c..480da8c 100644
--- a/src/hmi/qml/Core/translations/fra_FRA.js
+++ b/src/hmi/translations/fra_FRA.js
diff --git a/src/hmi/qml/Core/translations/jpn_JPN.js b/src/hmi/translations/jpn_JPN.js
index ed3ed63..ed3ed63 100644
--- a/src/hmi/qml/Core/translations/jpn_JPN.js
+++ b/src/hmi/translations/jpn_JPN.js
diff --git a/src/hmi/qml/Core/referenceHMI.tar.gz b/src/referenceHMI.tar.gz
index ae95026..9967d77 100644
--- a/src/hmi/qml/Core/referenceHMI.tar.gz
+++ b/src/referenceHMI.tar.gz
diff --git a/src/run b/src/run
index a53d1a8..ca3f997 100755
--- a/src/run
+++ b/src/run
@@ -112,9 +112,9 @@ BIN_DIR=$CUR_DIR/build
 SRC_DIR=$CUR_DIR
 
 SCRIPT_DIR=$SRC_DIR/script
-HMI_QML_DIR=$SRC_DIR/hmi/qml
-app=$HMI_QML_DIR/NavigationApp.qml # hmi panel launched by default
-STYLE_SHEETS_GENERATED_INDICATOR=$HMI_QML_DIR/Core/style-sheets/the-style-sheets-have-been-generated-css.js
+HMI_DIR=$SRC_DIR/hmi
+app=$HMI_DIR/qml/NavigationApp.qml # hmi panel launched by default
+STYLE_SHEETS_GENERATED_INDICATOR=$HMI_DIR/style-sheets/the-style-sheets-have-been-generated-css.js
 REPLAYER_LOG_FILE=none
 export REPLAYER_LOG_FILE
 
diff --git a/src/script/prepare.sh b/src/script/prepare.sh
deleted file mode 100755
index 2ba1d09..0000000
--- a/src/script/prepare.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-###########################################################################
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# Component Name: fuel stop advisor application
-# Author: Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# Copyright (C) 2013-2014, PCA Peugeot Citroen
-# 
-# License:
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# @licence end@
-###########################################################################
-TOP_DIR=$PWD/..
-TOP_BIN_DIR=$TOP_DIR/../bin
-SCRIPT_DIR=$PWD
-TARGET_DIR=$TOP_DIR/hmi/qml/Core
-STYLE_SHEETS_GENERATED_INDICATOR=$TARGET_DIR/style-sheets/the-style-sheets-have-been-generated-css.js
-
-function usage
-{
- echo "Usage: prepare -i input_directory"
- echo "       prepare -c clean images and style sheets"
- exit
-}
-
-# Get input directory from the command line
-if [ $# -ge 1 ]; then
-    if [ $1 = -h ]; then
-	usage
-    elif [ $1 = -i ]; then
- 	shift
-        input_dir=$1
-    elif [ $1 = -c ]; then
-	echo 'delete generated stuff'
- 	rm -rf $TARGET_DIR/images/*.png
-	rm -rf $TARGET_DIR/style-sheets/*-css.js
-        exit
-   else
-        usage
-    fi
-else
-    usage
-fi
-
-echo "Prepare the style sheet of fuel stop advisor"
-./style_sheet_generator.sh -i $input_dir -o ../hmi/qml/Core/ -v -nl
-
-echo "Create the empty file as an indicator"
-touch $STYLE_SHEETS_GENERATED_INDICATOR
-
-