fix wrong target for generated .qm files

9 files changed, 68 insertions, 107 deletions

diff --git a/src/gnss-service/gnss-use-replayer.c b/src/gnss-service/gnss-use-replayer.c
index 77510f9..065c1ed 100644
--- a/src/gnss-service/gnss-use-replayer.c
+++ b/src/gnss-service/gnss-use-replayer.c
@@ -171,46 +171,6 @@ static bool processGVGNSPOS(const char* data)
         &pos.validityBits
         );
 
-    if (n != 27) //27 fields to parse
-    {
-        //try old version without correctionAge
-        n = sscanf(data, 
-            "%"SCNu64",%"SCNu16",$GVGNSPOS,%"SCNu64",%lf,%lf,%f,%f,%f,%f,%f,%f,%f,%f,%"SCNu16",%"SCNu16",%"SCNu16",%f,%f,%f,%f,%f,%u,%x,%x,%x,%x",
-            &timestamp,
-            &countdown,
-            &pos.timestamp,
-            &pos.latitude,
-            &pos.longitude,
-            &pos.altitudeMSL,
-            &pos.altitudeEll,
-            &pos.hSpeed,
-            &pos.vSpeed,
-            &pos.heading,
-            &pos.pdop,
-            &pos.hdop,
-            &pos.vdop,
-            &pos.usedSatellites,
-            &pos.trackedSatellites,
-            &pos.visibleSatellites,
-            &pos.sigmaHPosition,
-            &pos.sigmaAltitude,
-            &pos.sigmaHSpeed,
-            &pos.sigmaVSpeed,
-            &pos.sigmaHeading,
-            &pos.fixStatus,
-            &pos.fixTypeBits,
-            &pos.activatedSystems,
-            &pos.usedSystems,
-            &pos.validityBits
-            );
-        pos.validityBits &= ~GNSS_POSITION_CORRAGE_VALID; //just to be safe
-        if (n != 26) //26 fields to parse
-        {
-            LOG_ERROR_MSG(gContext,"replayer: processGVGNSPOS failed!");
-            return false;
-        }
-    }
-
     //buffered data handling
     if (countdown < MAX_BUF_MSG) //enough space in buffer?
     {
diff --git a/src/hmi/config/fsa_giromagny.conf b/src/hmi/config/fsa_giromagny.conf
index 1963bc2..74181ea 100644
--- a/src/hmi/config/fsa_giromagny.conf
+++ b/src/hmi/config/fsa_giromagny.conf
@@ -20,5 +20,5 @@ maxResultListSize=10
 defaultCategoryName=fuel
 [Log]
 verbose=true
-dlt=true
+dlt=false
 
diff --git a/src/hmi/hmi-launcher/CMakeLists.txt b/src/hmi/hmi-launcher/CMakeLists.txt
index ee36150..0208533 100644
--- a/src/hmi/hmi-launcher/CMakeLists.txt
+++ b/src/hmi/hmi-launcher/CMakeLists.txt
@@ -154,14 +154,14 @@ file (GLOB TS_TO_RELEASE
 
 foreach(RAW_FILE ${TS_TO_RELEASE})
     get_filename_component(FILE ${RAW_FILE} NAME_WE)
-    if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.qm)
+    if(NOT EXISTS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${FILE}.qm)
         execute_process(
-            COMMAND ${qt_release} ${RAW_FILE} -qm ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.qm
+            COMMAND ${qt_release} ${RAW_FILE} -qm ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${FILE}.qm
         )
     else()
-        if(${RAW_FILE} IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.qm)
+        if(${RAW_FILE} IS_NEWER_THAN ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${FILE}.qm)
             execute_process(
-            COMMAND ${qt_release} ${RAW_FILE} -qm ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.qm
+            COMMAND ${qt_release} ${RAW_FILE} -qm ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${FILE}.qm
             )
         endif()
     endif()
diff --git a/src/hmi/qml/NavigationAppSettings.qml b/src/hmi/qml/NavigationAppSettings.qml
index 9aebf25..c892d0f 100644
--- a/src/hmi/qml/NavigationAppSettings.qml
+++ b/src/hmi/qml/NavigationAppSettings.qml
@@ -67,10 +67,10 @@ NavigationAppHMIMenu {
         for (var i=0; i < args[1].length;i+=2) {
             switch (args[1][i+1]) {
             case Genivi.NAVIGATIONCORE_LOCALE:
-                update();
+                updateLanguageAndUnits();
                 break;
             case Genivi.NAVIGATIONCORE_UNITS_OF_MEASUREMENT:
-                update();
+                updateLanguageAndUnits();
                 break;
             }
         }
@@ -126,6 +126,7 @@ NavigationAppHMIMenu {
             }
         }
 
+        Genivi.dump("lang",current_nav);
         Genivi.setlang(current_nav[1],current_nav[3],current_nav[5]);
 
         var units1,units2;
diff --git a/src/hmi/translations/deu_DEU_Latn.ts b/src/hmi/translations/deu_DEU_Latn.ts
index 43c2920..92c154e 100644
--- a/src/hmi/translations/deu_DEU_Latn.ts
+++ b/src/hmi/translations/deu_DEU_Latn.ts
@@ -194,62 +194,62 @@
 <context>
     <name>NavigationAppSettings</name>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="291"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="292"/>
         <source>Language</source>
         <translation>Sprachen</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="314"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="315"/>
         <source>Units</source>
         <translation>Maßeinheiten</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="332"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="333"/>
         <source>CostModel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="340"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="341"/>
         <source>RoutingPreferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="348"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="349"/>
         <source>Ferries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="360"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="361"/>
         <source>TollRoads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="372"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="373"/>
         <source>MotorWays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="384"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="385"/>
         <source>Simulation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="423"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="424"/>
         <source>Showroom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="461"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="462"/>
         <source>Autoguidance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="495"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="496"/>
         <source>Mapview</source>
         <translation>Karte</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="504"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="505"/>
         <source>Back</source>
         <translation>Zurück</translation>
     </message>
diff --git a/src/hmi/translations/eng_USA_Latn.ts b/src/hmi/translations/eng_USA_Latn.ts
index ed81a6c..09e9af1 100644
--- a/src/hmi/translations/eng_USA_Latn.ts
+++ b/src/hmi/translations/eng_USA_Latn.ts
@@ -194,62 +194,62 @@
 <context>
     <name>NavigationAppSettings</name>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="291"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="292"/>
         <source>Language</source>
         <translation>LANGUAGE</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="314"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="315"/>
         <source>Units</source>
         <translation>UNITS</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="332"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="333"/>
         <source>CostModel</source>
         <translation>COST MODEL</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="340"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="341"/>
         <source>RoutingPreferences</source>
         <translation>ROUTING PREFERENCES</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="348"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="349"/>
         <source>Ferries</source>
         <translation>FERRIES</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="360"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="361"/>
         <source>TollRoads</source>
         <translation>TOLL ROADS</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="372"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="373"/>
         <source>MotorWays</source>
         <translation>MOTORWAYS</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="384"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="385"/>
         <source>Simulation</source>
         <translation>SIMULATION</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="423"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="424"/>
         <source>Showroom</source>
         <translation>SHOWROOM</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="461"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="462"/>
         <source>Autoguidance</source>
         <translation>AUTOGUIDE</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="495"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="496"/>
         <source>Mapview</source>
         <translation>MAP</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="504"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="505"/>
         <source>Back</source>
         <translation>BACK</translation>
     </message>
diff --git a/src/hmi/translations/fra_FRA_Latn.ts b/src/hmi/translations/fra_FRA_Latn.ts
index f666447..ec4e966 100644
--- a/src/hmi/translations/fra_FRA_Latn.ts
+++ b/src/hmi/translations/fra_FRA_Latn.ts
@@ -194,62 +194,62 @@
 <context>
     <name>NavigationAppSettings</name>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="291"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="292"/>
         <source>Language</source>
         <translation>Langues</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="314"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="315"/>
         <source>Units</source>
         <translation>Unités</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="332"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="333"/>
         <source>CostModel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="340"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="341"/>
         <source>RoutingPreferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="348"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="349"/>
         <source>Ferries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="360"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="361"/>
         <source>TollRoads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="372"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="373"/>
         <source>MotorWays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="384"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="385"/>
         <source>Simulation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="423"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="424"/>
         <source>Showroom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="461"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="462"/>
         <source>Autoguidance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="495"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="496"/>
         <source>Mapview</source>
         <translation>Carte</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="504"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="505"/>
         <source>Back</source>
         <translation>Retour</translation>
     </message>
diff --git a/src/hmi/translations/jpn_JPN_Hrkt.ts b/src/hmi/translations/jpn_JPN_Hrkt.ts
index 8a50fd8..d3d12ce 100644
--- a/src/hmi/translations/jpn_JPN_Hrkt.ts
+++ b/src/hmi/translations/jpn_JPN_Hrkt.ts
@@ -194,62 +194,62 @@
 <context>
     <name>NavigationAppSettings</name>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="291"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="292"/>
         <source>Language</source>
         <translation>言語</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="314"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="315"/>
         <source>Units</source>
         <translation>ユニット</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="332"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="333"/>
         <source>CostModel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="340"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="341"/>
         <source>RoutingPreferences</source>
         <translation>ルートの設定</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="348"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="349"/>
         <source>Ferries</source>
         <translation>フェリー</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="360"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="361"/>
         <source>TollRoads</source>
         <translation>通行料</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="372"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="373"/>
         <source>MotorWays</source>
         <translation>高速道路</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="384"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="385"/>
         <source>Simulation</source>
         <translation>シミュレーション</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="423"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="424"/>
         <source>Showroom</source>
         <translation>ショールーム</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="461"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="462"/>
         <source>Autoguidance</source>
         <translation>自動ガイド</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="495"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="496"/>
         <source>Mapview</source>
         <translation>地図</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="504"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="505"/>
         <source>Back</source>
         <translation>戻る</translation>
     </message>
diff --git a/src/hmi/translations/kor_KOR_Hang.ts b/src/hmi/translations/kor_KOR_Hang.ts
index a320244..50a94eb 100644
--- a/src/hmi/translations/kor_KOR_Hang.ts
+++ b/src/hmi/translations/kor_KOR_Hang.ts
@@ -194,62 +194,62 @@
 <context>
     <name>NavigationAppSettings</name>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="291"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="292"/>
         <source>Language</source>
         <translation>언어</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="314"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="315"/>
         <source>Units</source>
         <translation>단위</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="332"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="333"/>
         <source>CostModel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="340"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="341"/>
         <source>RoutingPreferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="348"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="349"/>
         <source>Ferries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="360"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="361"/>
         <source>TollRoads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="372"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="373"/>
         <source>MotorWays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="384"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="385"/>
         <source>Simulation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="423"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="424"/>
         <source>Showroom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="461"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="462"/>
         <source>Autoguidance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="495"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="496"/>
         <source>Mapview</source>
         <translation>지도</translation>
     </message>
     <message>
-        <location filename="../qml/NavigationAppSettings.qml" line="504"/>
+        <location filename="../qml/NavigationAppSettings.qml" line="505"/>
         <source>Back</source>
         <translation>뒤로</translation>
     </message>