summaryrefslogtreecommitdiff
path: root/src/hmi
diff options
context:
space:
mode:
Diffstat (limited to 'src/hmi')
-rw-r--r--src/hmi/config/fsa_london.conf4
-rw-r--r--src/hmi/config/fsa_paris.conf4
-rw-r--r--src/hmi/config/fsa_switzerland.conf4
-rw-r--r--src/hmi/config/fsa_tokyo.conf4
-rw-r--r--src/hmi/hmi-launcher/main.cpp2
-rw-r--r--src/hmi/qml/Core/NavigationAppKeyboard.qml21
-rw-r--r--src/hmi/qml/Core/genivi-capi.js21
-rw-r--r--src/hmi/qml/Core/genivi-origin.js21
-rw-r--r--src/hmi/qml/NavigationApp.qml28
-rw-r--r--src/hmi/qml/NavigationAppMain.qml2
-rw-r--r--src/hmi/qml/NavigationAppPOI.qml35
-rw-r--r--src/hmi/qml/NavigationAppSearch.qml3
-rw-r--r--src/hmi/qml/NavigationAppSettings.qml73
13 files changed, 134 insertions, 88 deletions
diff --git a/src/hmi/config/fsa_london.conf b/src/hmi/config/fsa_london.conf
index 48c782a..c8d05c6 100644
--- a/src/hmi/config/fsa_london.conf
+++ b/src/hmi/config/fsa_london.conf
@@ -11,4 +11,8 @@ country=United Kingdom
city=London
street=Culworth Street
number=1
+[Settings]
+simulationMode=true
+showroom=true
+autoguidance=false
diff --git a/src/hmi/config/fsa_paris.conf b/src/hmi/config/fsa_paris.conf
index 674f9ff..873a3d1 100644
--- a/src/hmi/config/fsa_paris.conf
+++ b/src/hmi/config/fsa_paris.conf
@@ -11,4 +11,8 @@ country=France
city=Versailles
street=Rue Colbert
number=13
+[Settings]
+simulationMode=false
+showroom=false
+autoguidance=false
diff --git a/src/hmi/config/fsa_switzerland.conf b/src/hmi/config/fsa_switzerland.conf
index a07afe7..4b0e76a 100644
--- a/src/hmi/config/fsa_switzerland.conf
+++ b/src/hmi/config/fsa_switzerland.conf
@@ -11,4 +11,8 @@ country=Switzerland
city=Lausanne
street=Rue de Midi
number=8
+[Settings]
+simulationMode=true
+showroom=true
+autoguidance=false
diff --git a/src/hmi/config/fsa_tokyo.conf b/src/hmi/config/fsa_tokyo.conf
index 9b56b1f..f0dea7f 100644
--- a/src/hmi/config/fsa_tokyo.conf
+++ b/src/hmi/config/fsa_tokyo.conf
@@ -11,4 +11,8 @@ country=Japan
city=東京
street=井ノ頭通り
number=17
+[Settings]
+simulationMode=true
+showroom=true
+autoguidance=false
diff --git a/src/hmi/hmi-launcher/main.cpp b/src/hmi/hmi-launcher/main.cpp
index 31ae95c..6bc7e73 100644
--- a/src/hmi/hmi-launcher/main.cpp
+++ b/src/hmi/hmi-launcher/main.cpp
@@ -57,8 +57,6 @@ int main(int argc, char ** argv)
Settings* settings=new Settings;
settings->setIniCodec("UTF-8");
- QString toto=settings->getValue("DefaultAddress/city").toString();
-
int rc = 0;
QQmlEngine engine;
diff --git a/src/hmi/qml/Core/NavigationAppKeyboard.qml b/src/hmi/qml/Core/NavigationAppKeyboard.qml
index 119fe56..eac1bc2 100644
--- a/src/hmi/qml/Core/NavigationAppKeyboard.qml
+++ b/src/hmi/qml/Core/NavigationAppKeyboard.qml
@@ -89,8 +89,6 @@ Item {
if (text.length) {
if (!activekeys_enabled || text.length > 1 || activekeys.indexOf(stext) != -1)
disabled=false;
- if (stext == '\b' && !destination.text.length)
- disabled=true;
}
id.disabled=disabled;
}
@@ -102,25 +100,6 @@ Item {
shift(shiftlevel);
}
- function activateAllKeys()
- {
- var keys;
- keys='\b'+'␣'+"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- if(Genivi.g_language ==="eng"){
- }else{
- if(Genivi.g_language==="fra"){
- }else{
- if(Genivi.g_language==="jpn"){
- keys+="あかさたなはまやらわいきしちにひみりをうくすつぬふむゆるんえけせてねへめれ”おこそとのほもよろ°";
- }else{
- if(Genivi.g_language==="deu"){
- }
- }
- }
- }
- setactivekeys(keys,true);
- }
-
function shift(what) {
shiftlevel=what;
secondLayout="";
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js
index 22724e6..697a571 100644
--- a/src/hmi/qml/Core/genivi-capi.js
+++ b/src/hmi/qml/Core/genivi-capi.js
@@ -38,7 +38,8 @@ var g_mapviewer_session=["uint32",0];
var g_mapviewer_handle=["uint32",0];
var g_mapviewer_handle2=["uint32",0];
var g_poisearch_handle=["uint32",0];
-var g_language,g_country,g_script;
+var g_language,g_country,g_script; //initialized by conf file
+var g_default_category_name='fuel'
var data=new Array;
data['destination']=new Array; //the destination
@@ -54,9 +55,9 @@ var categoriesIdNameList;
var translations=new Array;
-var simulationMode=false;// simulation mode off by default
-var showroom=false; //showroom off by default
-var autoguidance=false; //no automatic display route on guidance by default
+var simulationMode; //initialized by conf file
+var showroom; //initialized by conf file
+var autoguidance; //initialized by conf file
var guidance_activated=false;
var route_calculated=false;
@@ -326,6 +327,11 @@ var japaneseLayout={
　　'かな','ABC','','','','','','','','←',
],
};
+var allKeys;
+var germanAllKeys="\b ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+var frenchAllKeys="\b ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+var englishAllKeys="\b ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+var japaneseAllKeys="\b ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789あかさたなはまやらわいきしちにひみりをうくすつぬふむゆるんえけせてねへめれ”おこそとのほもよろ°アカサタナハマヤラワイキシチニヒミリヲウクスツヌフムユルンエケセテネヘメレオコソトノホモヨロ";
// Language and text
function setlang(language,country,script)
@@ -337,6 +343,7 @@ function setlang(language,country,script)
Qt.include("../../translations/"+g_language + "_" + g_country+".js");
if(g_language==="eng"){
keyboardLayout=englishLayout;
+ allKeys=englishAllKeys;
kbdFirstLayout="ABC";
kbdSecondLayout="123";
kbdColumns=8; //number of rows per line
@@ -346,6 +353,7 @@ function setlang(language,country,script)
}else{
if(g_language==="fra"){
keyboardLayout=frenchLayout;
+ allKeys=frenchAllKeys;
kbdFirstLayout="ABC";
kbdSecondLayout="123";
kbdColumns=8; //number of rows per line
@@ -355,6 +363,7 @@ function setlang(language,country,script)
}else{
if(g_language==="jpn"){
keyboardLayout=japaneseLayout;
+ allKeys=japaneseAllKeys;
kbdFirstLayout="かな";
kbdSecondLayout="カナ";
kbdColumns=10; //number of rows per line
@@ -364,6 +373,7 @@ function setlang(language,country,script)
}else{
if(g_language==="deu"){
keyboardLayout=germanLayout;
+ allKeys=germanAllKeys;
kbdFirstLayout="ABC";
kbdSecondLayout="123";
kbdColumns=8; //number of rows per line
@@ -373,6 +383,7 @@ function setlang(language,country,script)
}else{
//default
keyboardLayout=germanLayout;
+ allKeys=germanAllKeys;
kbdColumns=8; //number of rows per line
kbdColumnRatio=4; //size of row spacing (ratio)
kbdLines=4; //number of lines
@@ -970,7 +981,7 @@ function mapviewer_GetDisplayedRoutes(dbusIf)
function mapviewer_SetMapViewScale(dbusIf,scaleID)
{
- mapviewercontrol_message(dbusIf,"setMapViewScale", ["uint16",scaleID]);
+ mapviewercontrol_message(dbusIf,"setMapViewScale", ["uint8",scaleID]);
}
function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta)
diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js
index f58a500..26dc7ea 100644
--- a/src/hmi/qml/Core/genivi-origin.js
+++ b/src/hmi/qml/Core/genivi-origin.js
@@ -38,7 +38,8 @@ var g_mapviewer_session=["uint32",0];
var g_mapviewer_handle=["uint32",0];
var g_mapviewer_handle2=["uint32",0];
var g_poisearch_handle=["uint32",0];
-var g_language,g_country,g_script;
+var g_language,g_country,g_script; //initialized by conf file
+var g_default_category_name='fuel'
var data=new Array;
data['destination']=new Array; //the destination
@@ -54,9 +55,9 @@ var categoriesIdNameList;
var translations=new Array;
-var simulationMode=false;// simulation mode off by default
-var showroom=false; //showroom off by default
-var autoguidance=false; //no automatic display route on guidance by default
+var simulationMode; //initialized by conf file
+var showroom; //initialized by conf file
+var autoguidance; //initialized by conf file
var guidance_activated=false;
var route_calculated=false;
@@ -326,6 +327,11 @@ var japaneseLayout={
　　'かな','ABC','','','','','','','','←',
],
};
+var allKeys;
+var germanAllKeys="\b ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+var frenchAllKeys="\b ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+var englishAllKeys="\b ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+var japaneseAllKeys="\b ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789あかさたなはまやらわいきしちにひみりをうくすつぬふむゆるんえけせてねへめれ”おこそとのほもよろ°アカサタナハマヤラワイキシチニヒミリヲウクスツヌフムユルンエケセテネヘメレオコソトノホモヨロ";
// Language and text
function setlang(language,country,script)
@@ -337,6 +343,7 @@ function setlang(language,country,script)
Qt.include("../../translations/"+g_language + "_" + g_country+".js");
if(g_language==="eng"){
keyboardLayout=englishLayout;
+ allKeys=englishAllKeys;
kbdFirstLayout="ABC";
kbdSecondLayout="123";
kbdColumns=8; //number of rows per line
@@ -346,6 +353,7 @@ function setlang(language,country,script)
}else{
if(g_language==="fra"){
keyboardLayout=frenchLayout;
+ allKeys=frenchAllKeys;
kbdFirstLayout="ABC";
kbdSecondLayout="123";
kbdColumns=8; //number of rows per line
@@ -355,6 +363,7 @@ function setlang(language,country,script)
}else{
if(g_language==="jpn"){
keyboardLayout=japaneseLayout;
+ allKeys=japaneseAllKeys;
kbdFirstLayout="かな";
kbdSecondLayout="カナ";
kbdColumns=10; //number of rows per line
@@ -364,6 +373,7 @@ function setlang(language,country,script)
}else{
if(g_language==="deu"){
keyboardLayout=germanLayout;
+ allKeys=germanAllKeys;
kbdFirstLayout="ABC";
kbdSecondLayout="123";
kbdColumns=8; //number of rows per line
@@ -373,6 +383,7 @@ function setlang(language,country,script)
}else{
//default
keyboardLayout=germanLayout;
+ allKeys=germanAllKeys;
kbdColumns=8; //number of rows per line
kbdColumnRatio=4; //size of row spacing (ratio)
kbdLines=4; //number of lines
@@ -967,7 +978,7 @@ function mapviewer_GetDisplayedRoutes(dbusIf)
function mapviewer_SetMapViewScale(dbusIf,scaleID)
{
- mapviewercontrol_message(dbusIf,"SetMapViewScale", ["uint16",scaleID]);
+ mapviewercontrol_message(dbusIf,"SetMapViewScale", ["uint8",scaleID]);
}
function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta)
diff --git a/src/hmi/qml/NavigationApp.qml b/src/hmi/qml/NavigationApp.qml
index 56ea5fc..a21746f 100644
--- a/src/hmi/qml/NavigationApp.qml
+++ b/src/hmi/qml/NavigationApp.qml
@@ -50,6 +50,16 @@ ApplicationWindow {
component = Qt.createQmlObject(page+"{}",container,"dynamic");
}
+ function saveSettings()
+ {
+ Settings.setValue("Settings/simulationMode",Genivi.simulationMode);
+ Settings.setValue("Settings/showroom",Genivi.showroom);
+ Settings.setValue("Settings/autoguidance",Genivi.autoguidance);
+ Settings.setValue("Locale/language",Genivi.g_language)
+ Settings.setValue("Locale/country",Genivi.g_country);
+ Settings.setValue("Locale/script",Genivi.g_script);
+ }
+
//------------------------------------------//
// Management of the DBus exchanges
//------------------------------------------//
@@ -64,10 +74,24 @@ ApplicationWindow {
Component.onCompleted: {
//init persistent data
+ //NB: settings are stored as strings, so it may need some rework for persistent data that are not strings (to be improved ?)
Genivi.setlang(Settings.getValue("Locale/language"),Settings.getValue("Locale/country"),Settings.getValue("Locale/script"));
Genivi.setDefaultPosition(Settings.getValue("DefaultPosition/latitude"),Settings.getValue("DefaultPosition/longitude"),Settings.getValue("DefaultPosition/altitude"));
Genivi.setDefaultAddress(Settings.getValue("DefaultAddress/country"),Settings.getValue("DefaultAddress/city"),Settings.getValue("DefaultAddress/street"),Settings.getValue("DefaultAddress/number"));
+ if(Settings.getValue("Settings/simulationMode")==="true")
+ Genivi.simulationMode=true;
+ else
+ Genivi.simulationMode=false;
+ if(Settings.getValue("Settings/showroom")==="true")
+ Genivi.showroom=true;
+ else
+ Genivi.showroom=false;
+ if(Settings.getValue("Settings/autoguidance")==="true")
+ Genivi.autoguidance=true;
+ else
+ Genivi.autoguidance=false;
+
//configure the middleware
Genivi.navigationcore_configuration_SetLocale(dbusIf,Genivi.g_language,Genivi.g_country,Genivi.g_script);
@@ -76,13 +100,15 @@ ApplicationWindow {
Genivi.initScale(dbusIf);
//set verbose mode on
- Genivi.setVerbose();
+ //Genivi.setVerbose();
//launch the HMI
load("NavigationAppMain");
}
Component.onDestruction: {
+ saveSettings();
+
//release the map viewer
Genivi.mapviewer_handle_clear(dbusIf);
}
diff --git a/src/hmi/qml/NavigationAppMain.qml b/src/hmi/qml/NavigationAppMain.qml
index bcf161c..a65d065 100644
--- a/src/hmi/qml/NavigationAppMain.qml
+++ b/src/hmi/qml/NavigationAppMain.qml
@@ -124,7 +124,7 @@ NavigationAppHMIMenu {
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; next:poi; prev:navigation;
- disabled:!(vehicleLocated || Genivi.showroom )
+ disabled: !(vehicleLocated|Genivi.showroom)
onClicked: {
Genivi.data['display_on_map']='show_current_position';
entryMenu("NavigationAppBrowseMap",menu);
diff --git a/src/hmi/qml/NavigationAppPOI.qml b/src/hmi/qml/NavigationAppPOI.qml
index 1a74dbe..34f088a 100644
--- a/src/hmi/qml/NavigationAppPOI.qml
+++ b/src/hmi/qml/NavigationAppPOI.qml
@@ -36,7 +36,6 @@ import lbs.plugin.dbusif 1.0
NavigationAppHMIMenu {
id: menu
property string pagefile:"NavigationAppPOI"
- property string extraspell;
property string all_categories: "all categories"
property string poiCategoryName
property bool vehicleLocated: false
@@ -92,11 +91,6 @@ NavigationAppHMIMenu {
select_search.update();
}
- function spell(input)
- {
- keyboardArea.destination.text = input;
- }
-
function displayCategoryList()
{
var model=view.model;
@@ -105,10 +99,10 @@ NavigationAppHMIMenu {
if(Genivi.categoriesIdNameList[i+1][3]!==all_categories)
model.append({"name":Genivi.categoriesIdNameList[i+1][3],"number":i/2});
}
- categoryValue.text=model.get(0).name;
+ categoryValue.text=model.get(0).name; // to be clarified
}
- function displayPoiList()
+ function searchPois()
{
var model=view.model;
var ids=[];
@@ -136,10 +130,17 @@ NavigationAppHMIMenu {
Genivi.poisearch_SetCenter(dbusIf,latitude,longitude,0);
Genivi.poisearch_SetCategories(dbusIf,categoriesAndRadiusList);
- Genivi.poisearch_StartPoiSearch(dbusIf,"",Genivi.POISERVICE_SORT_BY_DISTANCE);
+ Genivi.poisearch_StartPoiSearch(dbusIf,keyboardArea.destination.text,Genivi.POISERVICE_SORT_BY_DISTANCE);
var attributeList=[];
attributeList[0]=0;
var res=Genivi.poisearch_RequestResultList(dbusIf,Genivi.offset,Genivi.maxResultListSize,attributeList);
+ if(res[3]===0)
+ {
+ //no match
+ //to do something to inform the user
+ return
+ }
+
var res_win=res[5];
var i;
for (i = 0 ; i < res_win.length ; i+=2) {
@@ -173,7 +174,7 @@ NavigationAppHMIMenu {
//------------------------------------------//
Keys.onPressed: {
if (event.text) {
- if (event.text == '\b') {
+ if (event.text === '\b') {
if (text.text.length) {
text.text=text.text.slice(0,-1);
}
@@ -184,6 +185,11 @@ NavigationAppHMIMenu {
}
}
+ function spell(input)
+ {
+ keyboardArea.destination.text = keyboardArea.destination.text+input;
+ }
+
NavigationAppHMIBgImage {
image:StyleSheet.navigation_app_poi_background[Constants.SOURCE];
anchors { fill: parent; topMargin: parent.headlineHeight }
@@ -331,12 +337,13 @@ NavigationAppHMIMenu {
NavigationAppKeyboard {
x:StyleSheet.keyboardArea[Constants.X]; y:StyleSheet.keyboardArea[Constants.Y]; width:StyleSheet.keyboardArea[Constants.WIDTH]; height:StyleSheet.keyboardArea[Constants.HEIGHT];
id: keyboardArea;
+ visible: true;
destination: poiValue;
firstLayout: Genivi.kbdFirstLayout;
secondLayout: Genivi.kbdSecondLayout;
next: select_search;
prev: poiKeyboard;
- onKeypress: { }
+ onKeypress: { }
}
StdButton {
@@ -344,7 +351,7 @@ NavigationAppHMIMenu {
id:select_search
disabled:!(vehicleLocated || Genivi.showroom );
onClicked: {
- displayPoiList();
+ searchPois();
}
}
StdButton {
@@ -419,12 +426,11 @@ NavigationAppHMIMenu {
selectedValueTitle.visible=true;
select_reroute.disabled=false;
select_display_on_map.disabled=false;
- displayPoiList();
}else{
Genivi.poi_data=[];
selectedValue.text="Lat:\nLon:\nDist:\n";
for (var j = 0 ; j < Genivi.categoriesIdNameList.length ; j+=2) {
- if (Genivi.categoriesIdNameList[j+1][3] == 'fuel') {
+ if (Genivi.categoriesIdNameList[j+1][3] === Genivi.g_default_category_name) {
Genivi.category_id=Genivi.categoriesIdNameList[j+1][1];
poiCategoryName=Genivi.categoriesIdNameList[j+1][3];
}
@@ -434,6 +440,7 @@ NavigationAppHMIMenu {
categoryValue.text=poiCategoryName;
keyboardArea.destination=poiValue; // by default
+ keyboardArea.setactivekeys(Genivi.allKeys,true);
poiFrame.visible=true;
if(!Genivi.showroom) {
diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml
index e058a3d..32e0e10 100644
--- a/src/hmi/qml/NavigationAppSearch.qml
+++ b/src/hmi/qml/NavigationAppSearch.qml
@@ -641,7 +641,7 @@ NavigationAppHMIMenu {
{
spell('');
} else { //there's a bug for street
- keyboardArea.activateAllKeys();
+ keyboardArea.setactivekeys(Genivi.allKeys,true);
listArea.model.clear();
}
}
@@ -1025,6 +1025,7 @@ NavigationAppHMIMenu {
destination: countryValue; // by default
firstLayout: Genivi.kbdFirstLayout;
secondLayout: Genivi.kbdSecondLayout;
+ shiftlevel: Genivi.kbdFirstLayout;
next: listArea;
prev: numberKeyboard;
onKeypress: { spell(what); }
diff --git a/src/hmi/qml/NavigationAppSettings.qml b/src/hmi/qml/NavigationAppSettings.qml
index d46b006..9f3feca 100644
--- a/src/hmi/qml/NavigationAppSettings.qml
+++ b/src/hmi/qml/NavigationAppSettings.qml
@@ -231,6 +231,34 @@ NavigationAppHMIMenu {
updatePreferences();
}
+ function updateSettings()
+ {
+ if (Genivi.autoguidance===true)
+ {
+ autoguidance.setState("ENABLE");
+ }
+ else
+ {
+ autoguidance.setState("DISABLE");
+ }
+ if (Genivi.simulationMode===true)
+ {
+ simu_mode.setState("ENABLE");
+ }
+ else
+ {
+ simu_mode.setState("DISABLE");
+ }
+ if (Genivi.showroom===true)
+ {
+ showroom.setState("ENABLE");
+ }
+ else
+ {
+ showroom.setState("DISABLE");
+ }
+ }
+
//------------------------------------------//
// Menu elements
//------------------------------------------//
@@ -339,18 +367,7 @@ NavigationAppHMIMenu {
StdButton {
x:StyleSheet.simu_mode_enable[Constants.X]; y:StyleSheet.simu_mode_enable[Constants.Y]; width:StyleSheet.simu_mode_enable[Constants.WIDTH]; height:StyleSheet.simu_mode_enable[Constants.HEIGHT];
id:simu_mode; next:back; prev:back; disabled:false;
- source:
- {
- if (Genivi.simulationMode==true)
- {
- source=StyleSheet.simu_mode_enable[Constants.SOURCE];
- }
- else
- {
- source=StyleSheet.simu_mode_disable[Constants.SOURCE];
- }
- }
-
+ source:StyleSheet.simu_mode_enable[Constants.SOURCE];
function setState(name)
{
if (name=="ENABLE")
@@ -387,21 +404,10 @@ NavigationAppHMIMenu {
StdButton {
x:StyleSheet.showroom_enable[Constants.X]; y:StyleSheet.showroom_enable[Constants.Y]; width:StyleSheet.showroom_enable[Constants.WIDTH]; height:StyleSheet.showroom_enable[Constants.HEIGHT];
id:showroom; next:back; prev:back; disabled:false;
- source:
- {
- if (Genivi.showroom==true)
- {
- source=StyleSheet.showroom_enable[Constants.SOURCE];
- }
- else
- {
- source=StyleSheet.showroom_disable[Constants.SOURCE];
- }
- }
-
+ source: StyleSheet.showroom_disable[Constants.SOURCE];
function setState(name)
{
- if (name=="ENABLE")
+ if (name==="ENABLE")
{
source=StyleSheet.showroom_enable[Constants.SOURCE];
}
@@ -412,7 +418,7 @@ NavigationAppHMIMenu {
}
onClicked:
{
- if (Genivi.showroom ===true)
+ if (Genivi.showroom===true)
{
Genivi.showroom=false;
showroom.setState("DISABLE");
@@ -435,18 +441,7 @@ NavigationAppHMIMenu {
StdButton {
x:StyleSheet.autoguidance_enable[Constants.X]; y:StyleSheet.autoguidance_enable[Constants.Y]; width:StyleSheet.autoguidance_enable[Constants.WIDTH]; height:StyleSheet.autoguidance_enable[Constants.HEIGHT];
id:autoguidance; next:back; prev:back; disabled:false;
- source:
- {
- if (Genivi.autoguidance==true)
- {
- source=StyleSheet.autoguidance_enable[Constants.SOURCE];
- }
- else
- {
- source=StyleSheet.autoguidance_disable[Constants.SOURCE];
- }
- }
-
+ source: StyleSheet.autoguidance_disable[Constants.SOURCE];
function setState(name)
{
if (name=="ENABLE")
@@ -478,6 +473,7 @@ NavigationAppHMIMenu {
id:back; text: Genivi.gettext("Back"); disabled:false; next:simu_mode; prev:showroom;
onClicked:{
disconnectSignals();
+ saveSettings();
leaveMenu();
}
}
@@ -516,5 +512,6 @@ NavigationAppHMIMenu {
updateLanguageAndUnits();
updatePreferences();
+ updateSettings();
}
}
View Lorry Controller Status