Move Test panel to HTML, add signals to a qml

1 files changed, 32 insertions, 1 deletions

diff --git a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
index 5ca7cda..8c0540b 100644
--- a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
+++ b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml
@@ -36,11 +36,36 @@ import lbs.plugin.dbusif 1.0
 HMIMenu {
 	id: menu
     property string pagefile:"NavigationSettingsLanguageAndUnits"
+    property Item configurationChangedSignal;
 
 	DBusIf {
 		id: dbusIf 
 	}
 
+    function configurationChanged(args)
+    { //to be improved !
+        for (var i=0; i < args[1].length;i+=2) {
+            switch (args[1][i+1]) {
+            case Genivi.NAVIGATIONCORE_LOCALE:
+                update();
+                break;
+            case Genivi.NAVIGATIONCORE_UNITS_OF_MEASUREMENT:
+                update();
+                break;
+            }
+        }
+    }
+
+    function connectSignals()
+    {
+        configurationChangedSignal=dbusIf.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Configuration","ConfigurationChanged",menu,"configurationChanged");
+    }
+
+    function disconnectSignals()
+    {
+        configurationChangedSignal.destroy();
+    }
+
 	function update()
 	{
         var available_nav=Genivi.navigationcore_configuration_GetSupportedLocales(dbusIf);
@@ -152,11 +177,17 @@ HMIMenu {
                 setUnitsLength(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; onClicked:{leaveMenu();}}
+            id:back; text: Genivi.gettext("Back"); disabled:false; next:back; prev:back;
+            onClicked:{
+                disconnectSignals();
+                leaveMenu();
+            }
+        }
 
 	}
 
     Component.onCompleted: {
+        connectSignals();
         update();
     }
 }