reworked UI with rounded stuff

16 files changed, 12 insertions, 42 deletions

diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
index cc9d0a2..413ba2e 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapBottom.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapGuidance.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapGuidance.xcf
index 464e3d6..b5178cd 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapGuidance.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapGuidance.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapRoute.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapRoute.xcf
index a444646..89cf390 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapRoute.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapRoute.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
index 891d2cb..7eac248 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSimulation.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSimulation.xcf
index 8b3c580..41b1df3 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSimulation.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSimulation.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapTop.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapTop.xcf
index 460d157..631edab 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapTop.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapTop.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
index 504cf62..6b52ab0 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
index 3f1fe32..f41129c 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsSettingsLanguageAndUnits.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsSettingsLanguageAndUnits.xcf
index 6189528..157717c 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsSettingsLanguageAndUnits.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsSettingsLanguageAndUnits.xcf
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf
index d36b77b..5b418c2 100644
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf
diff --git a/src/hmi/qml/Core/referenceHMI.tar.gz b/src/hmi/qml/Core/referenceHMI.tar.gz
index 898fed7..5bcff17 100644
--- a/src/hmi/qml/Core/referenceHMI.tar.gz
+++ b/src/hmi/qml/Core/referenceHMI.tar.gz
diff --git a/src/hmi/qml/Core/translations/deu_DEU.js b/src/hmi/qml/Core/translations/deu_DEU.js
index 94679a1..5d0c10a 100644
--- a/src/hmi/qml/Core/translations/deu_DEU.js
+++ b/src/hmi/qml/Core/translations/deu_DEU.js
@@ -115,7 +115,7 @@ translations["Entry"]="ENTRY";
 //NavigationBrowseMap
 translations["NavigationBrowseMap"]="BROWSE MAP";
 translations["NavigationCurrentStreet"]="CURRENT STREET";
-translations["FSAWarning"]="Please refill to reach destination";
+translations["FSAWarning"]="Refill";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
 
diff --git a/src/hmi/qml/Core/translations/eng_USA.js b/src/hmi/qml/Core/translations/eng_USA.js
index 80556ee..fbbedbb 100644
--- a/src/hmi/qml/Core/translations/eng_USA.js
+++ b/src/hmi/qml/Core/translations/eng_USA.js
@@ -115,7 +115,7 @@ translations["Entry"]="ENTRY";
 //NavigationBrowseMap
 translations["NavigationBrowseMap"]="BROWSE MAP";
 translations["NavigationCurrentStreet"]="CURRENT STREET";
-translations["FSAWarning"]="Please refill to reach destination";
+translations["FSAWarning"]="Refill";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
 
diff --git a/src/hmi/qml/Core/translations/fra_FRA.js b/src/hmi/qml/Core/translations/fra_FRA.js
index 534f7c2..e61780d 100644
--- a/src/hmi/qml/Core/translations/fra_FRA.js
+++ b/src/hmi/qml/Core/translations/fra_FRA.js
@@ -115,7 +115,7 @@ translations["Entry"]="SAISIE";
 //NavigationBrowseMap
 translations["NavigationBrowseMap"]="EXPLORER LA CARTE";
 translations["NavigationCurrentStreet"]="RUE ACTUELLE";
-translations["FSAWarning"]="Please refill to reach destination";
+translations["FSAWarning"]="Refill";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
 
diff --git a/src/hmi/qml/Core/translations/jpn_JPN.js b/src/hmi/qml/Core/translations/jpn_JPN.js
index 3a31080..ae1bce0 100644
--- a/src/hmi/qml/Core/translations/jpn_JPN.js
+++ b/src/hmi/qml/Core/translations/jpn_JPN.js
@@ -115,7 +115,7 @@ translations["Entry"]="文字入力";
 //NavigationBrowseMap
 translations["NavigationBrowseMap"]="地図を調べる";
 translations["NavigationCurrentStreet"]="現在地";
-translations["FSAWarning"]="Please refill to reach destination";
+translations["FSAWarning"]="Refill";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
 
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index 09f3861..3e44475 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -62,7 +62,6 @@ NavigationAppHMIMenu {
         Genivi.hookSignal("guidanceStatusChanged");
         if(args[1]===Genivi.NAVIGATIONCORE_ACTIVE)
         {
-            guidanceMode.setState("ON");
             showGuidance();
             showRoute();
             showSimulation();
@@ -71,7 +70,6 @@ NavigationAppHMIMenu {
             Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,1,50);
             updateGuidance();
         } else {
-            guidanceMode.setState("OFF");
             hideGuidance();
             hideRoute();
             hideSimulation();
@@ -720,16 +718,6 @@ NavigationAppHMIMenu {
 		}
 	}
 
-    function toggleGuidanceMode()
-    {
-        if (Genivi.guidance_activated){
-            stopGuidance();
-            stopSimulation();
-        }else{
-            startGuidance();
-        }
-    }
-
 	function updateGuidance()
 	{
         var res=Genivi.guidance_GetManeuversList(dbusIf,1,0);
@@ -1045,26 +1033,6 @@ NavigationAppHMIMenu {
                     }
                 }
 
-                StdButton {
-                    x:StyleSheetBottom.guidanceon[Constants.X]; y:StyleSheetBottom.guidanceon[Constants.Y]; width:StyleSheetBottom.guidanceon[Constants.WIDTH]; height:StyleSheetBottom.guidanceon[Constants.HEIGHT];
-                    id:guidanceMode; next:zoomin; prev:menub;  disabled:false;
-                    source:StyleSheetBottom.guidanceoff[Constants.SOURCE]; //todo call get status
-                    function setState(name)
-                    {
-                        if (name=="ON")
-                        {
-                            source=StyleSheetBottom.guidanceoff[Constants.SOURCE];
-                        }
-                        else
-                        {
-                            source=StyleSheetBottom.guidanceon[Constants.SOURCE];
-                        }
-                    }
-                    onClicked:
-                    {
-                        toggleGuidanceMode();
-                    }
-                }
             }
         }
 
@@ -1495,12 +1463,9 @@ NavigationAppHMIMenu {
         connectSignals();
         Genivi.mapviewer_handle(dbusIf,menu.width,menu.height,Genivi.MAPVIEWER_MAIN_MAP);
         hideMapSettings();
-        if(!Genivi.route_calculated) {
-            guidanceMode.visible=false;
-            guidanceMode.disabled=true;
-        }
 
         if (Genivi.data['display_on_map']==='show_route') {
+            //display the route when it has been calculated
             var res=Genivi.routing_GetRouteBoundingBox(dbusIf,Genivi.data['zoom_route_handle']);
             Genivi.mapviewer_SetMapViewBoundingBox(dbusIf,res);
             Genivi.mapviewer_DisplayRoute(dbusIf,Genivi.data['show_route_handle'],false);
@@ -1509,14 +1474,14 @@ NavigationAppHMIMenu {
             hideRoute();
             hideSimulation();
             updateAddress();
-            guidanceMode.setState('OFF');//guidance can be launched from this menu
         }
         else {
             if (Genivi.data['display_on_map']==='show_current_position') {
+                //show the current position
                 Genivi.mapviewer_SetFollowCarMode(dbusIf,true);
                 Genivi.mapviewer_SetMapViewScale(dbusIf,Genivi.zoom_guidance);
-                Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
                 if(Genivi.guidance_activated) {
+                    Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
                     Genivi.mapviewer_DisplayRoute(dbusIf,Genivi.data['show_route_handle'],false);
                     Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,1,50); //activate advisor mode
                     showGuidance();
@@ -1530,6 +1495,10 @@ NavigationAppHMIMenu {
                         hideSimulation();
                     }
                 } else {
+                    if(Genivi.showroom) {
+                        Genivi.data['current_position']=Genivi.data['default_position'];
+                    }
+                    Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
                     Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,0,50); //no advisor mode
                     hideGuidance();
                     hideRoute();
@@ -1539,6 +1508,7 @@ NavigationAppHMIMenu {
             }
             else {
                 if (Genivi.data['display_on_map']==='show_position') {
+                    //show a given position on the map
                     Genivi.mapviewer_SetFollowCarMode(dbusIf,false);
                     Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['position']['lat'],Genivi.data['position']['lon'],Genivi.data['position']['alt']);
                     Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,0,50); //no advisor mode