some improvements of the HMI to be tested

6 files changed, 45 insertions, 13 deletions

diff --git a/src/hmi/CMakeLists.txt b/src/hmi/CMakeLists.txt
index 532093c..5873b5f 100644
--- a/src/hmi/CMakeLists.txt
+++ b/src/hmi/CMakeLists.txt
@@ -33,11 +33,20 @@ if(${WITH_STYLESHEET})
 	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}
 	)
+        execute_process(
+                COMMAND rm -rf ${STYLESHEET_FILES_TO_REMOVE}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+        execute_process(
+                COMMAND bash ${STYLESHEET_GENERATOR} -i ${GIMP_FILES_DIRECTORY} -o ${CMAKE_CURRENT_SOURCE_DIR} -v -nl
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+        execute_process(
+                COMMAND touch ${STYLE_SHEETS_GENERATED_INDICATOR}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
 endif()
 
 if (WITH_PLUGIN_MIGRATION)
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
index 4ce6dd3..b7ce165 100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMap.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
index 37775dd..03a2ad4 100755..100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
diff --git a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapCompass.xcf b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapCompass.xcf
index 37a739b..ab003f1 100755..100644
--- a/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapCompass.xcf
+++ b/src/hmi/gimp/gdp-theme/800x480/NavigationAppBrowseMapCompass.xcf
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index 27a851a..3c171a6 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -674,13 +674,20 @@ NavigationAppHMIMenu {
     }
 
 	function toggleOrientation()
-	{
-        if (!orientation.status) {
+    { //N->D->B
+        if (orientation.status==0) {
             Genivi.mapviewer_SetCameraHeadingAngle(dbusIf,dltIf,0);
+            Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_2D);
             orientation.setState("D");
 		} else {
-            Genivi.mapviewer_SetCameraHeadingTrackUp(dbusIf,dltIf);
-            orientation.setState("N");
+            if (orientation.status==1) {
+                Genivi.mapviewer_SetCameraHeadingTrackUp(dbusIf,dltIf);
+                Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_3D);
+                orientation.setState("B");
+            } else{
+                Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_2D);
+                orientation.setState("N");
+            }
 		}
 	}
 
@@ -1189,19 +1196,30 @@ NavigationAppHMIMenu {
                 StdButton {
                     x:StyleSheetCompass.directiondestination[Constants.X]; y:StyleSheetCompass.directiondestination[Constants.Y]; width:StyleSheetCompass.directiondestination[Constants.WIDTH]; height:StyleSheetCompass.directiondestination[Constants.HEIGHT];
                     id:orientation; next:zoomin; prev:menub;  disabled:false;
-                    source:StyleSheetCompass.directiondestination[Constants.SOURCE]; //todo call get status
+                    source:StyleSheetCompass.directionnorth[Constants.SOURCE]; //todo call get status
                     property int status: 0;
                     function setState(name)
-                    {
-                        if (name=="D")
+                    { //the state displayed is the current state
+                        if (name=="N")
                         {
-                            status=1;
+                            status=0;
                             source=StyleSheetCompass.directionnorth[Constants.SOURCE];
                         }
                         else
                         {
-                            status=0;
-                            source=StyleSheetCompass.directiondestination[Constants.SOURCE];
+                            if (name=="D")
+                            {
+                                status=1;
+                                source=StyleSheetCompass.directiondestination[Constants.SOURCE];
+                            }
+                            else
+                            {
+                                if (name=="B")
+                                {
+                                    status=2;
+                                    source=StyleSheetCompass.directionThreeD[Constants.SOURCE];
+                                }
+                            }
                         }
                     }
                     onClicked:
diff --git a/src/run b/src/run
index 1c0506d..0db6f03 100755
--- a/src/run
+++ b/src/run
@@ -272,6 +272,11 @@ export LANGUAGE=en_US
 
 if [ "$persistent" = 0 ]
 then
+	if [ ! -d $HOME"/.config/navigation" ]
+	then
+		mkdir -p $HOME/.config
+		mkdir $HOME/.config/navigation
+	fi
 	# reinit the config file for Qt (persistent data)
 	cp $CONFIG_DIR/$config_file $HOME/.config/navigation/fsa.conf
 fi