some improvement of the HMI

22 files changed, 159 insertions, 78 deletions

diff --git a/src/hmi/qml/CameraSettings.qml b/src/hmi/qml/CameraSettings.qml
index 32b4fea..c8ca710 100644
--- a/src/hmi/qml/CameraSettings.qml
+++ b/src/hmi/qml/CameraSettings.qml
@@ -360,7 +360,7 @@ HMIMenu {
                          Genivi.data['show_current_position']=true;
                          move_stop();
                          camera_stop();
-                         pageOpen("NavigationBrowseMap");
+                         leaveMenu();
                      }
                  }
 
diff --git a/src/hmi/qml/Core/EntryField.qml b/src/hmi/qml/Core/EntryField.qml
index b8444ca..ee91533 100644
--- a/src/hmi/qml/Core/EntryField.qml
+++ b/src/hmi/qml/Core/EntryField.qml
@@ -52,13 +52,12 @@ Column {
 	function callEntry()
 	{
 		entryfield.leave();
-		Genivi.entryback=menu.pagefile;
 		Genivi.entrydest=globaldata;
 		Genivi.entrycriterion=criterion;
         if (criterion && criterion != Genivi.NAVIGATIONCORE_FULL_ADDRESS) {
-			pageOpen("Entry"); 
+            entryMenu("Entry",menu);
 		} else {
-            pageOpen("EntryFreeText");
+            entryMenu("EntryFreeText",menu);
 		}
 	}
 
diff --git a/src/hmi/qml/Core/HMIMenu.qml b/src/hmi/qml/Core/HMIMenu.qml
index 61bcae0..55998ce 100644
--- a/src/hmi/qml/Core/HMIMenu.qml
+++ b/src/hmi/qml/Core/HMIMenu.qml
@@ -24,11 +24,14 @@
 * @licence end@
 */
 import QtQuick 2.1 
+import "genivi.js" as Genivi;
 import "style-sheets/style-constants.js" as Constants;
 import lbs.plugin.wheelarea 1.0
 
 Rectangle {
 	id: menu
+    property alias loader: pageLoader
+    property string pageBack
 	property Item next
 	property Item prev
 //    width: Constants.MENU_WIDTH; height: Constants.MENU_HEIGHT
@@ -139,6 +142,43 @@ Rectangle {
         	}
 	}
 
+    function entryMenu(inmenu,outmenu)
+    {
+        Genivi.entryin = inmenu;
+        Genivi.entrybackheapsize += 1;
+        Genivi.entryback[Genivi.entrybackheapsize] = outmenu.pagefile;
+        outmenu.state = "hidden";
+        container.load(Genivi.entryin);
+        console.log(Genivi.entrybackheapsize);
+    }
+
+    function leaveMenu()
+    {
+        menu.state="hidden";
+        container.load(Genivi.entryback[Genivi.entrybackheapsize]);
+        Genivi.entrybackheapsize -= 1;
+        console.log(Genivi.entrybackheapsize);
+    }
+
+    function routeMenu()
+    { //location entered, go to route menu and reinit the heap
+        menu.state="hidden";
+        Genivi.entrybackheapsize = 1;
+        Genivi.entryback[Genivi.entrybackheapsize] = "MainMenu";
+        container.load("NavigationRoute");
+        console.log(Genivi.entrybackheapsize);
+    }
+
+    function mapMenu()
+    { //go to map view menu and reinit the heap
+        menu.state="hidden";
+        Genivi.entrybackheapsize = 1;
+        Genivi.entryback[Genivi.entrybackheapsize] = "MainMenu";
+        container.load("NavigationBrowseMap");
+        console.log(Genivi.entrybackheapsize);
+    }
+
+
 	function pageOpen(command) {
 		/*
 		console.log("pageOpen"); 
@@ -151,7 +191,7 @@ Rectangle {
 		pageLoader.opacity=0;
 		pageLoader.state="visible";
 */
-		container.load(command);
+        container.load(command);
 	}
 	states: State {
 		name: "hidden"
diff --git a/src/hmi/qml/Core/genivi.js b/src/hmi/qml/Core/genivi.js
index 509927f..1f98619 100644
--- a/src/hmi/qml/Core/genivi.js
+++ b/src/hmi/qml/Core/genivi.js
@@ -51,7 +51,10 @@ var translations=new Array;
 
 var simulationPanelOnMapview=true;// simulation panel on map view by default
 
-var entryback;
+var entryin;
+var entryback = new Array;
+var entrybackheapsize=0;
+entryback[entrybackheapsize]="";
 var entrydest;
 var entrycriterion;
 var entryselectedentry;
diff --git a/src/hmi/qml/Entry.qml b/src/hmi/qml/Entry.qml
index b16abef..67d1d7f 100644
--- a/src/hmi/qml/Entry.qml
+++ b/src/hmi/qml/Entry.qml
@@ -156,18 +156,11 @@ HMIMenu {
 					focus: true
 				}
 			}
-/*
-			StdButton { id:ok; text: "Ok"; onClicked: {
-				Genivi.data[Genivi.entrydest]=text.text;
-				disconnectSignals();
-				pageOpen(Genivi.entryback);
-			} next:back; prev:view}
-*/
 			StdButton { id:back; text: "Back"; onClicked: {
 				disconnectSignals();
                 Genivi.entrycancel=true;
                 Genivi.preloadMode=true;
-				pageOpen(Genivi.entryback);
+                leaveMenu();
 			} next:view; prev:keyboard}
 		}
 
@@ -199,7 +192,7 @@ HMIMenu {
 				Genivi.entrydest=null;
 				disconnectSignals();
 				Genivi.entryselectedentry=what.index;
-				pageOpen(Genivi.entryback);
+                leaveMenu();
 			}
 		}
 
diff --git a/src/hmi/qml/EntryFreeText.qml b/src/hmi/qml/EntryFreeText.qml
index edb62d6..8b8ca69 100644
--- a/src/hmi/qml/EntryFreeText.qml
+++ b/src/hmi/qml/EntryFreeText.qml
@@ -133,18 +133,11 @@ HMIMenu {
 					focus: true
 				}
 			}
-/*
-			StdButton { id:ok; text: "Ok"; onClicked: {
-				Genivi.data[Genivi.entrydest]=text.text;
-				disconnectSignals();
-				pageOpen(Genivi.entryback);
-			} next:back; prev:view}
-*/
 			StdButton { id:back; text: "Back"; onClicked: {
 				disconnectSignals();
                 Genivi.entrycancel=true;
                 Genivi.preloadMode=true;
-				pageOpen(Genivi.entryback);
+                leaveMenu();
             } next:viewListAddress; prev:keyboard}
 		}
 
@@ -179,7 +172,7 @@ HMIMenu {
                     Genivi.entrydest=null;
                     disconnectSignals();
                     Genivi.entryselectedentry=what.index;
-                    pageOpen(Genivi.entryback);
+                    leaveMenu();
                 }
             }
         }
@@ -213,7 +206,7 @@ HMIMenu {
                     Genivi.entrydest=null;
                     disconnectSignals();
                     Genivi.entryselectedentry=what.index;
-                    pageOpen(Genivi.entryback);
+                    leaveMenu();
                 }
             }
         }
diff --git a/src/hmi/qml/MainMenu.qml b/src/hmi/qml/MainMenu.qml
index b3bc80e..51a6129 100644
--- a/src/hmi/qml/MainMenu.qml
+++ b/src/hmi/qml/MainMenu.qml
@@ -35,8 +35,10 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
-	next: navigation
-    prev: navigation
+    property string pagefile:"MainMenu"
+    pageBack: Genivi.entryback[Genivi.entrybackheapsize]
+    next: navigation
+    prev: quit
     DBusIf {
 		id:dbusIf;
 	}
@@ -55,7 +57,10 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_navigation[Constants.SOURCE]; x:StyleSheet.select_navigation[Constants.X]; y:StyleSheet.select_navigation[Constants.Y]; width:StyleSheet.select_navigation[Constants.WIDTH]; height:StyleSheet.select_navigation[Constants.HEIGHT];
-            id:navigation; page:"NavigationSearch"; explode:false; next:mapview; prev:quit}
+            id:navigation; explode:false; next:mapview; prev:quit; onClicked: {
+                entryMenu("NavigationSearch",menu);
+            }
+        }
 
         Text {
             x:StyleSheet.mapviewText[Constants.X]; y:StyleSheet.mapviewText[Constants.Y]; width:StyleSheet.mapviewText[Constants.WIDTH]; height:StyleSheet.mapviewText[Constants.HEIGHT];color:StyleSheet.mapviewText[Constants.TEXTCOLOR];styleColor:StyleSheet.mapviewText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.mapviewText[Constants.PIXELSIZE];
@@ -68,9 +73,8 @@ HMIMenu {
         StdButton {
             source:StyleSheet.select_mapview[Constants.SOURCE]; x:StyleSheet.select_mapview[Constants.X]; y:StyleSheet.select_mapview[Constants.Y]; width:StyleSheet.select_mapview[Constants.WIDTH]; height:StyleSheet.select_mapview[Constants.HEIGHT];
             id:mapview; explode:false; next:trip; prev:navigation; onClicked: {
-				Genivi.data["mapback"]="MainMenu";
 				Genivi.data["show_current_position"]=true;
-				pageOpen("NavigationBrowseMap");
+                entryMenu("NavigationBrowseMap",menu);
 			}
 		}
 
@@ -85,7 +89,7 @@ HMIMenu {
         StdButton {
             source:StyleSheet.select_trip[Constants.SOURCE]; x:StyleSheet.select_trip[Constants.X]; y:StyleSheet.select_trip[Constants.Y]; width:StyleSheet.select_trip[Constants.WIDTH]; height:StyleSheet.select_trip[Constants.HEIGHT];
             id:trip; explode:false; next:poi; prev:mapview;onClicked: {
-                pageOpen("TripComputer");
+                entryMenu("TripComputer",menu);
             }
         }
 
@@ -99,7 +103,10 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_poi[Constants.SOURCE]; x:StyleSheet.select_poi[Constants.X]; y:StyleSheet.select_poi[Constants.Y]; width:StyleSheet.select_poi[Constants.WIDTH]; height:StyleSheet.select_poi[Constants.HEIGHT];
-            id:poi; page:"POI"; explode:false; next:configuration; prev:trip}
+            id:poi; explode:false; next:configuration; prev:trip; onClicked: {
+                entryMenu("POI",menu);
+            }
+        }
 
         Text {
             x:StyleSheet.configurationText[Constants.X]; y:StyleSheet.configurationText[Constants.Y]; width:StyleSheet.configurationText[Constants.WIDTH]; height:StyleSheet.configurationText[Constants.HEIGHT];color:StyleSheet.configurationText[Constants.TEXTCOLOR];styleColor:StyleSheet.configurationText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.configurationText[Constants.PIXELSIZE];
@@ -111,7 +118,10 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.select_configuration[Constants.SOURCE]; x:StyleSheet.select_configuration[Constants.X]; y:StyleSheet.select_configuration[Constants.Y]; width:StyleSheet.select_configuration[Constants.WIDTH]; height:StyleSheet.select_configuration[Constants.HEIGHT];
-            id:configuration; page:"NavigationSettings"; explode:false; next:quit; prev:trip}
+            id:configuration; explode:false; next:quit; prev:trip; onClicked: {
+                entryMenu("NavigationSettings",menu);
+            }
+        }
 
         StdButton {
             source:StyleSheet.quit[Constants.SOURCE]; x:StyleSheet.quit[Constants.X]; y:StyleSheet.quit[Constants.Y]; width:StyleSheet.quit[Constants.WIDTH]; height:StyleSheet.quit[Constants.HEIGHT];textColor:StyleSheet.quitText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.quitText[Constants.PIXELSIZE];
diff --git a/src/hmi/qml/NavigationBrowseMap.qml b/src/hmi/qml/NavigationBrowseMap.qml
index ce2e1bc..087190b 100644
--- a/src/hmi/qml/NavigationBrowseMap.qml
+++ b/src/hmi/qml/NavigationBrowseMap.qml
@@ -39,6 +39,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"NavigationBrowseMap"
     next: scrollup
 	prev: menub
 	property Item guidanceWaypointReachedSignal;
@@ -352,10 +353,8 @@ HMIMenu {
 
 	function routeOverview()
 	{
-		if (!split.disabled) {
-			disconnectSignals();
-			pageOpen("NavigationCalculatedRoute");
-		}
+        disconnectSignals();
+        entryMenu("NavigationCalculatedRoute",menu);
 	}
 
 	function toggleOrientation()
@@ -493,7 +492,7 @@ HMIMenu {
                     explode: false
                     onClicked: {
                         disconnectSignals();
-                        pageOpen("POI");
+                        entryMenu("POI",menu);
                                 }
                         }
 
@@ -541,7 +540,7 @@ HMIMenu {
                     id:menub; text:Genivi.gettext("Menu"); next:orientation; prev:settings;
                     onClicked: {
                         disconnectSignals();
-                        pageOpen("MainMenu");
+                        leaveMenu();;
                     }
                 }
 
@@ -608,7 +607,7 @@ HMIMenu {
                     id:settings; explode:false; next:menub; prev:zoomout;
                     onClicked: {
                         disconnectSignals();
-                        pageOpen("CameraSettings");
+                        entryMenu("CameraSettings",menu);
                     }
                 }
 
@@ -703,7 +702,7 @@ HMIMenu {
                         if (res[0] == "uint16") {
                             if (res[1] != Genivi.NAVIGATIONCORE_INACTIVE) {
                                 disconnectSignals();
-                                pageOpen("NavigationManeuversList");
+                                entryMenu("NavigationManeuversList",menu);
                             }
                         }
                     }
diff --git a/src/hmi/qml/NavigationCalculatedRoute.qml b/src/hmi/qml/NavigationCalculatedRoute.qml
index 45f9fca..00be1bb 100644
--- a/src/hmi/qml/NavigationCalculatedRoute.qml
+++ b/src/hmi/qml/NavigationCalculatedRoute.qml
@@ -35,7 +35,8 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
-	next: back
+    property string pagefile:"NavigationCalculatedRoute"
+    next: back
     prev: show_route_in_list
 	property Item routeCalculationSuccessfulSignal;
 	property Item routeCalculationFailedSignal;
@@ -208,14 +209,16 @@ HMIMenu {
                 Genivi.data["mapback"]="NavigationCalculatedRoute";
                 Genivi.data["show_route_handle"]=Genivi.routing_handle(dbusIf);
                 Genivi.data["zoom_route_handle"]=Genivi.routing_handle(dbusIf);
-                pageOpen("NavigationBrowseMap");
+                mapMenu();
             }
         }
         StdButton {
             source:StyleSheet.show_route_in_list[Constants.SOURCE]; x:StyleSheet.show_route_in_list[Constants.X]; y:StyleSheet.show_route_in_list[Constants.Y]; width:StyleSheet.show_route_in_list[Constants.WIDTH]; height:StyleSheet.show_route_in_list[Constants.HEIGHT];
             id:show_route_in_list;
-            page:"NavigationRouteDescription";
-            explode:false; disabled:true; next:back; prev:show_route_on_map
+            explode:false; disabled:true; next:back; prev:show_route_on_map;
+            onClicked: {
+                entryMenu("NavigationRouteDescription",menu);
+            }
         }
 
         StdButton {
@@ -227,7 +230,7 @@ HMIMenu {
                 Genivi.data["mapback"]="NavigationCalculatedRoute";
                 Genivi.data["show_route_handle"]=Genivi.routing_handle(dbusIf);
                 Genivi.data["show_current_position"]=true;
-                pageOpen("NavigationBrowseMap");
+                mapMenu();
             }
         }
         StdButton {
@@ -243,7 +246,7 @@ HMIMenu {
             id:back; text: Genivi.gettext("Back"); disabled:false; next:show_route_on_map; prev:show_route_in_list;
             onClicked: {
                 disconnectSignals();
-                pageOpen("NavigationRoute");
+                leaveMenu();
             }
         }
     }
diff --git a/src/hmi/qml/NavigationManeuversList.qml b/src/hmi/qml/NavigationManeuversList.qml
index 17a49eb..41af3e5 100644
--- a/src/hmi/qml/NavigationManeuversList.qml
+++ b/src/hmi/qml/NavigationManeuversList.qml
@@ -34,6 +34,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"NavigationManeuversList"
 
 	Column {
                 id:content
@@ -67,7 +68,7 @@ HMIMenu {
 			id:back
 			text: "Back"
 			pixelSize:Constants.MENU_ROUTE_DESCRIPTION_TEXT_PIXEL_SIZE;
-			page:"NavigationBrowseMap";
+            onClicked:{leaveMenu();}
 		}
 	}
 
diff --git a/src/hmi/qml/NavigationRoute.qml b/src/hmi/qml/NavigationRoute.qml
index fb337ee..7ef6d03 100644
--- a/src/hmi/qml/NavigationRoute.qml
+++ b/src/hmi/qml/NavigationRoute.qml
@@ -35,6 +35,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
     id: menu
+    property string pagefile:"NavigationRoute"
     next: back
     prev: calculate
     property Item mapmatchedpositionPositionUpdateSignal;
@@ -192,7 +193,7 @@ HMIMenu {
                 disconnectSignals();
                 Genivi.data['lat']='';
                 Genivi.data['lon']='';
-                pageOpen("NavigationCalculatedRoute");
+                entryMenu("NavigationCalculatedRoute",menu);
             }
             disabled:!(Genivi.data['position'] && Genivi.data['destination']); next:calculate_curr; prev:position
         }
@@ -206,7 +207,7 @@ HMIMenu {
                 disconnectSignals();
                 Genivi.data['lat']='';
                 Genivi.data['lon']='';
-                pageOpen("NavigationCalculatedRoute");
+                entryMenu("NavigationCalculatedRoute",menu);
             }
             disabled:true; next:back; prev:calculate
         }
@@ -217,7 +218,7 @@ HMIMenu {
                 disconnectSignals();
                 Genivi.data['lat']='';
                 Genivi.data['lon']='';
-                pageOpen("NavigationSearch");
+                leaveMenu();
             }
             disabled:false; next:show; prev:calculate_curr;
         }
diff --git a/src/hmi/qml/NavigationRouteDescription.qml b/src/hmi/qml/NavigationRouteDescription.qml
index 826d426..47052a8 100644
--- a/src/hmi/qml/NavigationRouteDescription.qml
+++ b/src/hmi/qml/NavigationRouteDescription.qml
@@ -35,6 +35,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"NavigationRouteDescription"
 
 	Column {
         id:content
@@ -68,7 +69,9 @@ HMIMenu {
 			id:back
 			pixelSize:Constants.MENU_ROUTE_DESCRIPTION_TEXT_PIXEL_SIZE;
 			text: "Back"
-			page:"NavigationCalculatedRoute"
+            onClicked: {
+                leaveMenu();
+            }
 		}
 	}
 
diff --git a/src/hmi/qml/NavigationSearch.qml b/src/hmi/qml/NavigationSearch.qml
index 1c15a25..16eacd7 100644
--- a/src/hmi/qml/NavigationSearch.qml
+++ b/src/hmi/qml/NavigationSearch.qml
@@ -35,6 +35,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
     id: menu
+    property string pagefile:"NavigationSearch"
     next: search_by_address
     prev: back
     DBusIf {
@@ -57,20 +58,39 @@ HMIMenu {
             id:search_by_address;  explode:false; next:search_by_coordinates; prev:back;
             onClicked: {
                 Genivi.preloadMode=true;
-                pageOpen("NavigationSearchAddress");
+                entryMenu("NavigationSearchAddress",menu);
             }
         }
         StdButton { source:StyleSheet.search_by_coordinates[Constants.SOURCE]; x:StyleSheet.search_by_coordinates[Constants.X]; y:StyleSheet.search_by_coordinates[Constants.Y]; width:StyleSheet.search_by_coordinates[Constants.WIDTH]; height:StyleSheet.search_by_coordinates[Constants.HEIGHT];
-            id:search_by_coordinates; page:"NavigationSearchCoordinates"; explode:false; next:search_by_poi; prev:search_by_address}
+            id:search_by_coordinates; explode:false; next:search_by_poi; prev:search_by_address;
+            onClicked: {
+                entryMenu("NavigationSearchCoordinates",menu);
+            }
+        }
         StdButton { source:StyleSheet.search_by_poi[Constants.SOURCE]; x:StyleSheet.search_by_poi[Constants.X]; y:StyleSheet.search_by_poi[Constants.Y]; width:StyleSheet.search_by_poi[Constants.WIDTH]; height:StyleSheet.search_by_poi[Constants.HEIGHT];
-            id:search_by_poi; page:"POI"; explode:false; next:search_by_freetext; prev:search_by_coordinates}
+            id:search_by_poi; explode:false; next:search_by_freetext; prev:search_by_coordinates;
+            onClicked: {
+                entryMenu("POI",menu);
+            }
+        }
         StdButton { source:StyleSheet.search_by_freetext[Constants.SOURCE]; x:StyleSheet.search_by_freetext[Constants.X]; y:StyleSheet.search_by_freetext[Constants.Y]; width:StyleSheet.search_by_freetext[Constants.WIDTH]; height:StyleSheet.search_by_freetext[Constants.HEIGHT];
-            id:search_by_freetext; page:"NavigationSearchFreeText"; explode:false; next:history; prev:search_by_poi}
-
+            id:search_by_freetext; explode:false; next:history; prev:search_by_poi;
+            onClicked: {
+                entryMenu("NavigationSearchFreeText",menu);
+            }
+        }
         StdButton { source:StyleSheet.history[Constants.SOURCE]; x:StyleSheet.history[Constants.X]; y:StyleSheet.history[Constants.Y]; width:StyleSheet.history[Constants.WIDTH]; height:StyleSheet.history[Constants.HEIGHT];textColor:StyleSheet.historyText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.historyText[Constants.PIXELSIZE];
-            id:history; text: Genivi.gettext("History"); disabled:false; explode:false; next:back; prev:search_by_freetext; page:"NavigationSearchHistory"}
+            id:history; text: Genivi.gettext("History"); disabled:false; explode:false; next:back; prev:search_by_freetext;
+            onClicked: {
+                entryMenu("NavigationSearchHistory",menu);
+            }
+        }
 
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); explode:false; next:search_by_address; prev:search_by_freetext; page:"MainMenu";}
+            id:back; text: Genivi.gettext("Back"); explode:false; next:search_by_address; prev:search_by_freetext;
+            onClicked: {
+                leaveMenu();
+            }
+        }
     }
 }
diff --git a/src/hmi/qml/NavigationSearchAddress.qml b/src/hmi/qml/NavigationSearchAddress.qml
index 6a4525c..83e3359 100644
--- a/src/hmi/qml/NavigationSearchAddress.qml
+++ b/src/hmi/qml/NavigationSearchAddress.qml
@@ -310,13 +310,13 @@ HMIMenu {
                     Genivi.data['description']+=' '+numberValue.text;
                 //save entered location into the history
                 Genivi.updateHistoryOfLastEnteredLocation(Genivi.data['description'],Genivi.data['lat'],Genivi.data['lon']);
-                pageOpen("NavigationRoute");
+                routeMenu();
             }
         }
 
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
             id:back; text: Genivi.gettext("Back"); explode:false; next:countryValue; prev:ok;
-            onClicked:{leave(1); pageOpen("NavigationSearch");}
+            onClicked:{leave(1); leaveMenu();}
         }
 	}
     Component.onCompleted: {
diff --git a/src/hmi/qml/NavigationSearchCoordinates.qml b/src/hmi/qml/NavigationSearchCoordinates.qml
index 147813a..56f88ca 100644
--- a/src/hmi/qml/NavigationSearchCoordinates.qml
+++ b/src/hmi/qml/NavigationSearchCoordinates.qml
@@ -95,7 +95,7 @@ HMIMenu {
                 Genivi.data['lat']=latitudeValue.text;
                 Genivi.data['lon']=longitudeValue.text;
                 Genivi.data['description']="Latitude "+latitudeValue.text+"° Longitude "+longitudeValue.text+"°";
-                pageOpen("NavigationRoute");
+                routeMenu();
             }
         }
         StdButton {
@@ -104,7 +104,7 @@ HMIMenu {
             onClicked:{
                 Genivi.data['lat']='';
                 Genivi.data['lon']='';
-                pageOpen("NavigationSearch");
+                leaveMenu();
             }
         }
     }
diff --git a/src/hmi/qml/NavigationSearchFreeText.qml b/src/hmi/qml/NavigationSearchFreeText.qml
index e52a333..da321b4 100644
--- a/src/hmi/qml/NavigationSearchFreeText.qml
+++ b/src/hmi/qml/NavigationSearchFreeText.qml
@@ -81,7 +81,7 @@ HMIMenu {
 		Genivi.data['lat']=lat;
 		Genivi.data['lon']=lon;
 		Genivi.data['description']=country+" "+city+" "+street+" "+number;
-		pageOpen("NavigationRoute");
+        pageOpen("NavigationRoute"); //to be fixed
 	}
 
 	function connectSignals()
@@ -174,7 +174,7 @@ HMIMenu {
         StdButton {
             source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
             id:back; text: Genivi.gettext("Back"); explode:false; next:textValue; prev:ok;
-            onClicked:{leave(1); pageOpen("NavigationSearch");}
+            onClicked:{leave(1); leaveMenu();}
         }
     }
 }
diff --git a/src/hmi/qml/NavigationSearchHistory.qml b/src/hmi/qml/NavigationSearchHistory.qml
index b37ac99..d8bebd2 100644
--- a/src/hmi/qml/NavigationSearchHistory.qml
+++ b/src/hmi/qml/NavigationSearchHistory.qml
@@ -35,6 +35,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"NavigationSearchHistory"
 
     DBusIf {
         id:dbusIf
@@ -72,13 +73,13 @@ HMIMenu {
                 Genivi.data['description'] = what.text;
                 Genivi.data['lat'] = Genivi.historyOfLastEnteredLat[what.index];
                 Genivi.data['lon'] = Genivi.historyOfLastEnteredLon[what.index];
-                pageOpen("NavigationRoute");
+                routeMenu();
             }
         }
 		StdButton {
 			id:back
 			text: "Back"
-            page:"NavigationSearch"
+            onClicked:{leaveMenu();}
 		}
 	}
     Component.onCompleted: {
diff --git a/src/hmi/qml/NavigationSettings.qml b/src/hmi/qml/NavigationSettings.qml
index e1a3b9b..ad8a044 100644
--- a/src/hmi/qml/NavigationSettings.qml
+++ b/src/hmi/qml/NavigationSettings.qml
@@ -35,6 +35,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"NavigationSettings"
     property Item simulationStatusChangedSignal;
     property Item simulationSpeedChangedSignal;
     next: back
@@ -404,16 +405,24 @@ HMIMenu {
 
         StdButton {
             source:StyleSheet.preferences[Constants.SOURCE]; x:StyleSheet.preferences[Constants.X]; y:StyleSheet.preferences[Constants.Y]; width:StyleSheet.preferences[Constants.WIDTH]; height:StyleSheet.preferences[Constants.HEIGHT];textColor:StyleSheet.preferencesText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.preferencesText[Constants.PIXELSIZE];
-            id:preferences; text: Genivi.gettext("Preference"); disabled:false; next:languageAndUnit; prev:back; page:"NavigationSettingsPreferences"}
+            id:preferences; text: Genivi.gettext("Preference"); disabled:false; next:languageAndUnit; prev:back;
+            onClicked: {
+                entryMenu("NavigationSettingsPreferences",menu);
+            }
+        }
 
         StdButton {
             source:StyleSheet.languageAndUnit[Constants.SOURCE]; x:StyleSheet.languageAndUnit[Constants.X]; y:StyleSheet.languageAndUnit[Constants.Y]; width:StyleSheet.languageAndUnit[Constants.WIDTH]; height:StyleSheet.languageAndUnit[Constants.HEIGHT];textColor:StyleSheet.languageAndUnitText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.languageAndUnitText[Constants.PIXELSIZE];
-            id:languageAndUnit; text: Genivi.gettext("LanguageAndUnits"); disabled:false; next:back; prev:preferences; page:"NavigationSettingsLanguageAndUnits"}
+            id:languageAndUnit; text: Genivi.gettext("LanguageAndUnits"); disabled:false; next:back; prev:preferences;
+            onClicked: {
+                entryMenu("NavigationSettingsLanguageAndUnits",menu);
+            }
+        }
 
         StdButton {
             source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
             id:back; text: Genivi.gettext("Back"); disabled:false; next:onmapview_enable; prev:languageAndUnit;
-            onClicked:{leave(); pageOpen("MainMenu");}
+            onClicked:{leave(); leaveMenu();}
         }
 
         StdButton {
diff --git a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
index f5664e7..1e56632 100644
--- a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
+++ b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
@@ -35,6 +35,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"NavigationSettingsLanguageAndUnits"
 
 	DBusIf {
 		id: dbusIf 
@@ -120,7 +121,7 @@ HMIMenu {
         Genivi.nav_message(dbusIf,"Configuration","SetLocale",["string",language,"string",country,"string",script]);
         Genivi.map_message(dbusIf,"Configuration","SetLocale",["string",language,"string",country,"string",script]);
         Genivi.setlang(language + "_" + country);
-        pageOpen("NavigationSettingsLanguageAndUnits"); //reload page because of texts...
+        pageOpen(menu.pagefile); //reload page because of texts...
     }
 	function setUnits(units1,units2)
 	{
@@ -172,7 +173,7 @@ HMIMenu {
 				setUnits(Genivi.NAVIGATIONCORE_MILE,Genivi.MAPVIEWER_MILE);}
 		}
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); disabled:false; next:back; prev:back; page:"NavigationSettings"}
+            id:back; text: Genivi.gettext("Back"); disabled:false; next:back; prev:back; onClicked:{leaveMenu();}}
 
 	}
 
diff --git a/src/hmi/qml/NavigationSettingsPreferences.qml b/src/hmi/qml/NavigationSettingsPreferences.qml
index 4936686..f20dbfb 100644
--- a/src/hmi/qml/NavigationSettingsPreferences.qml
+++ b/src/hmi/qml/NavigationSettingsPreferences.qml
@@ -36,6 +36,7 @@ import lbs.plugin.preference 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"NavigationSettingsPreferences"
 
     DBusIf {
         id: dbusIf
@@ -209,7 +210,7 @@ HMIMenu {
             id:motorways_no;  next:back; prev:back; explode:false; onClicked:{add(Genivi.NAVIGATIONCORE_AVOID,Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}}
 
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
-            id:back; text: Genivi.gettext("Back"); disabled:false; next:back; prev:back; page:"NavigationSettings"}
+            id:back; text: Genivi.gettext("Back"); disabled:false; next:back; prev:back; onClicked:{leaveMenu();}}
 
 	}
 
@@ -229,7 +230,7 @@ HMIMenu {
         }
         for (var i = 0 ; i < res[1].length ; i+=2) {
             var button=Qt.createQmlObject('import QtQuick 2.1 ; import "Core"; StdButton { }',content,'dynamic');
-            button.source="Core/images/cost-model.png";
+            button.source=StyleSheet.cost_model[Constants.SOURCE];
             button.x=StyleSheet.cost_model[Constants.X];
             button.y=StyleSheet.cost_model[Constants.Y] + i*50; //to be improved
             button.width=StyleSheet.cost_model[Constants.WIDTH];
@@ -242,7 +243,7 @@ HMIMenu {
             button.clicked.connect(
                 function(what) {
                     Genivi.routing_message(dbusIf,"SetCostModel",["uint16",what.userdata]);
-                    pageOpen("NavigationSettingsPreferences");
+                    pageOpen(menu.pagefile); //reload the page
                 }
             );
         }
diff --git a/src/hmi/qml/POI.qml b/src/hmi/qml/POI.qml
index 711e71d..d50582c 100644
--- a/src/hmi/qml/POI.qml
+++ b/src/hmi/qml/POI.qml
@@ -35,6 +35,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"POI"
 
     DBusIf {
     	id: dbusIf
@@ -198,7 +199,7 @@ HMIMenu {
 				Genivi.data['show_position']['lat']=poi_data.lat;
 				Genivi.data['show_position']['lon']=poi_data.lon;
 				Genivi.data['mapback']="POI";
-				pageOpen("NavigationBrowseMap");
+                mapMenu();
 			}
 		}
 		Text {
@@ -214,7 +215,9 @@ HMIMenu {
 			text: Genivi.gettext("Back"); 
 			disabled:false; 
             next:select_search_for_refill; prev:select_display_on_map;
-			page:"MainMenu"
+            onClicked: {
+                leaveMenu();
+            }
 		}	
 	}
 	Component.onCompleted: {
diff --git a/src/hmi/qml/TripComputer.qml b/src/hmi/qml/TripComputer.qml
index b079fda..c18cdbe 100644
--- a/src/hmi/qml/TripComputer.qml
+++ b/src/hmi/qml/TripComputer.qml
@@ -35,6 +35,7 @@ import lbs.plugin.dbusif 1.0
 
 HMIMenu {
 	id: menu
+    property string pagefile:"TripComputer"
     property Item tripDataUpdatedSignal;
 
 	DBusIf {
@@ -423,7 +424,7 @@ HMIMenu {
         }
         StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE];
             id:back; text: Genivi.gettext("Back"); explode:false; disabled:false; next:reset; prev:select_instant;
-            onClicked:{leave(); pageOpen("MainMenu");}
+            onClicked:{leave(); leaveMenu();}
         }
     }
     Component.onCompleted: {