diff options
| author | <philippe colliot> | 2014-08-21 17:00:54 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2014-08-21 17:00:54 +0200 |
| commit | 109e10404ab24913dc545470a09f969809d269ee (patch) | |
| tree | 0f2f4035e53802314b7f517790be8dc90c105b6c | |
| parent | 4b52051da0ccee823dbc8aeac47c437e76b3553d (diff) | |
| download | navigation-109e10404ab24913dc545470a09f969809d269ee.tar.gz | |
update of the map menu (first step, not stable yet)
116 files changed, 1465 insertions, 771 deletions
diff --git a/src/hmi/qml/CameraSettings.qml b/src/hmi/qml/CameraSettings.qml index 66bb1a4..c47bc40 100644 --- a/src/hmi/qml/CameraSettings.qml +++ b/src/hmi/qml/CameraSettings.qml @@ -30,222 +30,383 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; import "Core/style-sheets/style-constants.js" as Constants; +import "Core/style-sheets/navigation-browse-map-settings-css.js" as StyleSheetSettings; import lbs.plugin.dbusif 1.0 HMIMenu { - id: menu - headlineFg: "grey" - headlineBg: "blue" - text: Genivi.gettext("CameraSettings") - next: north - prev: distancem - - DBusIf { - id:dbusIf - } - - Timer { - id:move_timer - repeat:true - triggeredOnStart:false - property real lat; - property real lon; - property bool active; - onTriggered: { - if (active) { - var res=Genivi.mapviewercontrol_message(dbusIf, "GetTargetPoint", []); - if (res[0] == 'structure') { - res[1][1]+=lat; - res[1][3]+=lon; - Genivi.mapviewercontrol_message(dbusIf, "SetTargetPoint", res); - } - interval=50; - restart(); - } - } - } - - Timer { - id:camera_timer - repeat:true - triggeredOnStart:false - property bool active; - property string camera_value; - property real step; - property bool clamp; - property real clamp_value; - onTriggered: { - if (active) { - var res=Genivi.mapviewercontrol_message(dbusIf, "Get"+camera_value, []); - if (res[0] == 'double' || res[0] == 'int32' || res[0] == 'uint32') { - res[1]+=step; - if (clamp) { - if (step > 0 && res[1] > clamp_value) { - res[1]=clamp_value; - } - if (step < 0 && res[1] < clamp_value) { - res[1]=clamp_value; - } - } - Genivi.mapviewercontrol_message(dbusIf, "Set"+camera_value, res); - } - interval=50; - restart(); - } - } - } - - function showSurfaces() - { - Genivi.lm_message(dbusIf,"ServiceConnect",["uint32",dbusIf.pid()]); - Genivi.lm_message(dbusIf,"SetSurfaceDestinationRegion",["uint32",2000+Genivi.g_map_handle[1],"uint32",map.x,"uint32",map.y,"uint32",map.width,"uint32",map.height]); - Genivi.lm_message(dbusIf,"SetSurfaceSourceRegion",["uint32",2000+Genivi.g_map_handle[1],"uint32",0,"uint32",0,"uint32",map.width,"uint32",map.height]); - Genivi.lm_message(dbusIf,"SetSurfaceVisibility",["uint32",2000+Genivi.g_map_handle[1],"boolean",true]); - Genivi.lm_message(dbusIf,"CommitChanges",[]); - Genivi.lm_message(dbusIf,"ServiceDisconnect",["uint32",dbusIf.pid()]); - } - - function hideSurfaces() - { - Genivi.lm_message(dbusIf,"ServiceConnect",["uint32",dbusIf.pid()]); - Genivi.lm_message(dbusIf,"SetSurfaceVisibility",["uint32",2000+Genivi.g_map_handle[1],"boolean",false]); - Genivi.lm_message(dbusIf,"CommitChanges",[]); - Genivi.lm_message(dbusIf,"ServiceDisconnect",["uint32",dbusIf.pid()]); - } - - function move_start(lat, lon) - { - Genivi.mapviewercontrol_message(dbusIf, "SetFollowCarMode", ["boolean",false]); - move_timer.lat=lat/10000; - move_timer.lon=lon/10000; - move_timer.active=true; - move_timer.triggered(); - } - - function move_stop() - { - move_timer.active=false; - move_timer.stop(); - } - - function camera_start(camera_value, step) - { - camera_timer.camera_value=camera_value; - camera_timer.step=step; - camera_timer.active=true; - camera_timer.triggered(); - } - - function camera_start_clamp(camera_value, step, clampvalue) - { - camera_timer.clamp=true; - camera_timer.clamp_value=clampvalue; - camera_start(camera_value, step); - } - - function camera_stop() - { - camera_timer.active=false; - camera_timer.stop(); - camera_timer.clamp=false; - } - - function set_angle(angle) - { - Genivi.mapviewercontrol_message(dbusIf, "SetMapViewRotation", ["int32",angle,"int32",15]); - } - - - Row { - id:content - y:30; - x:menu.wspc/2; - height:content.h - property real w: menu.w(5); - property real h: menu.h(4); - property real scrollspeed: 40 - spacing: menu.wspc/3; - - StdButton { id:north; text:"North"; explode:false; next:south; prev:distancem; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - set_angle(0); - } - } - - StdButton { id:south; text:"South"; explode:false; next:east; prev:north; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - set_angle(180); - } - } - - StdButton { id:east; text:"East"; explode:false; next:west; prev:south; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - set_angle(90); - } - } - - StdButton { id:west; text:"West"; explode:false; next:back; prev:east; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - set_angle(270); - } - } - StdButton { id:back; text:"Back"; explode:false; next:tiltp; prev:west; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - Genivi.data['show_current_position']=true; - move_stop(); - camera_stop(); - hideSurfaces(); - pageOpen("NavigationBrowseMap"); - } - } - } - Rectangle { - id:map - y:content.y+content.height+4 - height:menu.height-y-bottom.height-8 - width:menu.width - color:"#ffff7e" - } - Row { - id:bottom - y:menu.height-height-4 - x:menu.wspc/2; - height:content.h - spacing:menu.wspc/3 - - StdButton { id:tiltp; text:"Tilt+"; explode:false; next:tiltm; prev:back; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {camera_start_clamp("CameraTiltAngle",-10,0);} - onReleased: {camera_stop();} - } - - StdButton { id:tiltm; text:"Tilt-"; explode:false; next:heightp; prev:tiltp; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {camera_start_clamp("CameraTiltAngle",10,90);} - onReleased: {camera_stop();} - } - - StdButton { id:heightp; text:"Height+"; explode:false; next:heightm; prev:tiltm; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {camera_start("CameraHeight",10);} - onReleased: {camera_stop();} - } - - StdButton { id:heightm; text:"Height-"; explode:false; next:distancep; prev:heightp; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {camera_start("CameraHeight",-10);} - onReleased: {camera_stop();} - } - - StdButton { id:distancep; text:"Distance+"; explode:false; next:distancem; prev:heightm; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {camera_start("CameraDistanceFromTargetPoint",10);} - onReleased: {camera_stop();} - } - - StdButton { id:distancem; text:"Distance-"; explode:false; next:north; prev:distancep; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {camera_start("CameraDistanceFromTargetPoint",-10);} - onReleased: {camera_stop();} - } - - } - Component.onCompleted: { - Genivi.map_handle(dbusIf,map.width,map.height,Genivi.MAPVIEWER_MAIN_MAP); - showSurfaces(); - } + id: menu + + DBusIf { + id:dbusIf + } + + Timer { + id:move_timer + repeat:true + triggeredOnStart:false + property real lat; + property real lon; + property bool active; + onTriggered: { + if (active) { + var res=Genivi.mapviewercontrol_message(dbusIf, "GetTargetPoint", []); + if (res[0] == 'structure') { + res[1][1]+=lat; + res[1][3]+=lon; + Genivi.mapviewercontrol_message(dbusIf, "SetTargetPoint", res); + } + interval=50; + restart(); + } + } + } + + Timer { + id:camera_timer + repeat:true + triggeredOnStart:false + property bool active; + property string camera_value; + property real step; + property bool clamp; + property real clamp_value; + onTriggered: { + if (active) { + var res=Genivi.mapviewercontrol_message(dbusIf, "Get"+camera_value, []); + if (res[0] == 'double' || res[0] == 'int32' || res[0] == 'uint32') { + res[1]+=step; + if (clamp) { + if (step > 0 && res[1] > clamp_value) { + res[1]=clamp_value; + } + if (step < 0 && res[1] < clamp_value) { + res[1]=clamp_value; + } + } + Genivi.mapviewercontrol_message(dbusIf, "Set"+camera_value, res); + } + interval=50; + restart(); + } + } + } + + function showSurfaces() + { + Genivi.lm_message(dbusIf,"ServiceConnect",["uint32",dbusIf.pid()]); + Genivi.lm_message(dbusIf,"SetSurfaceDestinationRegion",["uint32",2000+Genivi.g_map_handle[1],"uint32",map.x,"uint32",map.y,"uint32",map.width,"uint32",map.height]); + Genivi.lm_message(dbusIf,"SetSurfaceSourceRegion",["uint32",2000+Genivi.g_map_handle[1],"uint32",0,"uint32",0,"uint32",map.width,"uint32",map.height]); + Genivi.lm_message(dbusIf,"SetSurfaceVisibility",["uint32",2000+Genivi.g_map_handle[1],"boolean",true]); + Genivi.lm_message(dbusIf,"CommitChanges",[]); + Genivi.lm_message(dbusIf,"ServiceDisconnect",["uint32",dbusIf.pid()]); + } + + function hideSurfaces() + { + Genivi.lm_message(dbusIf,"ServiceConnect",["uint32",dbusIf.pid()]); + Genivi.lm_message(dbusIf,"SetSurfaceVisibility",["uint32",2000+Genivi.g_map_handle[1],"boolean",false]); + Genivi.lm_message(dbusIf,"CommitChanges",[]); + Genivi.lm_message(dbusIf,"ServiceDisconnect",["uint32",dbusIf.pid()]); + } + + function move_start(lat, lon) + { + Genivi.mapviewercontrol_message(dbusIf, "SetFollowCarMode", ["boolean",false]); + move_timer.lat=lat/10000; + move_timer.lon=lon/10000; + move_timer.active=true; + move_timer.triggered(); + } + + function move_stop() + { + move_timer.active=false; + move_timer.stop(); + } + + function camera_start(camera_value, step) + { + camera_timer.camera_value=camera_value; + camera_timer.step=step; + camera_timer.active=true; + camera_timer.triggered(); + } + + function camera_start_clamp(camera_value, step, clampvalue) + { + camera_timer.clamp=true; + camera_timer.clamp_value=clampvalue; + camera_start(camera_value, step); + } + + function camera_stop() + { + camera_timer.active=false; + camera_timer.stop(); + camera_timer.clamp=false; + } + + function set_angle(angle) + { + Genivi.mapviewercontrol_message(dbusIf, "SetMapViewRotation", ["int32",angle,"int32",15]); + } + + function updateMapViewer() + { + var res=Genivi.mapviewercontrol_message(dbusIf,"GetMapViewPerspective",[]); + if (res[0] == "uint16") { + if (res[1] == Genivi.MAPVIEWER_2D) { + perspective.text=Genivi.gettext("CameraPerspective3d"); + } else { + perspective.text=Genivi.gettext("CameraPerspective2d"); + } + } else { + console.log("Unexpected result from GetMapViewPerspective:"); + Genivi.dump("",res); + } + var res=Genivi.mapviewercontrol_message(dbusIf,"GetDisplayedRoutes",[]); + if (res[0] == "array" && res[1] && res[1].length) { + split.disabled=false; + } else { + split.disabled=true; + } + if (Genivi.g_map_handle2) { + split.text=Genivi.gettext("Join"); + } else { + split.text=Genivi.gettext("Split"); + } + } + + function toggleDayNight() + { + var res=Genivi.mapviewercontrol_message(dbusIf, "GetMapViewTheme", []); + if (res[0] == "uint16" && res[1] == Genivi.MAPVIEWER_THEME_1) { + Genivi.mapviewercontrol_message(dbusIf,"SetMapViewTheme",["uint16",Genivi.MAPVIEWER_THEME_2]); + if (Genivi.g_map_handle2) { + Genivi.mapviewercontrol_message2(dbusIf,"SetMapViewTheme",["uint16",Genivi.MAPVIEWER_THEME_2]); + } + daynight.text=Genivi.gettext("Day"); + } else { + Genivi.mapviewercontrol_message(dbusIf,"SetMapViewTheme",["uint16",Genivi.MAPVIEWER_THEME_1]); + if (Genivi.g_map_handle2) { + Genivi.mapviewercontrol_message2(dbusIf,"SetMapViewTheme",["uint16",Genivi.MAPVIEWER_THEME_1]); + } + daynight.text=Genivi.gettext("Night"); + } + } + + function updateDayNight() + { + var res=Genivi.mapviewercontrol_message(dbusIf, "GetMapViewTheme", []); + if (res[0] == "uint16" && res[1] == Genivi.MAPVIEWER_THEME_1) { + daynight.text=Genivi.gettext("Night"); + } else { + daynight.text=Genivi.gettext("Day"); + } + } + + function togglePerspective() + { + if (perspective.text == Genivi.gettext("CameraPerspective2d")) { + Genivi.mapviewercontrol_message(dbusIf,"SetMapViewPerspective",["uint16",Genivi.MAPVIEWER_2D]); + } else { + Genivi.mapviewercontrol_message(dbusIf,"SetMapViewPerspective",["uint16",Genivi.MAPVIEWER_3D]); + } + updateMapViewer(); + } + + function toggleSplit() + { + hideSurfaces(); + var res=Genivi.mapviewercontrol_message(dbusIf,"GetDisplayedRoutes",[]); + var res3=Genivi.mapviewercontrol_message(dbusIf, "GetMapViewTheme", []); + if (split.text == Genivi.gettext("Split")) { + Genivi.map_handle_clear(dbusIf); + Genivi.map_handle2(dbusIf,map.width/2,map.height,Genivi.MAPVIEWER_MAIN_MAP); + Genivi.map_handle(dbusIf,map.width/2,map.height,Genivi.MAPVIEWER_MAIN_MAP); + if (res[0] == "array" && res[1] && res[1].length) { + var res2=Genivi.routing_message_get(dbusIf, "GetRouteBoundingBox", []); + if (res2[0] == "structure") { + Genivi.mapviewercontrol_message2(dbusIf, "SetMapViewBoundingBox", res2); + } else { + console.log("Unexpected result from GetRouteBoundingBox:"); + Genivi.dump("",res2); + } + } + if (res3[0] == "uint16") { + Genivi.mapviewercontrol_message(dbusIf, "SetMapViewTheme", res3); + Genivi.mapviewercontrol_message2(dbusIf, "SetMapViewTheme", res3); + } + Genivi.mapviewercontrol_message(dbusIf, "SetFollowCarMode", ["boolean",true]); + } else { + Genivi.map_handle_clear2(dbusIf); + Genivi.map_handle_clear(dbusIf); + Genivi.map_handle(dbusIf,map.width,map.height,Genivi.MAPVIEWER_MAIN_MAP); + if (res3[0] == "uint16") { + Genivi.mapviewercontrol_message(dbusIf, "SetMapViewTheme", res3); + } + Genivi.mapviewercontrol_message(dbusIf, "SetFollowCarMode", ["boolean",true]); + } + if (res[0] == "array" && res[1] && res[1].length) { + for (var i = 0 ; i < res[1].length ; i+=2) { + Genivi.mapviewercontrol_message(dbusIf, "DisplayRoute", res[1][i+1]); + if (split.text == Genivi.gettext("Split")) { + Genivi.mapviewercontrol_message2(dbusIf, "DisplayRoute", res[1][i+1]); + } + } + } + showSurfaces(); + updateMapViewer(); + } + + function disableSplit() + { + if (Genivi.g_map_handle2) { + toggleSplit(); + } + } + + Rectangle { + id:map + x:0 + y:0 + height:menu.height + width:menu.width + color:"#ffff7e" + Rectangle { + opacity: 0.8 + width: StyleSheetSettings.navigation_browse_map_settings_background[Constants.WIDTH] + height: StyleSheetSettings.navigation_browse_map_settings_background[Constants.HEIGHT] + x: Constants.MENU_CAMERA_SETTINGS_X + y: Constants.MENU_CAMERA_SETTINGS_Y + HMIBgImage { + id: content + image:StyleSheetSettings.navigation_browse_map_settings_background[Constants.SOURCE]; + anchors { fill: parent; topMargin: parent.headlineHeight} + + + Text { + x:StyleSheetSettings.tiltText[StyleSheetSettings.X]; y:StyleSheetSettings.tiltText[StyleSheetSettings.Y]; width:StyleSheetSettings.tiltText[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.tiltText[StyleSheetSettings.HEIGHT];color:StyleSheetSettings.tiltText[StyleSheetSettings.TEXTCOLOR];styleColor:StyleSheetSettings.tiltText[StyleSheetSettings.STYLECOLOR]; font.pixelSize:StyleSheetSettings.tiltText[StyleSheetSettings.PIXELSIZE]; + id:tiltText; + style: Text.Sunken; + smooth: true + text: Genivi.gettext("CameraTilt") + } + + StdButton {source:StyleSheetSettings.tiltp[Constants.SOURCE]; x:StyleSheetSettings.tiltp[StyleSheetSettings.X]; y:StyleSheetSettings.tiltp[StyleSheetSettings.Y]; width:StyleSheetSettings.tiltp[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.tiltp[StyleSheetSettings.HEIGHT]; + id:tiltp; explode:false; next:tiltm; prev:exit; + onPressed: {camera_start_clamp("CameraTiltAngle",-10,0);} + onReleased: {camera_stop();} + } + + StdButton {source:StyleSheetSettings.tiltm[Constants.SOURCE]; x:StyleSheetSettings.tiltm[StyleSheetSettings.X]; y:StyleSheetSettings.tiltm[StyleSheetSettings.Y]; width:StyleSheetSettings.tiltm[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.tiltm[StyleSheetSettings.HEIGHT]; + id:tiltm; explode:false; next:heightp; prev:tiltp; + onPressed: {camera_start_clamp("CameraTiltAngle",10,90);} + onReleased: {camera_stop();} + } + + Text { + x:StyleSheetSettings.heightText[StyleSheetSettings.X]; y:StyleSheetSettings.heightText[StyleSheetSettings.Y]; width:StyleSheetSettings.heightText[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.heightText[StyleSheetSettings.HEIGHT];color:StyleSheetSettings.heightText[StyleSheetSettings.TEXTCOLOR];styleColor:StyleSheetSettings.heightText[StyleSheetSettings.STYLECOLOR]; font.pixelSize:StyleSheetSettings.heightText[StyleSheetSettings.PIXELSIZE]; + id:heightText; + style: Text.Sunken; + smooth: true + text: Genivi.gettext("CameraHeight") + } + + StdButton {source:StyleSheetSettings.heightp[Constants.SOURCE]; x:StyleSheetSettings.heightp[StyleSheetSettings.X]; y:StyleSheetSettings.heightp[StyleSheetSettings.Y]; width:StyleSheetSettings.heightp[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.heightp[StyleSheetSettings.HEIGHT]; + id:heightp;explode:false; next:heightm; prev:tiltm; + onPressed: {camera_start("CameraHeight",10);} + onReleased: {camera_stop();} + } + + StdButton {source:StyleSheetSettings.heightm[Constants.SOURCE]; x:StyleSheetSettings.heightm[StyleSheetSettings.X]; y:StyleSheetSettings.heightm[StyleSheetSettings.Y]; width:StyleSheetSettings.heightm[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.heightm[StyleSheetSettings.HEIGHT]; + id:heightm; explode:false; next:distancep; prev:heightp; + onPressed: {camera_start("CameraHeight",-10);} + onReleased: {camera_stop();} + } + + Text { + x:StyleSheetSettings.distanceText[StyleSheetSettings.X]; y:StyleSheetSettings.distanceText[StyleSheetSettings.Y]; width:StyleSheetSettings.distanceText[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.distanceText[StyleSheetSettings.HEIGHT];color:StyleSheetSettings.distanceText[StyleSheetSettings.TEXTCOLOR];styleColor:StyleSheetSettings.distanceText[StyleSheetSettings.STYLECOLOR]; font.pixelSize:StyleSheetSettings.distanceText[StyleSheetSettings.PIXELSIZE]; + id:distanceText; + style: Text.Sunken; + smooth: true + text: Genivi.gettext("CameraDistance") + } + + StdButton {source:StyleSheetSettings.distancep[Constants.SOURCE]; x:StyleSheetSettings.distancep[StyleSheetSettings.X]; y:StyleSheetSettings.distancep[StyleSheetSettings.Y]; width:StyleSheetSettings.distancep[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.distancep[StyleSheetSettings.HEIGHT]; + id:distancep; explode:false; next:distancem; prev:heightm; + onPressed: {camera_start("CameraDistanceFromTargetPoint",10);} + onReleased: {camera_stop();} + } + + StdButton {source:StyleSheetSettings.distancem[Constants.SOURCE]; x:StyleSheetSettings.distancem[StyleSheetSettings.X]; y:StyleSheetSettings.distancem[StyleSheetSettings.Y]; width:StyleSheetSettings.distancem[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.distancem[StyleSheetSettings.HEIGHT]; + id:distancem; explode:false; next:north; prev:distancep; + onPressed: {camera_start("CameraDistanceFromTargetPoint",-10);} + onReleased: {camera_stop();} + } + + StdButton {source:StyleSheetSettings.north[Constants.SOURCE]; x:StyleSheetSettings.north[StyleSheetSettings.X]; y:StyleSheetSettings.north[StyleSheetSettings.Y]; width:StyleSheetSettings.north[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.north[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.northText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.northText[StyleSheetSettings.PIXELSIZE]; + id:north; text: Genivi.gettext("North"); explode:false; next:south; prev:distancem; + onClicked: { + set_angle(0); + } + } + + StdButton { source:StyleSheetSettings.south[Constants.SOURCE]; x:StyleSheetSettings.south[StyleSheetSettings.X]; y:StyleSheetSettings.south[StyleSheetSettings.Y]; width:StyleSheetSettings.south[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.south[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.southText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.southText[StyleSheetSettings.PIXELSIZE]; + id:south; text:Genivi.gettext("South"); explode:false; next:east; prev:north; + onClicked: { + set_angle(180); + } + } + + StdButton {source:StyleSheetSettings.east[Constants.SOURCE]; x:StyleSheetSettings.east[StyleSheetSettings.X]; y:StyleSheetSettings.east[StyleSheetSettings.Y]; width:StyleSheetSettings.east[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.east[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.eastText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.eastText[StyleSheetSettings.PIXELSIZE]; + id:east; text:Genivi.gettext("East"); explode:false; next:west; prev:south; + onClicked: { + set_angle(90); + } + } + + StdButton {source:StyleSheetSettings.west[Constants.SOURCE]; x:StyleSheetSettings.west[StyleSheetSettings.X]; y:StyleSheetSettings.west[StyleSheetSettings.Y]; width:StyleSheetSettings.west[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.west[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.westText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.westText[StyleSheetSettings.PIXELSIZE]; + id:west; text:Genivi.gettext("West"); explode:false; next:exit; prev:east; + onClicked: { + set_angle(270); + } + } + + StdButton {source:StyleSheetSettings.exit[Constants.SOURCE]; x:StyleSheetSettings.exit[StyleSheetSettings.X]; y:StyleSheetSettings.exit[StyleSheetSettings.Y]; width:StyleSheetSettings.exit[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.exit[StyleSheetSettings.HEIGHT]; + id:exit; explode:false; next:tiltp; prev:west; + onClicked: { + Genivi.data['show_current_position']=true; + move_stop(); + camera_stop(); + hideSurfaces(); + pageOpen("NavigationBrowseMap"); + } + } + StdButton {source:StyleSheetSettings.perspective[Constants.SOURCE]; x:StyleSheetSettings.perspective[StyleSheetSettings.X]; y:StyleSheetSettings.perspective[StyleSheetSettings.Y]; width:StyleSheetSettings.perspective[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.perspective[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.perspectiveText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.perspectiveText[StyleSheetSettings.PIXELSIZE]; + id:perspective; text:Genivi.gettext("CameraPerspective3d"); explode:false; next:split; prev:zoom_out; + onClicked: {togglePerspective();} + } + + StdButton {source:StyleSheetSettings.split[Constants.SOURCE]; x:StyleSheetSettings.split[StyleSheetSettings.X]; y:StyleSheetSettings.split[StyleSheetSettings.Y]; width:StyleSheetSettings.split[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.split[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.splitText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.splitText[StyleSheetSettings.PIXELSIZE]; + id:split; text:Genivi.gettext("Split"); explode:false; next:orientation; prev:perspective; + onClicked: {toggleSplit();} + } + + StdButton {source:StyleSheetSettings.daynight[Constants.SOURCE]; x:StyleSheetSettings.daynight[StyleSheetSettings.X]; y:StyleSheetSettings.daynight[StyleSheetSettings.Y]; width:StyleSheetSettings.daynight[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.daynight[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.daynightText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.daynightText[StyleSheetSettings.PIXELSIZE]; + id:daynight; text:Genivi.gettext("Day"); explode:false; next:up; prev:stop; + onClicked: { + toggleDayNight(); + } + } + + } + } + } + Component.onCompleted: { + Genivi.map_handle(dbusIf,menu.width,menu.height,Genivi.MAPVIEWER_MAIN_MAP); + showSurfaces(); + updateMapViewer(); + updateDayNight(); + } } diff --git a/src/hmi/qml/Core/gimp/README b/src/hmi/qml/Core/gimp/README index 3d85348..acd275d 100644 --- a/src/hmi/qml/Core/gimp/README +++ b/src/hmi/qml/Core/gimp/README @@ -2,13 +2,14 @@ How to generate a new style sheet (draft) NB: don't change the layer names of the xcf files Gimp version tested: 2.8 To load the script in python: +exit Gimp sudo cp generate-style-sheet.py /usr/lib/gimp/2.0/plug-ins sudo chmod +x /usr/lib/gimp/2.0/plug-ins/generate-style-sheet.py For the time being, there's no batch so you need to open each xcf file To generate a style sheet and the images: Genivi/Generate style sheet -Choose the target (qml/Core) +Choose the target (must be qml/Core) Press OK NB: No test banner by default, so, into style-constants.js the value is set to 0 var MENU_BANNER_HEIGHT = 0; diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/button-keyboard.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/button-keyboard.xcf Binary files differdeleted file mode 100644 index e65127e..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/button-keyboard.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/fsa-main-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/fsa-main-menu.xcf Binary files differdeleted file mode 100644 index aea8837..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/fsa-main-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/fsa-poi-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/fsa-poi-menu.xcf Binary files differdeleted file mode 100644 index 96e49ac..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/fsa-poi-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-calculated-route-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-calculated-route-menu.xcf Binary files differdeleted file mode 100644 index 171b03b..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-calculated-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-route-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-route-menu.xcf Binary files differdeleted file mode 100644 index 032771d..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-address-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-address-menu.xcf Binary files differdeleted file mode 100644 index b7179f5..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-address-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-coordinates-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-coordinates-menu.xcf Binary files differdeleted file mode 100644 index 1f2d1e6..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-coordinates-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-freetext-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-freetext-menu.xcf Binary files differdeleted file mode 100644 index 3ee4873..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-freetext-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-menu.xcf Binary files differdeleted file mode 100644 index 2d1e5a0..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-search-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-language-and-units-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-language-and-units-menu.xcf Binary files differdeleted file mode 100644 index 78195db..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-language-and-units-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-menu.xcf Binary files differdeleted file mode 100644 index 7c7bf3d..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-preference-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-preference-menu.xcf Binary files differdeleted file mode 100644 index c3bb09d..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/navigation-settings-preference-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/black-and-blue-theme/trip-computer-menu.xcf b/src/hmi/qml/Core/gimp/black-and-blue-theme/trip-computer-menu.xcf Binary files differdeleted file mode 100644 index dd1323d..0000000 --- a/src/hmi/qml/Core/gimp/black-and-blue-theme/trip-computer-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/button-keyboard.xcf b/src/hmi/qml/Core/gimp/default-theme/button-keyboard.xcf Binary files differdeleted file mode 100644 index 48087d0..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/button-keyboard.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/fsa-main-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/fsa-main-menu.xcf Binary files differdeleted file mode 100644 index 8dd50f3..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/fsa-main-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/fsa-poi-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/fsa-poi-menu.xcf Binary files differdeleted file mode 100644 index 51cb873..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/fsa-poi-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-calculated-route-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-calculated-route-menu.xcf Binary files differdeleted file mode 100644 index 3563b7c..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-calculated-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-route-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-route-menu.xcf Binary files differdeleted file mode 100644 index d6da7bd..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-route-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-search-address-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-search-address-menu.xcf Binary files differdeleted file mode 100644 index 22b1526..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-search-address-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-search-coordinates-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-search-coordinates-menu.xcf Binary files differdeleted file mode 100644 index bd09048..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-search-coordinates-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-search-freetext-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-search-freetext-menu.xcf Binary files differdeleted file mode 100644 index e5c91b4..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-search-freetext-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-search-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-search-menu.xcf Binary files differdeleted file mode 100644 index d557741..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-search-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-settings-language-and-units-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-settings-language-and-units-menu.xcf Binary files differdeleted file mode 100644 index da5429a..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-settings-language-and-units-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-settings-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-settings-menu.xcf Binary files differdeleted file mode 100644 index caa7dd3..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-settings-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/navigation-settings-preference-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/navigation-settings-preference-menu.xcf Binary files differdeleted file mode 100644 index 31e7ec1..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/navigation-settings-preference-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/default-theme/trip-computer-menu.xcf b/src/hmi/qml/Core/gimp/default-theme/trip-computer-menu.xcf Binary files differdeleted file mode 100644 index 9596481..0000000 --- a/src/hmi/qml/Core/gimp/default-theme/trip-computer-menu.xcf +++ /dev/null diff --git a/src/hmi/qml/Core/gimp/generate-style-sheet.py b/src/hmi/qml/Core/gimp/generate-style-sheet.py index 129c2d7..0b827a9 100644 --- a/src/hmi/qml/Core/gimp/generate-style-sheet.py +++ b/src/hmi/qml/Core/gimp/generate-style-sheet.py @@ -49,7 +49,7 @@ def get_js_header(): def generate_style_image_layer(layer):
layer_name=layer.name
return_list = []
- # format name for the object (replace - with _ )
+ # format name for the object (replace - with _ ), dash is prohibited in qml
object_name = string.replace(layer_name, '-', '_')
str = 'var '+object_name+'=new Object;'
return_list.append(str)
@@ -71,6 +71,8 @@ def generate_style_image_layer(layer): def generate_style_text_layer(layer):
object_name=layer.name
return_list = []
+ # format name for the object (replace - with _ ), dash is prohibited in qml
+ object_name = string.replace(object_name, '-', '_')
str = 'var '+object_name+'=new Object;'
return_list.append(str)
str = object_name+'[X]='+"%d"%layer.offsets[0]+';'
diff --git a/src/hmi/qml/Core/gimp/green-theme/browse-map.png b/src/hmi/qml/Core/gimp/green-theme/browse-map.png Binary files differnew file mode 100644 index 0000000..32325e0 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/browse-map.png diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-bottom.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-bottom.xcf Binary files differnew file mode 100755 index 0000000..5a60f47 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-bottom.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-guidance.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-guidance.xcf Binary files differnew file mode 100755 index 0000000..ebead8f --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-guidance.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-route.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-route.xcf Binary files differnew file mode 100755 index 0000000..dae5073 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-route.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-scroll.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-scroll.xcf Binary files differnew file mode 100755 index 0000000..86111fc --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-scroll.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-settings.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-settings.xcf Binary files differnew file mode 100755 index 0000000..941229c --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-settings.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-simulation.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-simulation.xcf Binary files differnew file mode 100755 index 0000000..57fd772 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-simulation.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-top.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-top.xcf Binary files differnew file mode 100644 index 0000000..dc2eb24 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-browse-map-top.xcf diff --git a/src/hmi/qml/Core/images/back.png b/src/hmi/qml/Core/images/back.png Binary files differindex faf7c77..3ff1076 100644 --- a/src/hmi/qml/Core/images/back.png +++ b/src/hmi/qml/Core/images/back.png diff --git a/src/hmi/qml/Core/images/daynight.png b/src/hmi/qml/Core/images/daynight.png Binary files differnew file mode 100644 index 0000000..b04dda1 --- /dev/null +++ b/src/hmi/qml/Core/images/daynight.png diff --git a/src/hmi/qml/Core/images/directiondestination.png b/src/hmi/qml/Core/images/directiondestination.png Binary files differnew file mode 100644 index 0000000..8504e0f --- /dev/null +++ b/src/hmi/qml/Core/images/directiondestination.png diff --git a/src/hmi/qml/Core/images/directionnorth.png b/src/hmi/qml/Core/images/directionnorth.png Binary files differnew file mode 100644 index 0000000..05931e1 --- /dev/null +++ b/src/hmi/qml/Core/images/directionnorth.png diff --git a/src/hmi/qml/Core/images/distancem.png b/src/hmi/qml/Core/images/distancem.png Binary files differnew file mode 100644 index 0000000..25f6a09 --- /dev/null +++ b/src/hmi/qml/Core/images/distancem.png diff --git a/src/hmi/qml/Core/images/distancep.png b/src/hmi/qml/Core/images/distancep.png Binary files differnew file mode 100644 index 0000000..5ff4e57 --- /dev/null +++ b/src/hmi/qml/Core/images/distancep.png diff --git a/src/hmi/qml/Core/images/east.png b/src/hmi/qml/Core/images/east.png Binary files differnew file mode 100644 index 0000000..c9d075c --- /dev/null +++ b/src/hmi/qml/Core/images/east.png diff --git a/src/hmi/qml/Core/images/exit.png b/src/hmi/qml/Core/images/exit.png Binary files differnew file mode 100644 index 0000000..85e7bb3 --- /dev/null +++ b/src/hmi/qml/Core/images/exit.png diff --git a/src/hmi/qml/Core/images/guidance-background.png b/src/hmi/qml/Core/images/guidance-background.png Binary files differnew file mode 100644 index 0000000..464adca --- /dev/null +++ b/src/hmi/qml/Core/images/guidance-background.png diff --git a/src/hmi/qml/Core/images/heightm.png b/src/hmi/qml/Core/images/heightm.png Binary files differnew file mode 100644 index 0000000..25f6a09 --- /dev/null +++ b/src/hmi/qml/Core/images/heightm.png diff --git a/src/hmi/qml/Core/images/heightp.png b/src/hmi/qml/Core/images/heightp.png Binary files differnew file mode 100644 index 0000000..5ff4e57 --- /dev/null +++ b/src/hmi/qml/Core/images/heightp.png diff --git a/src/hmi/qml/Core/images/languageAndUnit.png b/src/hmi/qml/Core/images/languageAndUnit.png Binary files differindex b0af847..3c3be36 100644 --- a/src/hmi/qml/Core/images/languageAndUnit.png +++ b/src/hmi/qml/Core/images/languageAndUnit.png diff --git a/src/hmi/qml/Core/images/menu.png b/src/hmi/qml/Core/images/menu.png Binary files differnew file mode 100644 index 0000000..e3f76d1 --- /dev/null +++ b/src/hmi/qml/Core/images/menu.png diff --git a/src/hmi/qml/Core/images/menub.png b/src/hmi/qml/Core/images/menub.png Binary files differnew file mode 100644 index 0000000..4ecc6ab --- /dev/null +++ b/src/hmi/qml/Core/images/menub.png diff --git a/src/hmi/qml/Core/images/navigation-browse-map-bottom-background.png b/src/hmi/qml/Core/images/navigation-browse-map-bottom-background.png Binary files differnew file mode 100644 index 0000000..3e8ffc1 --- /dev/null +++ b/src/hmi/qml/Core/images/navigation-browse-map-bottom-background.png diff --git a/src/hmi/qml/Core/images/navigation-browse-map-guidance-background.png b/src/hmi/qml/Core/images/navigation-browse-map-guidance-background.png Binary files differnew file mode 100644 index 0000000..d2dfde0 --- /dev/null +++ b/src/hmi/qml/Core/images/navigation-browse-map-guidance-background.png diff --git a/src/hmi/qml/Core/images/navigation-browse-map-route-background.png b/src/hmi/qml/Core/images/navigation-browse-map-route-background.png Binary files differnew file mode 100644 index 0000000..ff32016 --- /dev/null +++ b/src/hmi/qml/Core/images/navigation-browse-map-route-background.png diff --git a/src/hmi/qml/Core/images/navigation-browse-map-scroll-background.png b/src/hmi/qml/Core/images/navigation-browse-map-scroll-background.png Binary files differnew file mode 100644 index 0000000..28c9367 --- /dev/null +++ b/src/hmi/qml/Core/images/navigation-browse-map-scroll-background.png diff --git a/src/hmi/qml/Core/images/navigation-browse-map-settings-background.png b/src/hmi/qml/Core/images/navigation-browse-map-settings-background.png Binary files differnew file mode 100644 index 0000000..76e23ad --- /dev/null +++ b/src/hmi/qml/Core/images/navigation-browse-map-settings-background.png diff --git a/src/hmi/qml/Core/images/navigation-browse-map-simulation-background.png b/src/hmi/qml/Core/images/navigation-browse-map-simulation-background.png Binary files differnew file mode 100644 index 0000000..184fed6 --- /dev/null +++ b/src/hmi/qml/Core/images/navigation-browse-map-simulation-background.png diff --git a/src/hmi/qml/Core/images/navigation-browse-map-top-background.png b/src/hmi/qml/Core/images/navigation-browse-map-top-background.png Binary files differnew file mode 100644 index 0000000..f6f385b --- /dev/null +++ b/src/hmi/qml/Core/images/navigation-browse-map-top-background.png diff --git a/src/hmi/qml/Core/images/navigation-settings-background.png b/src/hmi/qml/Core/images/navigation-settings-background.png Binary files differindex cd49210..0c2dac7 100644 --- a/src/hmi/qml/Core/images/navigation-settings-background.png +++ b/src/hmi/qml/Core/images/navigation-settings-background.png diff --git a/src/hmi/qml/Core/images/north.png b/src/hmi/qml/Core/images/north.png Binary files differnew file mode 100644 index 0000000..c9d075c --- /dev/null +++ b/src/hmi/qml/Core/images/north.png diff --git a/src/hmi/qml/Core/images/orientation.png b/src/hmi/qml/Core/images/orientation.png Binary files differnew file mode 100644 index 0000000..7d44a4b --- /dev/null +++ b/src/hmi/qml/Core/images/orientation.png diff --git a/src/hmi/qml/Core/images/pause-popup.png b/src/hmi/qml/Core/images/pause-popup.png Binary files differnew file mode 100644 index 0000000..e1daf25 --- /dev/null +++ b/src/hmi/qml/Core/images/pause-popup.png diff --git a/src/hmi/qml/Core/images/pause.png b/src/hmi/qml/Core/images/pause.png Binary files differindex a7c5653..9fab0f8 100644 --- a/src/hmi/qml/Core/images/pause.png +++ b/src/hmi/qml/Core/images/pause.png diff --git a/src/hmi/qml/Core/images/perspective.png b/src/hmi/qml/Core/images/perspective.png Binary files differnew file mode 100644 index 0000000..b04dda1 --- /dev/null +++ b/src/hmi/qml/Core/images/perspective.png diff --git a/src/hmi/qml/Core/images/play-popup.png b/src/hmi/qml/Core/images/play-popup.png Binary files differnew file mode 100644 index 0000000..e33d876 --- /dev/null +++ b/src/hmi/qml/Core/images/play-popup.png diff --git a/src/hmi/qml/Core/images/play.png b/src/hmi/qml/Core/images/play.png Binary files differindex 9d227bf..b27fe64 100644 --- a/src/hmi/qml/Core/images/play.png +++ b/src/hmi/qml/Core/images/play.png diff --git a/src/hmi/qml/Core/images/preferences.png b/src/hmi/qml/Core/images/preferences.png Binary files differindex b0af847..e01a764 100644 --- a/src/hmi/qml/Core/images/preferences.png +++ b/src/hmi/qml/Core/images/preferences.png diff --git a/src/hmi/qml/Core/images/scrolldown.png b/src/hmi/qml/Core/images/scrolldown.png Binary files differnew file mode 100644 index 0000000..5fac58f --- /dev/null +++ b/src/hmi/qml/Core/images/scrolldown.png diff --git a/src/hmi/qml/Core/images/scrollleft.png b/src/hmi/qml/Core/images/scrollleft.png Binary files differnew file mode 100644 index 0000000..417e66f --- /dev/null +++ b/src/hmi/qml/Core/images/scrollleft.png diff --git a/src/hmi/qml/Core/images/scrollright.png b/src/hmi/qml/Core/images/scrollright.png Binary files differnew file mode 100644 index 0000000..0519580 --- /dev/null +++ b/src/hmi/qml/Core/images/scrollright.png diff --git a/src/hmi/qml/Core/images/scrollup.png b/src/hmi/qml/Core/images/scrollup.png Binary files differnew file mode 100644 index 0000000..9717cda --- /dev/null +++ b/src/hmi/qml/Core/images/scrollup.png diff --git a/src/hmi/qml/Core/images/select-search-for-refill-in-top.png b/src/hmi/qml/Core/images/select-search-for-refill-in-top.png Binary files differnew file mode 100644 index 0000000..4da7639 --- /dev/null +++ b/src/hmi/qml/Core/images/select-search-for-refill-in-top.png diff --git a/src/hmi/qml/Core/images/settings.png b/src/hmi/qml/Core/images/settings.png Binary files differnew file mode 100644 index 0000000..8b0b4e5 --- /dev/null +++ b/src/hmi/qml/Core/images/settings.png diff --git a/src/hmi/qml/Core/images/simulation-off-popup.png b/src/hmi/qml/Core/images/simulation-off-popup.png Binary files differnew file mode 100644 index 0000000..7b10b02 --- /dev/null +++ b/src/hmi/qml/Core/images/simulation-off-popup.png diff --git a/src/hmi/qml/Core/images/simulation-off.png b/src/hmi/qml/Core/images/simulation-off.png Binary files differindex 33bd368..d30ecf2 100644 --- a/src/hmi/qml/Core/images/simulation-off.png +++ b/src/hmi/qml/Core/images/simulation-off.png diff --git a/src/hmi/qml/Core/images/simulation-on-popup.png b/src/hmi/qml/Core/images/simulation-on-popup.png Binary files differnew file mode 100644 index 0000000..53ccc86 --- /dev/null +++ b/src/hmi/qml/Core/images/simulation-on-popup.png diff --git a/src/hmi/qml/Core/images/simulation-on.png b/src/hmi/qml/Core/images/simulation-on.png Binary files differindex c5dfe3b..3d57a77 100644 --- a/src/hmi/qml/Core/images/simulation-on.png +++ b/src/hmi/qml/Core/images/simulation-on.png diff --git a/src/hmi/qml/Core/images/south.png b/src/hmi/qml/Core/images/south.png Binary files differnew file mode 100644 index 0000000..c9d075c --- /dev/null +++ b/src/hmi/qml/Core/images/south.png diff --git a/src/hmi/qml/Core/images/speed-down-popup.png b/src/hmi/qml/Core/images/speed-down-popup.png Binary files differnew file mode 100644 index 0000000..b271ede --- /dev/null +++ b/src/hmi/qml/Core/images/speed-down-popup.png diff --git a/src/hmi/qml/Core/images/speed-down.png b/src/hmi/qml/Core/images/speed-down.png Binary files differindex 9c40613..8bf676f 100644 --- a/src/hmi/qml/Core/images/speed-down.png +++ b/src/hmi/qml/Core/images/speed-down.png diff --git a/src/hmi/qml/Core/images/speed-up-popup.png b/src/hmi/qml/Core/images/speed-up-popup.png Binary files differnew file mode 100644 index 0000000..e7c8db9 --- /dev/null +++ b/src/hmi/qml/Core/images/speed-up-popup.png diff --git a/src/hmi/qml/Core/images/speed-up.png b/src/hmi/qml/Core/images/speed-up.png Binary files differindex 6de91ff..3a740a2 100644 --- a/src/hmi/qml/Core/images/speed-up.png +++ b/src/hmi/qml/Core/images/speed-up.png diff --git a/src/hmi/qml/Core/images/split.png b/src/hmi/qml/Core/images/split.png Binary files differnew file mode 100644 index 0000000..b04dda1 --- /dev/null +++ b/src/hmi/qml/Core/images/split.png diff --git a/src/hmi/qml/Core/images/tiltm.png b/src/hmi/qml/Core/images/tiltm.png Binary files differnew file mode 100644 index 0000000..66ac4e2 --- /dev/null +++ b/src/hmi/qml/Core/images/tiltm.png diff --git a/src/hmi/qml/Core/images/tiltp.png b/src/hmi/qml/Core/images/tiltp.png Binary files differnew file mode 100644 index 0000000..f21458d --- /dev/null +++ b/src/hmi/qml/Core/images/tiltp.png diff --git a/src/hmi/qml/Core/images/west.png b/src/hmi/qml/Core/images/west.png Binary files differnew file mode 100644 index 0000000..c9d075c --- /dev/null +++ b/src/hmi/qml/Core/images/west.png diff --git a/src/hmi/qml/Core/images/zoomin.png b/src/hmi/qml/Core/images/zoomin.png Binary files differnew file mode 100644 index 0000000..785f16e --- /dev/null +++ b/src/hmi/qml/Core/images/zoomin.png diff --git a/src/hmi/qml/Core/images/zoomout.png b/src/hmi/qml/Core/images/zoomout.png Binary files differnew file mode 100644 index 0000000..7354f1c --- /dev/null +++ b/src/hmi/qml/Core/images/zoomout.png diff --git a/src/hmi/qml/Core/style-sheets/navigation-browse-map-bottom-css.js b/src/hmi/qml/Core/style-sheets/navigation-browse-map-bottom-css.js new file mode 100644 index 0000000..fe5cbdc --- /dev/null +++ b/src/hmi/qml/Core/style-sheets/navigation-browse-map-bottom-css.js @@ -0,0 +1,80 @@ +/* This file is generated */ +.pragma library +Qt.include("style-constants.js"); + +var zoomout=new Object; +zoomout[SOURCE]="Core/images/zoomout.png"; +zoomout[X]=610; +zoomout[Y]=29; +zoomout[WIDTH]=17; +zoomout[HEIGHT]=17; + +var zoomin=new Object; +zoomin[SOURCE]="Core/images/zoomin.png"; +zoomin[X]=680; +zoomin[Y]=29; +zoomin[WIDTH]=17; +zoomin[HEIGHT]=17; + +var zoomlevel=new Object; +zoomlevel[X]=643; +zoomlevel[Y]=25; +zoomlevel[WIDTH]=13; +zoomlevel[HEIGHT]=24; +zoomlevel[TEXTCOLOR]=Qt.rgba(0.00, 0.38, 0.35, 1.00); +zoomlevel[STYLECOLOR]=Qt.rgba(0.00, 0.38, 0.35, 1.00); +zoomlevel[PIXELSIZE]=20; + +var menubText=new Object; +menubText[X]=13; +menubText[Y]=16; +menubText[WIDTH]=112; +menubText[HEIGHT]=46; +menubText[TEXTCOLOR]=Qt.rgba(0.00, 0.63, 0.56, 1.00); +menubText[STYLECOLOR]=Qt.rgba(0.00, 0.63, 0.56, 1.00); +menubText[PIXELSIZE]=38; + +var menub=new Object; +menub[SOURCE]="Core/images/menub.png"; +menub[X]=10; +menub[Y]=10; +menub[WIDTH]=120; +menub[HEIGHT]=60; + +var currentroad=new Object; +currentroad[X]=243; +currentroad[Y]=18; +currentroad[WIDTH]=332; +currentroad[HEIGHT]=41; +currentroad[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +currentroad[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +currentroad[PIXELSIZE]=34; + +var directiondestination=new Object; +directiondestination[SOURCE]="Core/images/directiondestination.png"; +directiondestination[X]=142; +directiondestination[Y]=10; +directiondestination[WIDTH]=67; +directiondestination[HEIGHT]=60; + +var directionnorth=new Object; +directionnorth[SOURCE]="Core/images/directionnorth.png"; +directionnorth[X]=142; +directionnorth[Y]=10; +directionnorth[WIDTH]=67; +directionnorth[HEIGHT]=60; + +var settings=new Object; +settings[SOURCE]="Core/images/settings.png"; +settings[X]=728; +settings[Y]=10; +settings[WIDTH]=67; +settings[HEIGHT]=60; + +var navigation_browse_map_bottom_background=new Object; +navigation_browse_map_bottom_background[SOURCE]="Core/images/navigation-browse-map-bottom-background.png"; +navigation_browse_map_bottom_background[X]=0; +navigation_browse_map_bottom_background[Y]=0; +navigation_browse_map_bottom_background[WIDTH]=800; +navigation_browse_map_bottom_background[HEIGHT]=80; + diff --git a/src/hmi/qml/Core/style-sheets/navigation-browse-map-guidance-css.js b/src/hmi/qml/Core/style-sheets/navigation-browse-map-guidance-css.js new file mode 100644 index 0000000..220a0dd --- /dev/null +++ b/src/hmi/qml/Core/style-sheets/navigation-browse-map-guidance-css.js @@ -0,0 +1,47 @@ +/* This file is generated */ +.pragma library +Qt.include("style-constants.js"); + +var maneuverValue=new Object; +maneuverValue[X]=3; +maneuverValue[Y]=3; +maneuverValue[WIDTH]=118; +maneuverValue[HEIGHT]=22; +maneuverValue[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +maneuverValue[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +maneuverValue[PIXELSIZE]=18; + +var maneuverAdvice=new Object; +maneuverAdvice[X]=6; +maneuverAdvice[Y]=82; +maneuverAdvice[WIDTH]=59; +maneuverAdvice[HEIGHT]=22; +maneuverAdvice[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +maneuverAdvice[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +maneuverAdvice[PIXELSIZE]=18; + +var distancetomaneuverValue=new Object; +distancetomaneuverValue[X]=4; +distancetomaneuverValue[Y]=26; +distancetomaneuverValue[WIDTH]=78; +distancetomaneuverValue[HEIGHT]=24; +distancetomaneuverValue[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +distancetomaneuverValue[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +distancetomaneuverValue[PIXELSIZE]=20; + +var roadaftermaneuverValue=new Object; +roadaftermaneuverValue[X]=3; +roadaftermaneuverValue[Y]=54; +roadaftermaneuverValue[WIDTH]=146; +roadaftermaneuverValue[HEIGHT]=22; +roadaftermaneuverValue[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +roadaftermaneuverValue[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +roadaftermaneuverValue[PIXELSIZE]=18; + +var navigation_browse_map_guidance_background=new Object; +navigation_browse_map_guidance_background[SOURCE]="Core/images/navigation-browse-map-guidance-background.png"; +navigation_browse_map_guidance_background[X]=0; +navigation_browse_map_guidance_background[Y]=0; +navigation_browse_map_guidance_background[WIDTH]=200; +navigation_browse_map_guidance_background[HEIGHT]=110; + diff --git a/src/hmi/qml/Core/style-sheets/navigation-browse-map-route-css.js b/src/hmi/qml/Core/style-sheets/navigation-browse-map-route-css.js new file mode 100644 index 0000000..0bd1628 --- /dev/null +++ b/src/hmi/qml/Core/style-sheets/navigation-browse-map-route-css.js @@ -0,0 +1,29 @@ +/* This file is generated */ +.pragma library +Qt.include("style-constants.js"); + +var distancetodestinationValue=new Object; +distancetodestinationValue[X]=7; +distancetodestinationValue[Y]=105; +distancetodestinationValue[WIDTH]=84; +distancetodestinationValue[HEIGHT]=27; +distancetodestinationValue[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +distancetodestinationValue[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +distancetodestinationValue[PIXELSIZE]=22; + +var timetodestinationValue=new Object; +timetodestinationValue[X]=2; +timetodestinationValue[Y]=70; +timetodestinationValue[WIDTH]=90; +timetodestinationValue[HEIGHT]=27; +timetodestinationValue[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +timetodestinationValue[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +timetodestinationValue[PIXELSIZE]=22; + +var navigation_browse_map_route_background=new Object; +navigation_browse_map_route_background[SOURCE]="Core/images/navigation-browse-map-route-background.png"; +navigation_browse_map_route_background[X]=0; +navigation_browse_map_route_background[Y]=0; +navigation_browse_map_route_background[WIDTH]=94; +navigation_browse_map_route_background[HEIGHT]=140; + diff --git a/src/hmi/qml/Core/style-sheets/navigation-browse-map-scroll-css.js b/src/hmi/qml/Core/style-sheets/navigation-browse-map-scroll-css.js new file mode 100644 index 0000000..e173fc4 --- /dev/null +++ b/src/hmi/qml/Core/style-sheets/navigation-browse-map-scroll-css.js @@ -0,0 +1,39 @@ +/* This file is generated */ +.pragma library +Qt.include("style-constants.js"); + +var scrollup=new Object; +scrollup[SOURCE]="Core/images/scrollup.png"; +scrollup[X]=27; +scrollup[Y]=1; +scrollup[WIDTH]=29; +scrollup[HEIGHT]=22; + +var scrolldown=new Object; +scrolldown[SOURCE]="Core/images/scrolldown.png"; +scrolldown[X]=26; +scrolldown[Y]=62; +scrolldown[WIDTH]=30; +scrolldown[HEIGHT]=22; + +var scrollleft=new Object; +scrollleft[SOURCE]="Core/images/scrollleft.png"; +scrollleft[X]=0; +scrollleft[Y]=29; +scrollleft[WIDTH]=22; +scrollleft[HEIGHT]=29; + +var scrollright=new Object; +scrollright[SOURCE]="Core/images/scrollright.png"; +scrollright[X]=61; +scrollright[Y]=28; +scrollright[WIDTH]=22; +scrollright[HEIGHT]=30; + +var navigation_browse_map_scroll_background=new Object; +navigation_browse_map_scroll_background[SOURCE]="Core/images/navigation-browse-map-scroll-background.png"; +navigation_browse_map_scroll_background[X]=0; +navigation_browse_map_scroll_background[Y]=0; +navigation_browse_map_scroll_background[WIDTH]=84; +navigation_browse_map_scroll_background[HEIGHT]=84; + diff --git a/src/hmi/qml/Core/style-sheets/navigation-browse-map-settings-css.js b/src/hmi/qml/Core/style-sheets/navigation-browse-map-settings-css.js new file mode 100644 index 0000000..917e30e --- /dev/null +++ b/src/hmi/qml/Core/style-sheets/navigation-browse-map-settings-css.js @@ -0,0 +1,199 @@ +/* This file is generated */ +.pragma library +Qt.include("style-constants.js"); + +var northText=new Object; +northText[X]=85; +northText[Y]=19; +northText[WIDTH]=18; +northText[HEIGHT]=29; +northText[TEXTCOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +northText[STYLECOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +northText[PIXELSIZE]=24; + +var north=new Object; +north[SOURCE]="Core/images/north.png"; +north[X]=76; +north[Y]=17; +north[WIDTH]=34; +north[HEIGHT]=34; + +var westText=new Object; +westText[X]=42; +westText[Y]=57; +westText[WIDTH]=24; +westText[HEIGHT]=29; +westText[TEXTCOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +westText[STYLECOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +westText[PIXELSIZE]=24; + +var west=new Object; +west[SOURCE]="Core/images/west.png"; +west[X]=37; +west[Y]=54; +west[WIDTH]=34; +west[HEIGHT]=34; + +var southText=new Object; +southText[X]=85; +southText[Y]=91; +southText[WIDTH]=16; +southText[HEIGHT]=29; +southText[TEXTCOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +southText[STYLECOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +southText[PIXELSIZE]=24; + +var south=new Object; +south[SOURCE]="Core/images/south.png"; +south[X]=76; +south[Y]=90; +south[WIDTH]=34; +south[HEIGHT]=34; + +var eastText=new Object; +eastText[X]=125; +eastText[Y]=57; +eastText[WIDTH]=15; +eastText[HEIGHT]=29; +eastText[TEXTCOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +eastText[STYLECOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +eastText[PIXELSIZE]=24; + +var east=new Object; +east[SOURCE]="Core/images/east.png"; +east[X]=115; +east[Y]=55; +east[WIDTH]=34; +east[HEIGHT]=34; + +var splitText=new Object; +splitText[X]=22; +splitText[Y]=153; +splitText[WIDTH]=31; +splitText[HEIGHT]=29; +splitText[TEXTCOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +splitText[STYLECOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +splitText[PIXELSIZE]=24; + +var split=new Object; +split[SOURCE]="Core/images/split.png"; +split[X]=20; +split[Y]=152; +split[WIDTH]=34; +split[HEIGHT]=34; + +var daynightText=new Object; +daynightText[X]=137; +daynightText[Y]=155; +daynightText[WIDTH]=24; +daynightText[HEIGHT]=29; +daynightText[TEXTCOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +daynightText[STYLECOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +daynightText[PIXELSIZE]=24; + +var daynight=new Object; +daynight[SOURCE]="Core/images/daynight.png"; +daynight[X]=131; +daynight[Y]=152; +daynight[WIDTH]=34; +daynight[HEIGHT]=34; + +var perspectiveText=new Object; +perspectiveText[X]=77; +perspectiveText[Y]=154; +perspectiveText[WIDTH]=30; +perspectiveText[HEIGHT]=29; +perspectiveText[TEXTCOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +perspectiveText[STYLECOLOR]=Qt.rgba(0.00, 0.00, 0.00, 1.00); +perspectiveText[PIXELSIZE]=24; + +var perspective=new Object; +perspective[SOURCE]="Core/images/perspective.png"; +perspective[X]=76; +perspective[Y]=152; +perspective[WIDTH]=34; +perspective[HEIGHT]=34; + +var tiltText=new Object; +tiltText[X]=229; +tiltText[Y]=23; +tiltText[WIDTH]=32; +tiltText[HEIGHT]=24; +tiltText[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +tiltText[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +tiltText[PIXELSIZE]=20; + +var tiltp=new Object; +tiltp[SOURCE]="Core/images/tiltp.png"; +tiltp[X]=271; +tiltp[Y]=17; +tiltp[WIDTH]=17; +tiltp[HEIGHT]=17; + +var tiltm=new Object; +tiltm[SOURCE]="Core/images/tiltm.png"; +tiltm[X]=271; +tiltm[Y]=44; +tiltm[WIDTH]=17; +tiltm[HEIGHT]=17; + +var heightText=new Object; +heightText[X]=197; +heightText[Y]=87; +heightText[WIDTH]=66; +heightText[HEIGHT]=24; +heightText[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +heightText[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +heightText[PIXELSIZE]=20; + +var heightp=new Object; +heightp[SOURCE]="Core/images/heightp.png"; +heightp[X]=271; +heightp[Y]=79; +heightp[WIDTH]=17; +heightp[HEIGHT]=17; + +var heightm=new Object; +heightm[SOURCE]="Core/images/heightm.png"; +heightm[X]=271; +heightm[Y]=107; +heightm[WIDTH]=17; +heightm[HEIGHT]=17; + +var distanceText=new Object; +distanceText[X]=224; +distanceText[Y]=147; +distanceText[WIDTH]=39; +distanceText[HEIGHT]=24; +distanceText[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +distanceText[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +distanceText[PIXELSIZE]=20; + +var distancep=new Object; +distancep[SOURCE]="Core/images/distancep.png"; +distancep[X]=271; +distancep[Y]=141; +distancep[WIDTH]=17; +distancep[HEIGHT]=17; + +var distancem=new Object; +distancem[SOURCE]="Core/images/distancem.png"; +distancem[X]=271; +distancem[Y]=169; +distancem[WIDTH]=17; +distancem[HEIGHT]=17; + +var exit=new Object; +exit[SOURCE]="Core/images/exit.png"; +exit[X]=3; +exit[Y]=3; +exit[WIDTH]=17; +exit[HEIGHT]=17; + +var navigation_browse_map_settings_background=new Object; +navigation_browse_map_settings_background[SOURCE]="Core/images/navigation-browse-map-settings-background.png"; +navigation_browse_map_settings_background[X]=0; +navigation_browse_map_settings_background[Y]=0; +navigation_browse_map_settings_background[WIDTH]=300; +navigation_browse_map_settings_background[HEIGHT]=200; + diff --git a/src/hmi/qml/Core/style-sheets/navigation-browse-map-simulation-css.js b/src/hmi/qml/Core/style-sheets/navigation-browse-map-simulation-css.js new file mode 100644 index 0000000..a1317fd --- /dev/null +++ b/src/hmi/qml/Core/style-sheets/navigation-browse-map-simulation-css.js @@ -0,0 +1,62 @@ +/* This file is generated */ +.pragma library +Qt.include("style-constants.js"); + +var simulation_off_popup=new Object; +simulation_off_popup[SOURCE]="Core/images/simulation-off-popup.png"; +simulation_off_popup[X]=100; +simulation_off_popup[Y]=2; +simulation_off_popup[WIDTH]=72; +simulation_off_popup[HEIGHT]=42; + +var simulation_on_popup=new Object; +simulation_on_popup[SOURCE]="Core/images/simulation-on-popup.png"; +simulation_on_popup[X]=100; +simulation_on_popup[Y]=2; +simulation_on_popup[WIDTH]=72; +simulation_on_popup[HEIGHT]=42; + +var speedValue_popup=new Object; +speedValue_popup[X]=40; +speedValue_popup[Y]=3; +speedValue_popup[WIDTH]=23; +speedValue_popup[HEIGHT]=39; +speedValue_popup[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +speedValue_popup[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +speedValue_popup[PIXELSIZE]=33; + +var speed_up_popup=new Object; +speed_up_popup[SOURCE]="Core/images/speed-up-popup.png"; +speed_up_popup[X]=69; +speed_up_popup[Y]=4; +speed_up_popup[WIDTH]=29; +speed_up_popup[HEIGHT]=33; + +var speed_down_popup=new Object; +speed_down_popup[SOURCE]="Core/images/speed-down-popup.png"; +speed_down_popup[X]=2; +speed_down_popup[Y]=4; +speed_down_popup[WIDTH]=29; +speed_down_popup[HEIGHT]=33; + +var play_popup=new Object; +play_popup[SOURCE]="Core/images/play-popup.png"; +play_popup[X]=176; +play_popup[Y]=2; +play_popup[WIDTH]=72; +play_popup[HEIGHT]=42; + +var pause_popup=new Object; +pause_popup[SOURCE]="Core/images/pause-popup.png"; +pause_popup[X]=176; +pause_popup[Y]=2; +pause_popup[WIDTH]=72; +pause_popup[HEIGHT]=42; + +var navigation_browse_map_simulation_background=new Object; +navigation_browse_map_simulation_background[SOURCE]="Core/images/navigation-browse-map-simulation-background.png"; +navigation_browse_map_simulation_background[X]=0; +navigation_browse_map_simulation_background[Y]=0; +navigation_browse_map_simulation_background[WIDTH]=250; +navigation_browse_map_simulation_background[HEIGHT]=46; + diff --git a/src/hmi/qml/Core/style-sheets/navigation-browse-map-top-css.js b/src/hmi/qml/Core/style-sheets/navigation-browse-map-top-css.js new file mode 100644 index 0000000..1f06989 --- /dev/null +++ b/src/hmi/qml/Core/style-sheets/navigation-browse-map-top-css.js @@ -0,0 +1,45 @@ +/* This file is generated */ +.pragma library +Qt.include("style-constants.js"); + +var select_search_for_refill_in_top=new Object; +select_search_for_refill_in_top[SOURCE]="Core/images/select-search-for-refill-in-top.png"; +select_search_for_refill_in_top[X]=350; +select_search_for_refill_in_top[Y]=10; +select_search_for_refill_in_top[WIDTH]=100; +select_search_for_refill_in_top[HEIGHT]=60; + +var speedValue=new Object; +speedValue[X]=670; +speedValue[Y]=26; +speedValue[WIDTH]=32; +speedValue[HEIGHT]=30; +speedValue[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +speedValue[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +speedValue[PIXELSIZE]=25; + +var speedUnit=new Object; +speedUnit[X]=717; +speedUnit[Y]=26; +speedUnit[WIDTH]=62; +speedUnit[HEIGHT]=30; +speedUnit[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +speedUnit[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +speedUnit[PIXELSIZE]=25; + +var fsamessageText=new Object; +fsamessageText[X]=20; +fsamessageText[Y]=24; +fsamessageText[WIDTH]=300; +fsamessageText[HEIGHT]=30; +fsamessageText[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +fsamessageText[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); +fsamessageText[PIXELSIZE]=25; + +var navigation_browse_map_top_background=new Object; +navigation_browse_map_top_background[SOURCE]="Core/images/navigation-browse-map-top-background.png"; +navigation_browse_map_top_background[X]=0; +navigation_browse_map_top_background[Y]=0; +navigation_browse_map_top_background[WIDTH]=800; +navigation_browse_map_top_background[HEIGHT]=80; + diff --git a/src/hmi/qml/Core/style-sheets/navigation-settings-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-settings-menu-css.js index a0a7bce..c4d24c0 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-settings-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-settings-menu-css.js @@ -28,8 +28,8 @@ simulationTitle[PIXELSIZE]=25; var speedValue=new Object; speedValue[X]=106; speedValue[Y]=130; -speedValue[WIDTH]=30; -speedValue[HEIGHT]=53; +speedValue[WIDTH]=29; +speedValue[HEIGHT]=52; speedValue[TEXTCOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); speedValue[STYLECOLOR]=Qt.rgba(1.00, 1.00, 1.00, 1.00); speedValue[PIXELSIZE]=44; diff --git a/src/hmi/qml/Core/style-sheets/style-constants.js b/src/hmi/qml/Core/style-sheets/style-constants.js index 3f92a71..7fa1eb3 100644 --- a/src/hmi/qml/Core/style-sheets/style-constants.js +++ b/src/hmi/qml/Core/style-sheets/style-constants.js @@ -38,7 +38,18 @@ var MENU_WIDTH = 800; //var MENU_BANNER_HEIGHT = 26; var MENU_BANNER_HEIGHT = 0; var MENU_BACKGROUND_COLOR = Qt.rgba(0.070588,0.109803, 0.105882,1); -var MENU_BROWSE_MAP_TEXT_PIXEL_SIZE = 14 -var MENU_BROWSE_MAP_TEXT_PIXEL_COLOR = Qt.rgba(0,0,0,1); var MENU_ROUTE_DESCRIPTION_TEXT_PIXEL_SIZE = 14 - +var MENU_CAMERA_SETTINGS_X = 250 +var MENU_CAMERA_SETTINGS_Y = 140 +var MENU_BROWSE_MAP_BOTTOM_X = 0 +var MENU_BROWSE_MAP_BOTTOM_Y = 400 +var MENU_BROWSE_MAP_TOP_X = 0 +var MENU_BROWSE_MAP_TOP_Y = 0 +var MENU_BROWSE_MAP_ROUTE_X = 694 +var MENU_BROWSE_MAP_ROUTE_Y = 140 +var MENU_BROWSE_MAP_GUIDANCE_X = 10 +var MENU_BROWSE_MAP_GUIDANCE_Y = 184 +var MENU_BROWSE_MAP_SCROLL_X = 700 +var MENU_BROWSE_MAP_SCROLL_Y = 300 +var MENU_BROWSE_MAP_SIMULATION_X = 10 +var MENU_BROWSE_MAP_SIMULATION_Y = 340 diff --git a/src/hmi/qml/Core/translations/deu_DEU.js b/src/hmi/qml/Core/translations/deu_DEU.js index ec4ddd0..d4f9620 100644 --- a/src/hmi/qml/Core/translations/deu_DEU.js +++ b/src/hmi/qml/Core/translations/deu_DEU.js @@ -107,15 +107,24 @@ translations["Entry"]="ENTRY"; //NavigationBrowseMap translations["NavigationBrowseMap"]="BROWSE MAP"; translations["NavigationCurrentStreet"]="CURRENT STREET"; -translations["Night"]="NIGHT"; -translations["Day"]="DAY"; -translations["North"]="NORTH"; -translations["South"]="SOUTH"; -translations["East"]="EAST"; -translations["West"]="WEST"; -translations["CameraTilt"]="TILT"; -translations["CameraHeight"]="HEIGHT"; -translations["CameraDistance"]="DISTANCE"; +translations["FSAWarning"]="Destination not reached"; +translations["NoGuidance"]="No guidance"; +translations["NoManeuver"]="No maneuver"; + +//CameraSettings +translations["North"]="N"; +translations["South"]="S"; +translations["East"]="O"; +translations["West"]="W"; +translations["CameraTilt"]="Tilt"; +translations["CameraHeight"]="Height"; +translations["CameraDistance"]="Dist"; +translations["CameraPerspective3d"]="3d"; +translations["CameraPerspective2d"]="2d"; +translations["Split"]="Sp"; +translations["Join"]="Jo"; +translations["Day"]="Da"; +translations["Night"]="Ni"; //NavigationManeuversList translations["NavigationManeuversList"]="MANEUVER LIST"; @@ -143,5 +152,6 @@ translations["Ok"]="OK"; translations["On"]="ON"; translations["Off"]="OFF"; translations["Back"]="BACK"; +translations["Menu"]="MENU"; translations["Quit"]="QUIT"; diff --git a/src/hmi/qml/Core/translations/eng_USA.js b/src/hmi/qml/Core/translations/eng_USA.js index f6f2744..e6e6c81 100644 --- a/src/hmi/qml/Core/translations/eng_USA.js +++ b/src/hmi/qml/Core/translations/eng_USA.js @@ -107,15 +107,24 @@ translations["Entry"]="ENTRY"; //NavigationBrowseMap translations["NavigationBrowseMap"]="BROWSE MAP"; translations["NavigationCurrentStreet"]="CURRENT STREET"; -translations["Night"]="NIGHT"; -translations["Day"]="DAY"; -translations["North"]="NORTH"; -translations["South"]="SOUTH"; -translations["East"]="EAST"; -translations["West"]="WEST"; -translations["CameraTilt"]="TILT"; -translations["CameraHeight"]="HEIGHT"; -translations["CameraDistance"]="DISTANCE"; +translations["FSAWarning"]="Destination not reached"; +translations["NoGuidance"]="No guidance"; +translations["NoManeuver"]="No maneuver"; + +//CameraSettings +translations["North"]="N"; +translations["South"]="S"; +translations["East"]="E"; +translations["West"]="W"; +translations["CameraTilt"]="Tilt"; +translations["CameraHeight"]="Height"; +translations["CameraDistance"]="Dist"; +translations["CameraPerspective3d"]="3d"; +translations["CameraPerspective2d"]="2d"; +translations["Split"]="Sp"; +translations["Join"]="Jo"; +translations["Day"]="Da"; +translations["Night"]="Ni"; //NavigationManeuversList translations["NavigationManeuversList"]="MANEUVER LIST"; @@ -143,5 +152,6 @@ translations["Ok"]="OK"; translations["On"]="ON"; translations["Off"]="OFF"; translations["Back"]="BACK"; +translations["Menu"]="MENU"; translations["Quit"]="QUIT"; diff --git a/src/hmi/qml/Core/translations/fra_FRA.js b/src/hmi/qml/Core/translations/fra_FRA.js index a29b6bf..84b6478 100644 --- a/src/hmi/qml/Core/translations/fra_FRA.js +++ b/src/hmi/qml/Core/translations/fra_FRA.js @@ -107,15 +107,25 @@ translations["Entry"]="SAISIE"; //NavigationBrowseMap translations["NavigationBrowseMap"]="EXPLORER LA CARTE"; translations["NavigationCurrentStreet"]="RUE ACTUELLE"; -translations["Night"]="NUIT"; -translations["Day"]="JOUR"; -translations["North"]="NORD"; -translations["South"]="SUD"; -translations["East"]="EST"; -translations["West"]="OUEST"; -translations["CameraTilt"]="TILT"; -translations["CameraHeight"]="HAUTEUR"; -translations["CameraDistance"]="DISTANCE"; +translations["FSAWarning"]="Destination not reached"; +translations["NoGuidance"]="No guidance"; +translations["NoManeuver"]="No maneuver"; + +//CameraSettings +translations["North"]="N"; +translations["South"]="S"; +translations["East"]="E"; +translations["West"]="O"; +translations["CameraTilt"]="Tilt"; +translations["CameraHeight"]="Height"; +translations["CameraDistance"]="Dist"; +translations["CameraPerspective3d"]="3d"; +translations["CameraPerspective2d"]="2d"; +translations["Split"]="Sp"; +translations["Join"]="Jo"; +translations["Day"]="Da"; +translations["Night"]="Ni"; + //NavigationManeuversList translations["NavigationManeuversList"]="LISTE DES MANEUVRES"; @@ -143,5 +153,6 @@ translations["Ok"]="OK"; translations["On"]="ON"; translations["Off"]="OFF"; translations["Back"]="RETOUR"; +translations["Menu"]="MENU"; translations["Quit"]="QUITTER"; diff --git a/src/hmi/qml/Core/translations/jpn_JPN.js b/src/hmi/qml/Core/translations/jpn_JPN.js index 5b1328a..a686b21 100644 --- a/src/hmi/qml/Core/translations/jpn_JPN.js +++ b/src/hmi/qml/Core/translations/jpn_JPN.js @@ -107,15 +107,24 @@ translations["Entry"]="文字入力"; //NavigationBrowseMap translations["NavigationBrowseMap"]="地図を調べる"; translations["NavigationCurrentStreet"]="現在地"; -translations["Night"]="NIGHT"; -translations["Day"]="DAY"; +translations["FSAWarning"]="Destination not reached"; +translations["NoGuidance"]="No guidance"; +translations["NoManeuver"]="No maneuver"; + +//CameraSettings translations["North"]="北緯"; translations["South"]="南緯"; translations["East"]="東経"; translations["West"]="西経"; -translations["CameraTilt"]="TILT"; -translations["CameraHeight"]="HEIGHT"; -translations["CameraDistance"]="DISTANCE"; +translations["CameraTilt"]="Tilt"; +translations["CameraHeight"]="Height"; +translations["CameraDistance"]="Dist"; +translations["CameraPerspective3d"]="3d"; +translations["CameraPerspective2d"]="2d"; +translations["Split"]="Sp"; +translations["Join"]="Jo"; +translations["Day"]="Da"; +translations["Night"]="Ni"; //NavigationManeuversList translations["NavigationManeuversList"]="操作表示"; @@ -143,6 +152,7 @@ translations["Ok"]="OK"; translations["On"]="ON"; translations["Off"]="OFF"; translations["Back"]="BACK"; +translations["Menu"]="MENU"; translations["Quit"]="QUIT"; diff --git a/src/hmi/qml/MainMenu.qml b/src/hmi/qml/MainMenu.qml index 7964845..b8e96de 100644 --- a/src/hmi/qml/MainMenu.qml +++ b/src/hmi/qml/MainMenu.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/fsa-main-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -44,29 +45,29 @@ HMIMenu { } HMIBgImage { - image:StyleSheet.fsa_main_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.fsa_main_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} - StdButton { source:StyleSheet.select_navigation[StyleSheet.SOURCE]; x:StyleSheet.select_navigation[StyleSheet.X]; y:StyleSheet.select_navigation[StyleSheet.Y]; width:StyleSheet.select_navigation[StyleSheet.WIDTH]; height:StyleSheet.select_navigation[StyleSheet.HEIGHT]; + 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} - StdButton { source:StyleSheet.select_mapview[StyleSheet.SOURCE]; x:StyleSheet.select_mapview[StyleSheet.X]; y:StyleSheet.select_mapview[StyleSheet.Y]; width:StyleSheet.select_mapview[StyleSheet.WIDTH]; height:StyleSheet.select_mapview[StyleSheet.HEIGHT]; + 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"); } } - StdButton { source:StyleSheet.select_trip[StyleSheet.SOURCE]; x:StyleSheet.select_trip[StyleSheet.X]; y:StyleSheet.select_trip[StyleSheet.Y]; width:StyleSheet.select_trip[StyleSheet.WIDTH]; height:StyleSheet.select_trip[StyleSheet.HEIGHT]; + 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"); } } - StdButton { source:StyleSheet.select_poi[StyleSheet.SOURCE]; x:StyleSheet.select_poi[StyleSheet.X]; y:StyleSheet.select_poi[StyleSheet.Y]; width:StyleSheet.select_poi[StyleSheet.WIDTH]; height:StyleSheet.select_poi[StyleSheet.HEIGHT]; + 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:settings; prev:trip} - StdButton { source:StyleSheet.select_configuration[StyleSheet.SOURCE]; x:StyleSheet.select_configuration[StyleSheet.X]; y:StyleSheet.select_configuration[StyleSheet.Y]; width:StyleSheet.select_configuration[StyleSheet.WIDTH]; height:StyleSheet.select_configuration[StyleSheet.HEIGHT]; + 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:settings; page:"NavigationSettings"; explode:false; next:quit; prev:trip} - StdButton { source:StyleSheet.quit[StyleSheet.SOURCE]; x:StyleSheet.quit[StyleSheet.X]; y:StyleSheet.quit[StyleSheet.Y]; width:StyleSheet.quit[StyleSheet.WIDTH]; height:StyleSheet.quit[StyleSheet.HEIGHT];textColor:StyleSheet.quitText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.quitText[StyleSheet.PIXELSIZE]; + 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]; id:quit; text: Genivi.gettext("Quit"); explode:false; next:navigation; prev:settings; onClicked:{Qt.quit()}} } } diff --git a/src/hmi/qml/NavigationBrowseMap.qml b/src/hmi/qml/NavigationBrowseMap.qml index ac97994..65431f5 100644 --- a/src/hmi/qml/NavigationBrowseMap.qml +++ b/src/hmi/qml/NavigationBrowseMap.qml @@ -27,6 +27,13 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; import "Core/style-sheets/style-constants.js" as Constants; +import "Core/style-sheets/navigation-browse-map-bottom-css.js" as StyleSheetBottom +import "Core/style-sheets/navigation-browse-map-route-css.js" as StyleSheetRoute +import "Core/style-sheets/navigation-browse-map-guidance-css.js" as StyleSheetGuidance +import "Core/style-sheets/navigation-browse-map-scroll-css.js" as StyleSheetScroll +import "Core/style-sheets/navigation-browse-map-simulation-css.js" as StyleSheetSimulation +import "Core/style-sheets/navigation-browse-map-top-css.js" as StyleSheetTop + import lbs.plugin.dbusif 1.0 HMIMenu { @@ -34,7 +41,7 @@ HMIMenu { headlineFg: "grey" headlineBg: "blue" text: Genivi.gettext("NavigationBrowseMap") - next: up + next: scrollup prev: menub property Item guidanceWaypointReachedSignal; property Item guidanceManeuverChangedSignal; @@ -42,14 +49,8 @@ HMIMenu { property Item mapmatchedpositionPositionUpdateSignal; property Item mapmatchedpositionAddressUpdateSignal; property Item fuelStopAdvisorSignal; - property string guidance: "No guidance"; - property string maneuver: "No maneuver"; - property string maneuver_distance: ""; - property string totaldistance: ""; - property string totaltime: ""; property bool north:false; - DBusIf { id:dbusIf } @@ -59,7 +60,7 @@ HMIMenu { // TODO: Create possibility to poll information? // console.log("guidanceManeuverChanged"); // Genivi.dump("",args); - guidance=Genivi.Maneuver[args[1]]; + maneuverAdvice.text=Genivi.Maneuver[args[1]]; } function guidanceWaypointReached(args) @@ -67,9 +68,9 @@ HMIMenu { // console.log("guidanceWaypointReached"); // Genivi.dump("",args); if (args[2]) { - guidance="Destination reached"; + maneuverAdvice.text="Destination reached"; } else { - guidance="Waypoint reached"; + maneuverAdvice.text="Waypoint reached"; } } @@ -83,7 +84,7 @@ HMIMenu { { var res=Genivi.nav_message(dbusIf,"MapMatchedPosition","GetPosition",["array",["uint16",Genivi.NAVIGATIONCORE_SPEED]]); if (res[0] == "map" && res[1][0] == "uint16" && res[1][1] == Genivi.NAVIGATIONCORE_SPEED && res[1][2] == "variant" && res[1][3][0] == "double") { - speed.text=res[1][3][1]+"\nkm/h"; + speedValue.text=res[1][3][1]; } else { console.log("Unexpected result from GetPosition:"); Genivi.dump("",res); @@ -94,9 +95,9 @@ HMIMenu { { var res=Genivi.nav_message(dbusIf,"MapMatchedPosition","GetAddress",["array",["uint16",Genivi.NAVIGATIONCORE_STREET]]); if (res[0] == "map" && res[1][0] == "uint16" && res[1][1] == Genivi.NAVIGATIONCORE_STREET && res[1][2] == "variant" && res[1][3][0] == "string") { - menu.text=Genivi.gettext("NavigationCurrentStreet") + ":"+res[1][3][1]; + currentroad.text=res[1][3][1]; } else { - menu.text=Genivi.gettext("NavigationBrowseMap"); + currentroad.text=""; } } @@ -125,11 +126,11 @@ HMIMenu { { if (args[1] == 1) { - fuel.text="F"; + fsamessageText.text=Genivi.gettext("FSAWarning"); } else { - fuel.text=" "; + fsamessageText.text=" "; } } else @@ -190,33 +191,6 @@ HMIMenu { Genivi.lm_message(dbusIf,"ServiceDisconnect",["uint32",dbusIf.pid()]); } - - function updateMapViewer() - { - var res=Genivi.mapviewercontrol_message(dbusIf,"GetMapViewPerspective",[]); - if (res[0] == "uint16") { - if (res[1] == Genivi.MAPVIEWER_2D) { - perspective.text="3d"; - } else { - perspective.text="2d"; - } - } else { - console.log("Unexpected result from GetMapViewPerspective:"); - Genivi.dump("",res); - } - var res=Genivi.mapviewercontrol_message(dbusIf,"GetDisplayedRoutes",[]); - if (res[0] == "array" && res[1] && res[1].length) { - split.disabled=false; - } else { - split.disabled=true; - } - if (Genivi.g_map_handle2) { - split.text="Join"; - } else { - split.text="Split"; - } - } - function routeOverview() { if (!split.disabled) { @@ -226,104 +200,15 @@ HMIMenu { } } - function updateDayNight() - { - var res=Genivi.mapviewercontrol_message(dbusIf, "GetMapViewTheme", []); - if (res[0] == "uint16" && res[1] == Genivi.MAPVIEWER_THEME_1) { - daynight.text="Night"; - } else { - daynight.text="Day"; - } - } - - function toggleDayNight() - { - var res=Genivi.mapviewercontrol_message(dbusIf, "GetMapViewTheme", []); - if (res[0] == "uint16" && res[1] == Genivi.MAPVIEWER_THEME_1) { - Genivi.mapviewercontrol_message(dbusIf,"SetMapViewTheme",["uint16",Genivi.MAPVIEWER_THEME_2]); - if (Genivi.g_map_handle2) { - Genivi.mapviewercontrol_message2(dbusIf,"SetMapViewTheme",["uint16",Genivi.MAPVIEWER_THEME_2]); - } - daynight.text="Day"; - } else { - Genivi.mapviewercontrol_message(dbusIf,"SetMapViewTheme",["uint16",Genivi.MAPVIEWER_THEME_1]); - if (Genivi.g_map_handle2) { - Genivi.mapviewercontrol_message2(dbusIf,"SetMapViewTheme",["uint16",Genivi.MAPVIEWER_THEME_1]); - } - daynight.text="Night"; - } - } - - function togglePerspective() - { - if (perspective.text == "2d") { - Genivi.mapviewercontrol_message(dbusIf,"SetMapViewPerspective",["uint16",Genivi.MAPVIEWER_2D]); - } else { - Genivi.mapviewercontrol_message(dbusIf,"SetMapViewPerspective",["uint16",Genivi.MAPVIEWER_3D]); - } - updateMapViewer(); - } - - function toggleSplit() - { - hideSurfaces(); - var res=Genivi.mapviewercontrol_message(dbusIf,"GetDisplayedRoutes",[]); - var res3=Genivi.mapviewercontrol_message(dbusIf, "GetMapViewTheme", []); - if (split.text == "Split") { - Genivi.map_handle_clear(dbusIf); - Genivi.map_handle2(dbusIf,map.width/2,map.height,Genivi.MAPVIEWER_MAIN_MAP); - Genivi.map_handle(dbusIf,map.width/2,map.height,Genivi.MAPVIEWER_MAIN_MAP); - if (res[0] == "array" && res[1] && res[1].length) { - var res2=Genivi.routing_message_get(dbusIf, "GetRouteBoundingBox", []); - if (res2[0] == "structure") { - Genivi.mapviewercontrol_message2(dbusIf, "SetMapViewBoundingBox", res2); - } else { - console.log("Unexpected result from GetRouteBoundingBox:"); - Genivi.dump("",res2); - } - } - if (res3[0] == "uint16") { - Genivi.mapviewercontrol_message(dbusIf, "SetMapViewTheme", res3); - Genivi.mapviewercontrol_message2(dbusIf, "SetMapViewTheme", res3); - } - Genivi.mapviewercontrol_message(dbusIf, "SetFollowCarMode", ["boolean",true]); - } else { - Genivi.map_handle_clear2(dbusIf); - Genivi.map_handle_clear(dbusIf); - Genivi.map_handle(dbusIf,map.width,map.height,Genivi.MAPVIEWER_MAIN_MAP); - if (res3[0] == "uint16") { - Genivi.mapviewercontrol_message(dbusIf, "SetMapViewTheme", res3); - } - Genivi.mapviewercontrol_message(dbusIf, "SetFollowCarMode", ["boolean",true]); - } - if (res[0] == "array" && res[1] && res[1].length) { - for (var i = 0 ; i < res[1].length ; i+=2) { - Genivi.mapviewercontrol_message(dbusIf, "DisplayRoute", res[1][i+1]); - if (split.text == "Split") { - Genivi.mapviewercontrol_message2(dbusIf, "DisplayRoute", res[1][i+1]); - } - } - } - showSurfaces(); - updateMapViewer(); - } - - function disableSplit() - { - if (Genivi.g_map_handle2) { - toggleSplit(); - } - } - function toggleOrientation() { north=!north; if (north) { Genivi.mapviewercontrol_message(dbusIf, "SetCameraHeadingAngle", ["int32",0]); - orientation.text="D"; + orientation.setState("D"); } else { Genivi.mapviewercontrol_message(dbusIf, "SetCameraHeadingTrackUp", []); - orientation.text="N"; + orientation.setState("N"); } } @@ -336,17 +221,16 @@ HMIMenu { return; } if (res[1] == Genivi.NAVIGATIONCORE_INACTIVE) { - stop.disabled=true; //Guidance inactive, so inform the trip computer Genivi.fuel_stop_advisor_message(dbusIf,"SetFuelAdvisorSettings",["boolean",0,"uint8",0]); - guidance="No guidance"; - maneuver="No maneuver"; - maneuver_distance=""; - totaldistance=""; - totaltime=""; + maneuverAdvice.text=Genivi.gettext("NoGuidance"); + maneuverValue.text=Genivi.gettext("NoManeuver"); + distancetomaneuverValue.text="----"; + distancetodestinationValue.text="----"; + timetodestinationValue.text="----"; + roadaftermaneuverValue.text="----"; return; } else { - stop.disabled=false; //Guidance active, so inform the trip computer (refresh) Genivi.fuel_stop_advisor_message(dbusIf,"SetFuelAdvisorSettings",["boolean",1,"uint8",50]); } @@ -368,9 +252,10 @@ HMIMenu { { if (subsubarray[1][1] == Genivi.NAVIGATIONCORE_DIRECTION && subsubarray[1][2] == "variant" && subsubarray[1][3][0] == "uint16") { - stop.disabled=false; - maneuver=Genivi.ManeuverType[subarray[j+1][7]]+":"+Genivi.ManeuverDirection[subsubarray[1][3][1]]; - maneuver_distance=Genivi.distance(substructure[1])+" "+structure[3]; + maneuverValue.text=Genivi.ManeuverDirection[subsubarray[1][3][1]]; + //Genivi.ManeuverType[subarray[j+1][7]] contains CROSSROAD and is removed for the moment + distancetomaneuverValue.text=Genivi.distance(substructure[1]); + roadaftermaneuverValue.text=structure[3]; } } @@ -388,7 +273,7 @@ HMIMenu { if (res[0] == "uint32") { - totaldistance = Genivi.distance(res[1]); + distancetodestinationValue.text = Genivi.distance(res[1]); } else { @@ -397,7 +282,7 @@ HMIMenu { } if (res[2] == "uint32") { - totaltime = Genivi.time(res[3]); + timetodestinationValue.text = Genivi.time(res[3]); } else { @@ -413,237 +298,318 @@ HMIMenu { updateGuidance(); } - Row { - id:content - y:30; - x:menu.wspc/2; - height:content.h - property real w: menu.w(7); - property real h: menu.h(4); - property real panX: 40 //delta in pixel for x panning - property real panY: 40 //delta in pixel for y panning - spacing: menu.wspc/3; - - StdButton { id:up; text:"Up"; explode:false; next:left; prev:daynight; pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} - onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 + content.panY]]]);} - } - StdButton { id:left; text:"Left"; explode:false; next:right; prev:up;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} - onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 + content.panX,"uint16",map.height/2]]]);} - } - StdButton { id:right; text:"Right"; explode:false; next:down; prev:left;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} - onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 - content.panX,"uint16",map.height/2]]]);} - } - StdButton { id:down; text:"Down"; explode:false; next:zoom_in; prev:right;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} - onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 - content.panY]]]);} - } - StdButton { id:zoom_in; text:"+"; explode:false; next:zoom_out; prev:down;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewScaleByDelta", ["int16",1]);showZoom();} - } - StdButton { id:zoom_out; text:"-"; explode:false; next:perspective; prev:zoom_in;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewScaleByDelta", ["int16",-1]);showZoom();} - } - StdButton { id:perspective; text:"3d"; explode:false; next:split; prev:zoom_out;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: {togglePerspective();} - } - StdButton { id:split; text:"Split"; explode:false; next:orientation; prev:perspective;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: {toggleSplit();} - } - StdButton { id:orientation; text:"N"; explode:false; next:camera; prev:split;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: {toggleOrientation();} - } - StdButton { id:camera; text:"C"; explode:false; next:back; prev:orientation;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - disableSplit(); - disconnectSignals(); - hideSurfaces(); - pageOpen("CameraSettings"); - } - } - Rectangle { - width:speed.width+20 - height:content.h - color:"#000000" - opacity: 0.8 - radius: 10 - Text { - anchors { left:parent.left; leftMargin: 10; top:parent.top; topMargin: 2 } - id:speed - font.pixelSize: 18; - style: Text.Sunken - color: "white" - styleColor: "black" - smooth: true - text: "0\nkm/h" - } - } - Rectangle { - width:zoomlevel.width+20 - height:content.h - color:"#000000" - opacity: 0.8 - radius: 10 - - Text { - anchors { left:parent.left; leftMargin: 10; top:parent.top; topMargin: 2 } - id:zoomlevel - font.pixelSize: 18; - style: Text.Sunken - color: "white" - styleColor: "black" - smooth: true - } - } - } + Rectangle { + id:map + x:0 + y:0 + height:menu.height + width:menu.width + color:"#ffff7e" + + Rectangle { + opacity: 0.8 + width: StyleSheetTop.navigation_browse_map_top_background[Constants.WIDTH] + height: StyleSheetTop.navigation_browse_map_top_background[Constants.HEIGHT] + x: Constants.MENU_BROWSE_MAP_TOP_X + y: Constants.MENU_BROWSE_MAP_TOP_Y + HMIBgImage { + id: top + image:StyleSheetTop.navigation_browse_map_top_background[Constants.SOURCE]; + anchors { fill: parent; topMargin: parent.headlineHeight} + + Text { + x:StyleSheetTop.fsamessageText[Constants.X]; y:StyleSheetTop.fsamessageText[Constants.Y]; width:StyleSheetTop.fsamessageText[Constants.WIDTH]; height:StyleSheetTop.fsamessageText[Constants.HEIGHT];color:StyleSheetTop.fsamessageText[Constants.TEXTCOLOR];styleColor:StyleSheetTop.fsamessageText[Constants.STYLECOLOR]; font.pixelSize:StyleSheetTop.fsamessageText[Constants.PIXELSIZE]; + id:fsamessageText + visible: true + style: Text.Sunken + smooth: true + text:"" + } - Rectangle { - id:map - y:content.y+content.height+4 - height:menu.height-y-bottom.height-8 - width:menu.width - color:"#ffff7e" - } + StdButton { + source:StyleSheetTop.select_search_for_refill_in_top[Constants.SOURCE]; x:StyleSheetTop.select_search_for_refill_in_top[Constants.X]; y:StyleSheetTop.select_search_for_refill_in_top[Constants.Y]; width:StyleSheetTop.select_search_for_refill_in_top[Constants.WIDTH]; height:StyleSheetTop.select_search_for_refill_in_top[Constants.HEIGHT]; + id:select_search_for_refill_in_top + explode: false + onClicked: { + disconnectSignals(); + hideSurfaces(); + pageOpen("POI"); + } + } - Row { - id:bottom - y:menu.height-height-4 - x:menu.wspc/2; - height:content.h - spacing:menu.wspc/4 - - StdButton { id:back; text:"Back"; next:menub; prev:camera;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - disconnectSignals(); - hideSurfaces(); - pageOpen(Genivi.data["mapback"]); - } - } - StdButton { id:menub; text:"Menu"; next:stop; prev:back;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - disconnectSignals(); - hideSurfaces(); - pageOpen("MainMenu"); - } - } - StdButton { id:stop; text:"Stop"; explode:false; next:daynight; prev:menub;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: {stopGuidance();} - disabled: true - } + Text { + x:StyleSheetTop.speedValue[Constants.X]; y:StyleSheetTop.speedValue[Constants.Y]; width:StyleSheetTop.speedValue[Constants.WIDTH]; height:StyleSheetTop.speedValue[Constants.HEIGHT];color:StyleSheetTop.speedValue[Constants.TEXTCOLOR];styleColor:StyleSheetTop.speedValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetTop.speedValue[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:speedValue + text: "---" + } - StdButton { id:daynight; text:""; explode:false; next:up; prev:stop;pixelSize:Constants.MENU_BROWSE_MAP_TEXT_PIXEL_SIZE; - onClicked: { - toggleDayNight(); - } - } - - Rectangle { - width:totalt.width+20 - height:content.h - color:"#000000" - opacity: 0.8 - radius: 10 - MouseArea { - anchors.fill: parent - onClicked: { - routeOverview(); - } - } - Text { - anchors { left:parent.left; leftMargin: 10; top:parent.top; topMargin: 2 } - id:totalt - text: "TotalTime:\n"+menu.totaltime - font.pixelSize: 18; - style: Text.Sunken - color: "white" - styleColor: "black" - smooth: true - } - } - Rectangle { - width:totaldist.width+20 - height:content.h - color:"#000000" - opacity: 0.8 - radius: 10 - MouseArea { - anchors.fill: parent - onClicked: { - routeOverview(); - } - } - Text { - anchors { left:parent.left; leftMargin: 10; top:parent.top; topMargin: 2 } - id:totaldist - text: "TotalDistance:\n"+menu.totaldistance - font.pixelSize: 18; - style: Text.Sunken - color: "white" - styleColor: "black" - smooth: true - } - } - Rectangle { - width:nextturn.width+20 - height:content.h - color:"#000000" - opacity: 0.8 - radius: 10 - MouseArea { - anchors.fill: parent - onClicked: { - var res=Genivi.guidance_message(dbusIf,"GetGuidanceStatus",[]); - if (res[0] == "uint16") { - if (res[1] != Genivi.NAVIGATIONCORE_INACTIVE) { - disconnectSignals(); - hideSurfaces(); - pageOpen("NavigationManeuversList"); - } - } - } - } - Text { - anchors { left:parent.left; leftMargin: 10; top:parent.top; topMargin: 2 } - id:nextturn - text: menu.guidance+"\n"+menu.maneuver+"\n"+menu.maneuver_distance; - font.pixelSize: 12; - style: Text.Sunken - color: "white" - styleColor: "black" - smooth: true - } - } - Rectangle { - width:20 - height:content.h - color:"#000000" - opacity: 0.8 - radius: 10 - MouseArea { - anchors.fill: parent - onClicked: { - disconnectSignals(); - hideSurfaces(); - pageOpen("POI"); - } - } - Text { - anchors { left:parent.left; leftMargin: 10; top:parent.top; topMargin: 2 } - id:fuel - text:"" - font.pixelSize: 20; - style: Text.Sunken - color: "white" - styleColor: "black" - smooth: true - } - } - } + Text { + x:StyleSheetTop.speedUnit[Constants.X]; y:StyleSheetTop.speedUnit[Constants.Y]; width:StyleSheetTop.speedUnit[Constants.WIDTH]; height:StyleSheetTop.speedUnit[Constants.HEIGHT];color:StyleSheetTop.speedUnit[Constants.TEXTCOLOR];styleColor:StyleSheetTop.speedUnit[Constants.STYLECOLOR]; font.pixelSize:StyleSheetTop.speedUnit[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:speedUnit + text: "km/h" + } + } + } + + Rectangle { + opacity: 0.8 + width: StyleSheetBottom.navigation_browse_map_bottom_background[Constants.WIDTH] + height: StyleSheetBottom.navigation_browse_map_bottom_background[Constants.HEIGHT] + x: Constants.MENU_BROWSE_MAP_BOTTOM_X + y: Constants.MENU_BROWSE_MAP_BOTTOM_Y + HMIBgImage { + id: bottom + image:StyleSheetBottom.navigation_browse_map_bottom_background[Constants.SOURCE]; + anchors { fill: parent; topMargin: parent.headlineHeight} + + StdButton { + source:StyleSheetBottom.menub[Constants.SOURCE]; x:StyleSheetBottom.menub[Constants.X]; y:StyleSheetBottom.menub[Constants.Y]; width:StyleSheetBottom.menub[Constants.WIDTH]; height:StyleSheetBottom.menub[Constants.HEIGHT];textColor:StyleSheetBottom.menubText[Constants.TEXTCOLOR]; pixelSize:StyleSheetBottom.menubText[Constants.PIXELSIZE]; + id:menub; text:Genivi.gettext("Menu"); next:orientation; prev:settings; + onClicked: { + disconnectSignals(); + hideSurfaces(); + pageOpen("MainMenu"); + } + } + + StdButton { + x:StyleSheetBottom.directiondestination[Constants.X]; y:StyleSheetBottom.directiondestination[Constants.Y]; width:StyleSheetBottom.directiondestination[Constants.WIDTH]; height:StyleSheetBottom.directiondestination[Constants.HEIGHT]; + id:orientation; next:zoomin; prev:menub; explode:false; disabled:false; + source:StyleSheetBottom.directionnorth[Constants.SOURCE]; //todo call get status + property int status: 0; + function setState(name) + { + if (name=="D") + { + status=1; + source=StyleSheetBottom.directionnorth[Constants.SOURCE]; + } + else + { + status=0; + source=StyleSheetBottom.directiondestination[Constants.SOURCE]; + } + } + onClicked: + { + toggleOrientation(); + } + } + + Text { + x:StyleSheetBottom.currentroad[Constants.X]; y:StyleSheetBottom.currentroad[Constants.Y]; width:StyleSheetBottom.currentroad[Constants.WIDTH]; height:StyleSheetBottom.currentroad[Constants.HEIGHT];color:StyleSheetBottom.currentroad[Constants.TEXTCOLOR];styleColor:StyleSheetBottom.currentroad[Constants.STYLECOLOR]; font.pixelSize:StyleSheetBottom.currentroad[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:currentroad + text: "-------" + } + + StdButton { + source:StyleSheetBottom.zoomin[Constants.SOURCE]; x:StyleSheetBottom.zoomin[Constants.X]; y:StyleSheetBottom.zoomin[Constants.Y]; width:StyleSheetBottom.zoomin[Constants.WIDTH]; height:StyleSheetBottom.zoomin[Constants.HEIGHT]; + id:zoomin; explode:false; next:zoomout; prev:orientation; + onClicked: { + Genivi.mapviewercontrol_message(dbusIf, "SetMapViewScaleByDelta", ["int16",1]); + showZoom(); + } + } + + Text { + x:StyleSheetBottom.zoomlevel[Constants.X]; y:StyleSheetBottom.zoomlevel[Constants.Y]; width:StyleSheetBottom.zoomlevel[Constants.WIDTH]; height:StyleSheetBottom.zoomlevel[Constants.HEIGHT];color:StyleSheetBottom.zoomlevel[Constants.TEXTCOLOR];styleColor:StyleSheetBottom.zoomlevel[Constants.STYLECOLOR]; font.pixelSize:StyleSheetBottom.zoomlevel[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:zoomlevel + text: " " + } + + StdButton { + source:StyleSheetBottom.zoomout[Constants.SOURCE]; x:StyleSheetBottom.zoomout[Constants.X]; y:StyleSheetBottom.zoomout[Constants.Y]; width:StyleSheetBottom.zoomout[Constants.WIDTH]; height:StyleSheetBottom.zoomout[Constants.HEIGHT]; + id:zoomout; explode:false; next:settings; prev:zoomin; + onClicked: { + Genivi.mapviewercontrol_message(dbusIf, "SetMapViewScaleByDelta", ["int16",-1]); + showZoom(); + } + } + + StdButton { + source:StyleSheetBottom.settings[Constants.SOURCE]; x:StyleSheetBottom.settings[Constants.X]; y:StyleSheetBottom.settings[Constants.Y]; width:StyleSheetBottom.settings[Constants.WIDTH]; height:StyleSheetBottom.settings[Constants.HEIGHT]; + id:settings; explode:false; next:menub; prev:zoomout; + onClicked: { + disconnectSignals(); + hideSurfaces(); + pageOpen("CameraSettings"); + } + } + } + } + + Rectangle { + opacity: 0.8 + width: StyleSheetRoute.navigation_browse_map_route_background[Constants.WIDTH] + height: StyleSheetRoute.navigation_browse_map_route_background[Constants.HEIGHT] + x: Constants.MENU_BROWSE_MAP_ROUTE_X + y: Constants.MENU_BROWSE_MAP_ROUTE_Y + HMIBgImage { + id: route + image:StyleSheetRoute.navigation_browse_map_route_background[Constants.SOURCE] + anchors { fill: parent; topMargin: parent.headlineHeight} + MouseArea { + anchors.fill: parent + onClicked: { + routeOverview(); + } + } + + Text { + x:StyleSheetRoute.timetodestinationValue[Constants.X]; y:StyleSheetRoute.timetodestinationValue[Constants.Y]; width:StyleSheetRoute.timetodestinationValue[Constants.WIDTH]; height:StyleSheetRoute.timetodestinationValue[Constants.HEIGHT];color:StyleSheetRoute.timetodestinationValue[Constants.TEXTCOLOR];styleColor:StyleSheetRoute.timetodestinationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetRoute.timetodestinationValue[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:timetodestinationValue + text: "-------" + } + + Text { + x:StyleSheetRoute.distancetodestinationValue[Constants.X]; y:StyleSheetRoute.distancetodestinationValue[Constants.Y]; width:StyleSheetRoute.distancetodestinationValue[Constants.WIDTH]; height:StyleSheetRoute.distancetodestinationValue[Constants.HEIGHT];color:StyleSheetRoute.distancetodestinationValue[Constants.TEXTCOLOR];styleColor:StyleSheetRoute.distancetodestinationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetRoute.distancetodestinationValue[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:distancetodestinationValue + text: "----" + } + + } + } + + Rectangle { + opacity: 0.8 + width: StyleSheetGuidance.navigation_browse_map_guidance_background[Constants.WIDTH] + height: StyleSheetGuidance.navigation_browse_map_guidance_background[Constants.HEIGHT] + x: Constants.MENU_BROWSE_MAP_GUIDANCE_X + y: Constants.MENU_BROWSE_MAP_GUIDANCE_Y + HMIBgImage { + id: guidance + image:StyleSheetGuidance.navigation_browse_map_guidance_background[Constants.SOURCE] + anchors { fill: parent; topMargin: parent.headlineHeight} + MouseArea { + anchors.fill: parent + onClicked: { + var res=Genivi.guidance_message(dbusIf,"GetGuidanceStatus",[]); + if (res[0] == "uint16") { + if (res[1] != Genivi.NAVIGATIONCORE_INACTIVE) { + disconnectSignals(); + hideSurfaces(); + pageOpen("NavigationManeuversList"); + } + } + } + } + + Text { + x:StyleSheetGuidance.maneuverValue[Constants.X]; y:StyleSheetGuidance.maneuverValue[Constants.Y]; width:StyleSheetGuidance.maneuverValue[Constants.WIDTH]; height:StyleSheetGuidance.maneuverValue[Constants.HEIGHT];color:StyleSheetGuidance.maneuverValue[Constants.TEXTCOLOR];styleColor:StyleSheetGuidance.maneuverValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetGuidance.maneuverValue[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:maneuverValue + text: " " + } + + Text { + x:StyleSheetGuidance.distancetomaneuverValue[Constants.X]; y:StyleSheetGuidance.distancetomaneuverValue[Constants.Y]; width:StyleSheetGuidance.distancetomaneuverValue[Constants.WIDTH]; height:StyleSheetGuidance.distancetomaneuverValue[Constants.HEIGHT];color:StyleSheetGuidance.distancetomaneuverValue[Constants.TEXTCOLOR];styleColor:StyleSheetGuidance.distancetomaneuverValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetGuidance.distancetomaneuverValue[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:distancetomaneuverValue + text: " " + } + + Text { + x:StyleSheetGuidance.roadaftermaneuverValue[Constants.X]; y:StyleSheetGuidance.roadaftermaneuverValue[Constants.Y]; width:StyleSheetGuidance.roadaftermaneuverValue[Constants.WIDTH]; height:StyleSheetGuidance.roadaftermaneuverValue[Constants.HEIGHT];color:StyleSheetGuidance.roadaftermaneuverValue[Constants.TEXTCOLOR];styleColor:StyleSheetGuidance.roadaftermaneuverValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheetGuidance.roadaftermaneuverValue[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:roadaftermaneuverValue + text: " " + } + + Text { + x:StyleSheetGuidance.maneuverAdvice[Constants.X]; y:StyleSheetGuidance.maneuverAdvice[Constants.Y]; width:StyleSheetGuidance.maneuverAdvice[Constants.WIDTH]; height:StyleSheetGuidance.maneuverAdvice[Constants.HEIGHT];color:StyleSheetGuidance.maneuverAdvice[Constants.TEXTCOLOR];styleColor:StyleSheetGuidance.maneuverAdvice[Constants.STYLECOLOR]; font.pixelSize:StyleSheetGuidance.maneuverAdvice[Constants.PIXELSIZE]; + visible: true + style: Text.Sunken; + smooth: true + id:maneuverAdvice + text: " " + } + + } + } + + Rectangle { + opacity: 0.8 + width: StyleSheetScroll.navigation_browse_map_scroll_background[Constants.WIDTH] + height: StyleSheetScroll.navigation_browse_map_scroll_background[Constants.HEIGHT] + x: Constants.MENU_BROWSE_MAP_SCROLL_X + y: Constants.MENU_BROWSE_MAP_SCROLL_Y + HMIBgImage { + property real panX: 40 //delta in pixel for x panning + property real panY: 40 //delta in pixel for y panning + id: scroll + image:StyleSheetScroll.navigation_browse_map_scroll_background[Constants.SOURCE]; + anchors { fill: parent; topMargin: parent.headlineHeight} + + StdButton { + source:StyleSheetScroll.scrollup[Constants.SOURCE]; x:StyleSheetScroll.scrollup[Constants.X]; y:StyleSheetScroll.scrollup[Constants.Y]; width:StyleSheetScroll.scrollup[Constants.WIDTH]; height:StyleSheetScroll.scrollup[Constants.HEIGHT]; + id:scrollup; explode:false; next:scrollleft; prev:scrolldown; + onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} + onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 + scroll.panY]]]);} + } + + StdButton { + source:StyleSheetScroll.scrollleft[Constants.SOURCE]; x:StyleSheetScroll.scrollleft[Constants.X]; y:StyleSheetScroll.scrollleft[Constants.Y]; width:StyleSheetScroll.scrollleft[Constants.WIDTH]; height:StyleSheetScroll.scrollleft[Constants.HEIGHT]; + id:scrollleft; explode:false; next:scrollright; prev:scrollup; + onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} + onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 + scroll.panX,"uint16",map.height/2]]]);} + } + + StdButton { + source:StyleSheetScroll.scrollright[Constants.SOURCE]; x:StyleSheetScroll.scrollright[Constants.X]; y:StyleSheetScroll.scrollright[Constants.Y]; width:StyleSheetScroll.scrollright[Constants.WIDTH]; height:StyleSheetScroll.scrollright[Constants.HEIGHT]; + id:scrollright; explode:false; next:scrolldown; prev:scrollleft; + onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} + onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2 - scroll.panX,"uint16",map.height/2]]]);} + } + + StdButton { + source:StyleSheetScroll.scrolldown[Constants.SOURCE]; x:StyleSheetScroll.scrolldown[Constants.X]; y:StyleSheetScroll.scrolldown[Constants.Y]; width:StyleSheetScroll.scrolldown[Constants.WIDTH]; height:StyleSheetScroll.scrolldown[Constants.HEIGHT]; + id:scrolldown; explode:false; next:scrollup; prev:scrollright; + onPressed: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_START,"array",["structure",["uint16",map.width/2,"uint16",map.height/2]]]);} + onReleased: {Genivi.mapviewercontrol_message(dbusIf, "SetMapViewPan", ["uint16",Genivi.MAPVIEWER_PAN_END,"array",["structure",["uint16",map.width/2,"uint16",map.height/2 - scroll.panY]]]);} + } + } + } + + Rectangle { + opacity: 0.8 + width: StyleSheetSimulation.navigation_browse_map_simulation_background[Constants.WIDTH] + height: StyleSheetSimulation.navigation_browse_map_simulation_background[Constants.HEIGHT] + x: Constants.MENU_BROWSE_MAP_SIMULATION_X + y: Constants.MENU_BROWSE_MAP_SIMULATION_Y + HMIBgImage { + id: simulation + image:StyleSheetSimulation.navigation_browse_map_simulation_background[Constants.SOURCE]; + anchors { fill: parent; topMargin: parent.headlineHeight} + } + } + } Component.onCompleted: { - Genivi.map_handle(dbusIf,map.width,map.height,Genivi.MAPVIEWER_MAIN_MAP); + Genivi.map_handle(dbusIf,menu.width,menu.height,Genivi.MAPVIEWER_MAIN_MAP); showSurfaces(); if (Genivi.data['show_route_handle']) { Genivi.mapviewercontrol_message(dbusIf, "DisplayRoute", Genivi.data['show_route_handle'].concat("boolean",false)); @@ -675,9 +641,7 @@ HMIMenu { } connectSignals(); updateGuidance(); - updateMapViewer(); showZoom(); updateAddress(); - updateDayNight(); } } diff --git a/src/hmi/qml/NavigationCalculatedRoute.qml b/src/hmi/qml/NavigationCalculatedRoute.qml index 1b608c4..5b4ab6d 100644 --- a/src/hmi/qml/NavigationCalculatedRoute.qml +++ b/src/hmi/qml/NavigationCalculatedRoute.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-calculated-route-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -139,11 +140,11 @@ HMIMenu { HMIBgImage { - image:StyleSheet.navigation_calculated_route_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_calculated_route_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.guidanceTitle[StyleSheet.X]; y:StyleSheet.guidanceTitle[StyleSheet.Y]; width:StyleSheet.guidanceTitle[StyleSheet.WIDTH]; height:StyleSheet.guidanceTitle[StyleSheet.HEIGHT];color:StyleSheet.guidanceTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.guidanceTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.guidanceTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.guidanceTitle[Constants.X]; y:StyleSheet.guidanceTitle[Constants.Y]; width:StyleSheet.guidanceTitle[Constants.WIDTH]; height:StyleSheet.guidanceTitle[Constants.HEIGHT];color:StyleSheet.guidanceTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.guidanceTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.guidanceTitle[Constants.PIXELSIZE]; id:guidanceTitle; style: Text.Sunken; smooth: true @@ -151,7 +152,7 @@ HMIMenu { } Text { - x:StyleSheet.displayRouteTitle[StyleSheet.X]; y:StyleSheet.displayRouteTitle[StyleSheet.Y]; width:StyleSheet.displayRouteTitle[StyleSheet.WIDTH]; height:StyleSheet.displayRouteTitle[StyleSheet.HEIGHT];color:StyleSheet.displayRouteTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.displayRouteTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.displayRouteTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.displayRouteTitle[Constants.X]; y:StyleSheet.displayRouteTitle[Constants.Y]; width:StyleSheet.displayRouteTitle[Constants.WIDTH]; height:StyleSheet.displayRouteTitle[Constants.HEIGHT];color:StyleSheet.displayRouteTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.displayRouteTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.displayRouteTitle[Constants.PIXELSIZE]; id:displayRouteTitle; style: Text.Sunken; smooth: true @@ -160,7 +161,7 @@ HMIMenu { Text { - x:StyleSheet.distanceTitle[StyleSheet.X]; y:StyleSheet.distanceTitle[StyleSheet.Y]; width:StyleSheet.distanceTitle[StyleSheet.WIDTH]; height:StyleSheet.distanceTitle[StyleSheet.HEIGHT];color:StyleSheet.distanceTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.distanceTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.distanceTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.distanceTitle[Constants.X]; y:StyleSheet.distanceTitle[Constants.Y]; width:StyleSheet.distanceTitle[Constants.WIDTH]; height:StyleSheet.distanceTitle[Constants.HEIGHT];color:StyleSheet.distanceTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.distanceTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.distanceTitle[Constants.PIXELSIZE]; id:distanceTitle; style: Text.Sunken; smooth: true @@ -168,7 +169,7 @@ HMIMenu { } Text { - x:StyleSheet.distanceValue[StyleSheet.X]; y:StyleSheet.distanceValue[StyleSheet.Y]; width:StyleSheet.distanceValue[StyleSheet.WIDTH]; height:StyleSheet.distanceValue[StyleSheet.HEIGHT];color:StyleSheet.distanceValue[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.distanceValue[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.distanceValue[StyleSheet.PIXELSIZE]; + x:StyleSheet.distanceValue[Constants.X]; y:StyleSheet.distanceValue[Constants.Y]; width:StyleSheet.distanceValue[Constants.WIDTH]; height:StyleSheet.distanceValue[Constants.HEIGHT];color:StyleSheet.distanceValue[Constants.TEXTCOLOR];styleColor:StyleSheet.distanceValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.distanceValue[Constants.PIXELSIZE]; id:distanceValue wrapMode: Text.WordWrap style: Text.Sunken; @@ -176,7 +177,7 @@ HMIMenu { } Text { - x:StyleSheet.timeTitle[StyleSheet.X]; y:StyleSheet.timeTitle[StyleSheet.Y]; width:StyleSheet.timeTitle[StyleSheet.WIDTH]; height:StyleSheet.timeTitle[StyleSheet.HEIGHT];color:StyleSheet.timeTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.timeTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.timeTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.timeTitle[Constants.X]; y:StyleSheet.timeTitle[Constants.Y]; width:StyleSheet.timeTitle[Constants.WIDTH]; height:StyleSheet.timeTitle[Constants.HEIGHT];color:StyleSheet.timeTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.timeTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.timeTitle[Constants.PIXELSIZE]; id:timeTitle; style: Text.Sunken; smooth: true @@ -184,7 +185,7 @@ HMIMenu { } Text { - x:StyleSheet.timeValue[StyleSheet.X]; y:StyleSheet.timeValue[StyleSheet.Y]; width:StyleSheet.timeValue[StyleSheet.WIDTH]; height:StyleSheet.timeValue[StyleSheet.HEIGHT];color:StyleSheet.timeValue[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.timeValue[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.timeValue[StyleSheet.PIXELSIZE]; + x:StyleSheet.timeValue[Constants.X]; y:StyleSheet.timeValue[Constants.Y]; width:StyleSheet.timeValue[Constants.WIDTH]; height:StyleSheet.timeValue[Constants.HEIGHT];color:StyleSheet.timeValue[Constants.TEXTCOLOR];styleColor:StyleSheet.timeValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.timeValue[Constants.PIXELSIZE]; id:timeValue wrapMode: Text.WordWrap style: Text.Sunken; @@ -192,7 +193,7 @@ HMIMenu { } StdButton { - source:StyleSheet.show_route_on_map[StyleSheet.SOURCE]; x:StyleSheet.show_route_on_map[StyleSheet.X]; y:StyleSheet.show_route_on_map[StyleSheet.Y]; width:StyleSheet.show_route_on_map[StyleSheet.WIDTH]; height:StyleSheet.show_route_on_map[StyleSheet.HEIGHT]; + source:StyleSheet.show_route_on_map[Constants.SOURCE]; x:StyleSheet.show_route_on_map[Constants.X]; y:StyleSheet.show_route_on_map[Constants.Y]; width:StyleSheet.show_route_on_map[Constants.WIDTH]; height:StyleSheet.show_route_on_map[Constants.HEIGHT]; id: show_route_on_map explode:false; disabled:true; next:show_route_in_list; prev:back onClicked: { @@ -204,14 +205,14 @@ HMIMenu { } } StdButton { - source:StyleSheet.show_route_in_list[StyleSheet.SOURCE]; x:StyleSheet.show_route_in_list[StyleSheet.X]; y:StyleSheet.show_route_in_list[StyleSheet.Y]; width:StyleSheet.show_route_in_list[StyleSheet.WIDTH]; height:StyleSheet.show_route_in_list[StyleSheet.HEIGHT]; + 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 } StdButton { - source:StyleSheet.guidance_start[StyleSheet.SOURCE]; x:StyleSheet.guidance_start[StyleSheet.X]; y:StyleSheet.guidance_start[StyleSheet.Y]; width:StyleSheet.guidance_start[StyleSheet.WIDTH]; height:StyleSheet.guidance_start[StyleSheet.HEIGHT];textColor:StyleSheet.startText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.startText[StyleSheet.PIXELSIZE]; + source:StyleSheet.guidance_start[Constants.SOURCE]; x:StyleSheet.guidance_start[Constants.X]; y:StyleSheet.guidance_start[Constants.Y]; width:StyleSheet.guidance_start[Constants.WIDTH]; height:StyleSheet.guidance_start[Constants.HEIGHT];textColor:StyleSheet.startText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.startText[Constants.PIXELSIZE]; id:guidance_start; text: Genivi.gettext("On");explode:false; disabled:true; next:guidance_stop; prev:show_route_on_map onClicked: { disconnectSignals(); @@ -223,7 +224,7 @@ HMIMenu { } } StdButton { - source:StyleSheet.guidance_stop[StyleSheet.SOURCE]; x:StyleSheet.guidance_stop[StyleSheet.X]; y:StyleSheet.guidance_stop[StyleSheet.Y]; width:StyleSheet.guidance_stop[StyleSheet.WIDTH]; height:StyleSheet.guidance_stop[StyleSheet.HEIGHT];textColor:StyleSheet.stopText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.stopText[StyleSheet.PIXELSIZE]; + source:StyleSheet.guidance_stop[Constants.SOURCE]; x:StyleSheet.guidance_stop[Constants.X]; y:StyleSheet.guidance_stop[Constants.Y]; width:StyleSheet.guidance_stop[Constants.WIDTH]; height:StyleSheet.guidance_stop[Constants.HEIGHT];textColor:StyleSheet.stopText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.stopText[Constants.PIXELSIZE]; id:guidance_stop;text: Genivi.gettext("Off");explode:false; disabled:true; next:show_route_on_map; prev:guidance_start onClicked: { Genivi.guidance_message(dbusIf,"StopGuidance",[]); @@ -231,7 +232,7 @@ HMIMenu { guidance_stop.disabled=true; } } - StdButton { source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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:show_route_on_map; prev:show_route_in_list; onClicked: { disconnectSignals(); diff --git a/src/hmi/qml/NavigationRoute.qml b/src/hmi/qml/NavigationRoute.qml index 8f73485..05f49aa 100644 --- a/src/hmi/qml/NavigationRoute.qml +++ b/src/hmi/qml/NavigationRoute.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-route-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -103,11 +104,11 @@ HMIMenu { } HMIBgImage { - image:StyleSheet.navigation_route_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_route_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.locationTitle[StyleSheet.X]; y:StyleSheet.locationTitle[StyleSheet.Y]; width:StyleSheet.locationTitle[StyleSheet.WIDTH]; height:StyleSheet.locationTitle[StyleSheet.HEIGHT];color:StyleSheet.locationTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.locationTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.locationTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.locationTitle[Constants.X]; y:StyleSheet.locationTitle[Constants.Y]; width:StyleSheet.locationTitle[Constants.WIDTH]; height:StyleSheet.locationTitle[Constants.HEIGHT];color:StyleSheet.locationTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.locationTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.locationTitle[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true id:locationTitle @@ -115,7 +116,7 @@ HMIMenu { } Text { - x:StyleSheet.locationValue[StyleSheet.X]; y:StyleSheet.locationValue[StyleSheet.Y]; width:StyleSheet.locationValue[StyleSheet.WIDTH]; height:StyleSheet.locationValue[StyleSheet.HEIGHT];color:StyleSheet.locationValue[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.locationValue[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.locationValue[StyleSheet.PIXELSIZE]; + x:StyleSheet.locationValue[Constants.X]; y:StyleSheet.locationValue[Constants.Y]; width:StyleSheet.locationValue[Constants.WIDTH]; height:StyleSheet.locationValue[Constants.HEIGHT];color:StyleSheet.locationValue[Constants.TEXTCOLOR];styleColor:StyleSheet.locationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.locationValue[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true wrapMode: Text.WordWrap @@ -123,7 +124,7 @@ HMIMenu { } Text { - x:StyleSheet.positionTitle[StyleSheet.X]; y:StyleSheet.positionTitle[StyleSheet.Y]; width:StyleSheet.positionTitle[StyleSheet.WIDTH]; height:StyleSheet.positionTitle[StyleSheet.HEIGHT];color:StyleSheet.positionTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.positionTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.positionTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.positionTitle[Constants.X]; y:StyleSheet.positionTitle[Constants.Y]; width:StyleSheet.positionTitle[Constants.WIDTH]; height:StyleSheet.positionTitle[Constants.HEIGHT];color:StyleSheet.positionTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.positionTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.positionTitle[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true id:positionTitle @@ -131,7 +132,7 @@ HMIMenu { } Text { - x:StyleSheet.positionValue[StyleSheet.X]; y:StyleSheet.positionValue[StyleSheet.Y]; width:StyleSheet.positionValue[StyleSheet.WIDTH]; height:StyleSheet.positionValue[StyleSheet.HEIGHT];color:StyleSheet.positionValue[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.positionValue[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.positionValue[StyleSheet.PIXELSIZE]; + x:StyleSheet.positionValue[Constants.X]; y:StyleSheet.positionValue[Constants.Y]; width:StyleSheet.positionValue[Constants.WIDTH]; height:StyleSheet.positionValue[Constants.HEIGHT];color:StyleSheet.positionValue[Constants.TEXTCOLOR];styleColor:StyleSheet.positionValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.positionValue[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true wrapMode: Text.WordWrap @@ -139,7 +140,7 @@ HMIMenu { } Text { - x:StyleSheet.destinationTitle[StyleSheet.X]; y:StyleSheet.destinationTitle[StyleSheet.Y]; width:StyleSheet.destinationTitle[StyleSheet.WIDTH]; height:StyleSheet.destinationTitle[StyleSheet.HEIGHT];color:StyleSheet.destinationTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.destinationTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.destinationTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.destinationTitle[Constants.X]; y:StyleSheet.destinationTitle[Constants.Y]; width:StyleSheet.destinationTitle[Constants.WIDTH]; height:StyleSheet.destinationTitle[Constants.HEIGHT];color:StyleSheet.destinationTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.destinationTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.destinationTitle[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true id:destinationTitle @@ -147,14 +148,14 @@ HMIMenu { } Text { - x:StyleSheet.destinationValue[StyleSheet.X]; y:StyleSheet.destinationValue[StyleSheet.Y]; width:StyleSheet.destinationValue[StyleSheet.WIDTH]; height:StyleSheet.destinationValue[StyleSheet.HEIGHT];color:StyleSheet.destinationValue[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.destinationValue[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.destinationValue[StyleSheet.PIXELSIZE]; + x:StyleSheet.destinationValue[Constants.X]; y:StyleSheet.destinationValue[Constants.Y]; width:StyleSheet.destinationValue[Constants.WIDTH]; height:StyleSheet.destinationValue[Constants.HEIGHT];color:StyleSheet.destinationValue[Constants.TEXTCOLOR];styleColor:StyleSheet.destinationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.destinationValue[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true wrapMode: Text.WordWrap id:destinationValue } - StdButton { source:StyleSheet.show_location_on_map[StyleSheet.SOURCE]; x:StyleSheet.show_location_on_map[StyleSheet.X]; y:StyleSheet.show_location_on_map[StyleSheet.Y]; width:StyleSheet.show_location_on_map[StyleSheet.WIDTH]; height:StyleSheet.show_location_on_map[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.show_location_on_map[Constants.SOURCE]; x:StyleSheet.show_location_on_map[Constants.X]; y:StyleSheet.show_location_on_map[Constants.Y]; width:StyleSheet.show_location_on_map[Constants.WIDTH]; height:StyleSheet.show_location_on_map[Constants.HEIGHT]; id:show; disabled:false; next:destination; prev:back; explode:false; onClicked: { Genivi.data['show_position']=new Array; @@ -166,7 +167,7 @@ HMIMenu { } } - StdButton { source:StyleSheet.set_as_position[StyleSheet.SOURCE]; x:StyleSheet.set_as_position[StyleSheet.X]; y:StyleSheet.set_as_position[StyleSheet.Y]; width:StyleSheet.set_as_position[StyleSheet.WIDTH]; height:StyleSheet.set_as_position[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.set_as_position[Constants.SOURCE]; x:StyleSheet.set_as_position[Constants.X]; y:StyleSheet.set_as_position[Constants.Y]; width:StyleSheet.set_as_position[Constants.WIDTH]; height:StyleSheet.set_as_position[Constants.HEIGHT]; id:position; disabled:false; next:calculate; prev:destination; explode:false; onClicked: { Genivi.data['position']=new Array; @@ -179,7 +180,7 @@ HMIMenu { } } - StdButton { source:StyleSheet.set_as_destination[StyleSheet.SOURCE]; x:StyleSheet.set_as_destination[StyleSheet.X]; y:StyleSheet.set_as_destination[StyleSheet.Y]; width:StyleSheet.set_as_destination[StyleSheet.WIDTH]; height:StyleSheet.set_as_destination[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.set_as_destination[Constants.SOURCE]; x:StyleSheet.set_as_destination[Constants.X]; y:StyleSheet.set_as_destination[Constants.Y]; width:StyleSheet.set_as_destination[Constants.WIDTH]; height:StyleSheet.set_as_destination[Constants.HEIGHT]; id:destination; disabled:false; next:position; prev:show; explode:false; onClicked: { Genivi.data['destination']=new Array; @@ -193,7 +194,7 @@ HMIMenu { } } - StdButton { source:StyleSheet.route[StyleSheet.SOURCE]; x:StyleSheet.route[StyleSheet.X]; y:StyleSheet.route[StyleSheet.Y]; width:StyleSheet.route[StyleSheet.WIDTH]; height:StyleSheet.route[StyleSheet.HEIGHT];textColor:StyleSheet.routeText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.routeText[StyleSheet.PIXELSIZE]; + StdButton { source:StyleSheet.route[Constants.SOURCE]; x:StyleSheet.route[Constants.X]; y:StyleSheet.route[Constants.Y]; width:StyleSheet.route[Constants.WIDTH]; height:StyleSheet.route[Constants.HEIGHT];textColor:StyleSheet.routeText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.routeText[Constants.PIXELSIZE]; id:calculate; text: Genivi.gettext("Route"); explode:false; onClicked: { var dest=latlon_to_map(Genivi.data['destination']); @@ -208,7 +209,7 @@ HMIMenu { disabled:!(Genivi.data['position'] && Genivi.data['destination']); next:calculate_curr; prev:position } - StdButton { source:StyleSheet.calculate_curr[StyleSheet.SOURCE]; x:StyleSheet.calculate_curr[StyleSheet.X]; y:StyleSheet.calculate_curr[StyleSheet.Y]; width:StyleSheet.calculate_curr[StyleSheet.WIDTH]; height:StyleSheet.calculate_curr[StyleSheet.HEIGHT];textColor:StyleSheet.calculate_currText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.calculate_currText[StyleSheet.PIXELSIZE]; + StdButton { source:StyleSheet.calculate_curr[Constants.SOURCE]; x:StyleSheet.calculate_curr[Constants.X]; y:StyleSheet.calculate_curr[Constants.Y]; width:StyleSheet.calculate_curr[Constants.WIDTH]; height:StyleSheet.calculate_curr[Constants.HEIGHT];textColor:StyleSheet.calculate_currText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.calculate_currText[Constants.PIXELSIZE]; id:calculate_curr; text: Genivi.gettext("GoTo"); explode:false; onClicked: { var dest=latlon_to_map(Genivi.data['destination']); @@ -222,7 +223,7 @@ HMIMenu { disabled:true; next:back; prev:calculate } - StdButton { source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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"); onClicked: { disconnectSignals(); diff --git a/src/hmi/qml/NavigationSearch.qml b/src/hmi/qml/NavigationSearch.qml index 9c33608..4ad1226 100644 --- a/src/hmi/qml/NavigationSearch.qml +++ b/src/hmi/qml/NavigationSearch.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-search-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -44,35 +45,35 @@ HMIMenu { } HMIBgImage { - image:StyleSheet.navigation_search_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_search_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.searchTitle[StyleSheet.X]; y:StyleSheet.searchTitle[StyleSheet.Y]; width:StyleSheet.searchTitle[StyleSheet.WIDTH]; height:StyleSheet.searchTitle[StyleSheet.HEIGHT];color:StyleSheet.searchTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.searchTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.searchTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.searchTitle[Constants.X]; y:StyleSheet.searchTitle[Constants.Y]; width:StyleSheet.searchTitle[Constants.WIDTH]; height:StyleSheet.searchTitle[Constants.HEIGHT];color:StyleSheet.searchTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.searchTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.searchTitle[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true id: searchTitle text: Genivi.gettext("SearchMode") } - StdButton { source:StyleSheet.search_by_address[StyleSheet.SOURCE]; x:StyleSheet.search_by_address[StyleSheet.X]; y:StyleSheet.search_by_address[StyleSheet.Y]; width:StyleSheet.search_by_address[StyleSheet.WIDTH]; height:StyleSheet.search_by_address[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.search_by_address[Constants.SOURCE]; x:StyleSheet.search_by_address[Constants.X]; y:StyleSheet.search_by_address[Constants.Y]; width:StyleSheet.search_by_address[Constants.WIDTH]; height:StyleSheet.search_by_address[Constants.HEIGHT]; id:search_by_address; explode:false; next:search_by_coordinates; prev:back; onClicked: { Genivi.preloadMode=true; pageOpen("NavigationSearchAddress"); } } - StdButton { source:StyleSheet.search_by_coordinates[StyleSheet.SOURCE]; x:StyleSheet.search_by_coordinates[StyleSheet.X]; y:StyleSheet.search_by_coordinates[StyleSheet.Y]; width:StyleSheet.search_by_coordinates[StyleSheet.WIDTH]; height:StyleSheet.search_by_coordinates[StyleSheet.HEIGHT]; + 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} - StdButton { source:StyleSheet.search_by_poi[StyleSheet.SOURCE]; x:StyleSheet.search_by_poi[StyleSheet.X]; y:StyleSheet.search_by_poi[StyleSheet.Y]; width:StyleSheet.search_by_poi[StyleSheet.WIDTH]; height:StyleSheet.search_by_poi[StyleSheet.HEIGHT]; + 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} - StdButton { source:StyleSheet.search_by_freetext[StyleSheet.SOURCE]; x:StyleSheet.search_by_freetext[StyleSheet.X]; y:StyleSheet.search_by_freetext[StyleSheet.Y]; width:StyleSheet.search_by_freetext[StyleSheet.WIDTH]; height:StyleSheet.search_by_freetext[StyleSheet.HEIGHT]; + 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} - StdButton { source:StyleSheet.history[StyleSheet.SOURCE]; x:StyleSheet.history[StyleSheet.X]; y:StyleSheet.history[StyleSheet.Y]; width:StyleSheet.history[StyleSheet.WIDTH]; height:StyleSheet.history[StyleSheet.HEIGHT];textColor:StyleSheet.historyText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.historyText[StyleSheet.PIXELSIZE]; + 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"} - StdButton { source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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";} } } diff --git a/src/hmi/qml/NavigationSearchAddress.qml b/src/hmi/qml/NavigationSearchAddress.qml index 965b6e4..7a8234b 100644 --- a/src/hmi/qml/NavigationSearchAddress.qml +++ b/src/hmi/qml/NavigationSearchAddress.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-search-address-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -216,19 +217,19 @@ HMIMenu { } HMIBgImage { - image:StyleSheet.navigation_search_by_address_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_search_by_address_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} id: content Text { - x:StyleSheet.countryTitle[StyleSheet.X]; y:StyleSheet.countryTitle[StyleSheet.Y]; width:StyleSheet.countryTitle[StyleSheet.WIDTH]; height:StyleSheet.countryTitle[StyleSheet.HEIGHT];color:StyleSheet.countryTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.countryTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.countryTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.countryTitle[Constants.X]; y:StyleSheet.countryTitle[Constants.Y]; width:StyleSheet.countryTitle[Constants.WIDTH]; height:StyleSheet.countryTitle[Constants.HEIGHT];color:StyleSheet.countryTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.countryTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.countryTitle[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true; id: countryTitle text: Genivi.gettext("Country"); } EntryField { - x:StyleSheet.countryValue[StyleSheet.X]; y:StyleSheet.countryValue[StyleSheet.Y]; width: StyleSheet.countryValue[StyleSheet.WIDTH]; height: StyleSheet.countryValue[StyleSheet.HEIGHT]; + x:StyleSheet.countryValue[Constants.X]; y:StyleSheet.countryValue[Constants.Y]; width: StyleSheet.countryValue[Constants.WIDTH]; height: StyleSheet.countryValue[Constants.HEIGHT]; id: countryValue criterion: Genivi.NAVIGATIONCORE_COUNTRY globaldata: 'countryValue' @@ -238,14 +239,14 @@ HMIMenu { onLeave:{menu.leave(0)} } Text { - x:StyleSheet.streetTitle[StyleSheet.X]; y:StyleSheet.streetTitle[StyleSheet.Y]; width:StyleSheet.streetTitle[StyleSheet.WIDTH]; height:StyleSheet.streetTitle[StyleSheet.HEIGHT];color:StyleSheet.streetTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.streetTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.streetTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.streetTitle[Constants.X]; y:StyleSheet.streetTitle[Constants.Y]; width:StyleSheet.streetTitle[Constants.WIDTH]; height:StyleSheet.streetTitle[Constants.HEIGHT];color:StyleSheet.streetTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.streetTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.streetTitle[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true; id:streetTitle text: Genivi.gettext("Street"); } EntryField { - x:StyleSheet.streetValue[StyleSheet.X]; y:StyleSheet.streetValue[StyleSheet.Y]; width: StyleSheet.streetValue[StyleSheet.WIDTH]; height: StyleSheet.streetValue[StyleSheet.HEIGHT]; + x:StyleSheet.streetValue[Constants.X]; y:StyleSheet.streetValue[Constants.Y]; width: StyleSheet.streetValue[Constants.WIDTH]; height: StyleSheet.streetValue[Constants.HEIGHT]; id:streetValue criterion: Genivi.NAVIGATIONCORE_STREET globaldata: 'streetValue' @@ -255,14 +256,14 @@ HMIMenu { onLeave:{menu.leave(0)} } Text { - x:StyleSheet.cityTitle[StyleSheet.X]; y:StyleSheet.cityTitle[StyleSheet.Y]; width:StyleSheet.cityTitle[StyleSheet.WIDTH]; height:StyleSheet.cityTitle[StyleSheet.HEIGHT];color:StyleSheet.cityTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.cityTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.cityTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.cityTitle[Constants.X]; y:StyleSheet.cityTitle[Constants.Y]; width:StyleSheet.cityTitle[Constants.WIDTH]; height:StyleSheet.cityTitle[Constants.HEIGHT];color:StyleSheet.cityTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.cityTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.cityTitle[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true; id:cityTitle text: Genivi.gettext("City"); } EntryField { - x:StyleSheet.cityValue[StyleSheet.X]; y:StyleSheet.cityValue[StyleSheet.Y]; width: StyleSheet.cityValue[StyleSheet.WIDTH]; height: StyleSheet.cityValue[StyleSheet.HEIGHT]; + x:StyleSheet.cityValue[Constants.X]; y:StyleSheet.cityValue[Constants.Y]; width: StyleSheet.cityValue[Constants.WIDTH]; height: StyleSheet.cityValue[Constants.HEIGHT]; id:cityValue criterion: Genivi.NAVIGATIONCORE_CITY globaldata: 'cityValue' @@ -272,14 +273,14 @@ HMIMenu { onLeave:{menu.leave(0)} } Text { - x:StyleSheet.numberTitle[StyleSheet.X]; y:StyleSheet.numberTitle[StyleSheet.Y]; width:StyleSheet.numberTitle[StyleSheet.WIDTH]; height:StyleSheet.numberTitle[StyleSheet.HEIGHT];color:StyleSheet.numberTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.numberTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.numberTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.numberTitle[Constants.X]; y:StyleSheet.numberTitle[Constants.Y]; width:StyleSheet.numberTitle[Constants.WIDTH]; height:StyleSheet.numberTitle[Constants.HEIGHT];color:StyleSheet.numberTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.numberTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.numberTitle[Constants.PIXELSIZE]; style: Text.Sunken; smooth: true; id:numberTitle text: Genivi.gettext("Number"); } EntryField { - x:StyleSheet.numberValue[StyleSheet.X]; y:StyleSheet.numberValue[StyleSheet.Y]; width: StyleSheet.numberValue[StyleSheet.WIDTH]; height: StyleSheet.numberValue[StyleSheet.HEIGHT]; + x:StyleSheet.numberValue[Constants.X]; y:StyleSheet.numberValue[Constants.Y]; width: StyleSheet.numberValue[Constants.WIDTH]; height: StyleSheet.numberValue[Constants.HEIGHT]; id:numberValue criterion: Genivi.NAVIGATIONCORE_HOUSENUMBER globaldata: 'numberValue' @@ -289,7 +290,7 @@ HMIMenu { onLeave:{menu.leave(0)} } - StdButton { source:StyleSheet.ok[StyleSheet.SOURCE]; x:StyleSheet.ok[StyleSheet.X]; y:StyleSheet.ok[StyleSheet.Y]; width:StyleSheet.ok[StyleSheet.WIDTH]; height:StyleSheet.ok[StyleSheet.HEIGHT];textColor:StyleSheet.okText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.okText[StyleSheet.PIXELSIZE]; + StdButton { source:StyleSheet.ok[Constants.SOURCE]; x:StyleSheet.ok[Constants.X]; y:StyleSheet.ok[Constants.Y]; width:StyleSheet.ok[Constants.WIDTH]; height:StyleSheet.ok[Constants.HEIGHT];textColor:StyleSheet.okText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.okText[Constants.PIXELSIZE]; id:ok next:back prev:numberValue @@ -317,7 +318,7 @@ HMIMenu { } } - StdButton { source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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");} } diff --git a/src/hmi/qml/NavigationSearchCoordinates.qml b/src/hmi/qml/NavigationSearchCoordinates.qml index c144e29..d1d1068 100644 --- a/src/hmi/qml/NavigationSearchCoordinates.qml +++ b/src/hmi/qml/NavigationSearchCoordinates.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-search-coordinates-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -52,18 +53,18 @@ HMIMenu { HMIBgImage { - image:StyleSheet.navigation_search_by_coordinates_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_search_by_coordinates_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.latitudeTitle[StyleSheet.X]; y:StyleSheet.latitudeTitle[StyleSheet.Y]; width:StyleSheet.latitudeTitle[StyleSheet.WIDTH]; height:StyleSheet.latitudeTitle[StyleSheet.HEIGHT];color:StyleSheet.latitudeTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.latitudeTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.latitudeTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.latitudeTitle[Constants.X]; y:StyleSheet.latitudeTitle[Constants.Y]; width:StyleSheet.latitudeTitle[Constants.WIDTH]; height:StyleSheet.latitudeTitle[Constants.HEIGHT];color:StyleSheet.latitudeTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.latitudeTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.latitudeTitle[Constants.PIXELSIZE]; id:latitudeTitle; style: Text.Sunken; smooth: true; text: Genivi.gettext("Latitude"); } EntryField { - x:StyleSheet.latitudeValue[StyleSheet.X]; y:StyleSheet.latitudeValue[StyleSheet.Y]; width: StyleSheet.latitudeValue[StyleSheet.WIDTH]; height: StyleSheet.latitudeValue[StyleSheet.HEIGHT]; + x:StyleSheet.latitudeValue[Constants.X]; y:StyleSheet.latitudeValue[Constants.Y]; width: StyleSheet.latitudeValue[Constants.WIDTH]; height: StyleSheet.latitudeValue[Constants.HEIGHT]; id: latitudeValue globaldata: 'lat' textfocus: true @@ -72,14 +73,14 @@ HMIMenu { onLeave:{menu.leave(0)} } Text { - x:StyleSheet.longitudeTitle[StyleSheet.X]; y:StyleSheet.longitudeTitle[StyleSheet.Y]; width:StyleSheet.longitudeTitle[StyleSheet.WIDTH]; height:StyleSheet.longitudeTitle[StyleSheet.HEIGHT];color:StyleSheet.longitudeTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.longitudeTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.longitudeTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.longitudeTitle[Constants.X]; y:StyleSheet.longitudeTitle[Constants.Y]; width:StyleSheet.longitudeTitle[Constants.WIDTH]; height:StyleSheet.longitudeTitle[Constants.HEIGHT];color:StyleSheet.longitudeTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.longitudeTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.longitudeTitle[Constants.PIXELSIZE]; id:longitudeTitle; style: Text.Sunken; smooth: true; text: Genivi.gettext("Longitude"); } EntryField { - x:StyleSheet.longitudeValue[StyleSheet.X]; y:StyleSheet.longitudeValue[StyleSheet.Y]; width: StyleSheet.longitudeValue[StyleSheet.WIDTH]; height: StyleSheet.longitudeValue[StyleSheet.HEIGHT]; + x:StyleSheet.longitudeValue[Constants.X]; y:StyleSheet.longitudeValue[Constants.Y]; width: StyleSheet.longitudeValue[Constants.WIDTH]; height: StyleSheet.longitudeValue[Constants.HEIGHT]; id: longitudeValue globaldata: 'lon' next: ok @@ -87,7 +88,7 @@ HMIMenu { onLeave:{menu.leave(0)} } StdButton { - source:StyleSheet.ok[StyleSheet.SOURCE]; x:StyleSheet.ok[StyleSheet.X]; y:StyleSheet.ok[StyleSheet.Y]; width:StyleSheet.ok[StyleSheet.WIDTH]; height:StyleSheet.ok[StyleSheet.HEIGHT];textColor:StyleSheet.okText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.okText[StyleSheet.PIXELSIZE]; + source:StyleSheet.ok[Constants.SOURCE]; x:StyleSheet.ok[Constants.X]; y:StyleSheet.ok[Constants.Y]; width:StyleSheet.ok[Constants.WIDTH]; height:StyleSheet.ok[Constants.HEIGHT];textColor:StyleSheet.okText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.okText[Constants.PIXELSIZE]; id:ok next:back prev:longitudeValue @@ -101,7 +102,7 @@ HMIMenu { } } StdButton { - source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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:latitudeValue; prev:ok; onClicked:{ Genivi.data['lat']=''; diff --git a/src/hmi/qml/NavigationSearchFreeText.qml b/src/hmi/qml/NavigationSearchFreeText.qml index 52d76ee..205badd 100644 --- a/src/hmi/qml/NavigationSearchFreeText.qml +++ b/src/hmi/qml/NavigationSearchFreeText.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-search-freetext-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -136,18 +137,18 @@ HMIMenu { } HMIBgImage { - image:StyleSheet.navigation_search_by_freetext_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_search_by_freetext_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.textTitle[StyleSheet.X]; y:StyleSheet.textTitle[StyleSheet.Y]; width:StyleSheet.textTitle[StyleSheet.WIDTH]; height:StyleSheet.textTitle[StyleSheet.HEIGHT];color:StyleSheet.textTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.textTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.textTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.textTitle[Constants.X]; y:StyleSheet.textTitle[Constants.Y]; width:StyleSheet.textTitle[Constants.WIDTH]; height:StyleSheet.textTitle[Constants.HEIGHT];color:StyleSheet.textTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.textTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.textTitle[Constants.PIXELSIZE]; id:textTitle; style: Text.Sunken; smooth: true; text: Genivi.gettext("Text"); } EntryField { - x:StyleSheet.textValue[StyleSheet.X]; y:StyleSheet.textValue[StyleSheet.Y]; width: StyleSheet.textValue[StyleSheet.WIDTH]; height: StyleSheet.textValue[StyleSheet.HEIGHT]; + x:StyleSheet.textValue[Constants.X]; y:StyleSheet.textValue[Constants.Y]; width: StyleSheet.textValue[Constants.WIDTH]; height: StyleSheet.textValue[Constants.HEIGHT]; id: textValue criterion: Genivi.NAVIGATIONCORE_FULL_ADDRESS globaldata: 'location_input' @@ -157,7 +158,7 @@ HMIMenu { onLeave:{menu.leave(0)} } StdButton { - source:StyleSheet.ok[StyleSheet.SOURCE]; x:StyleSheet.ok[StyleSheet.X]; y:StyleSheet.ok[StyleSheet.Y]; width:StyleSheet.ok[StyleSheet.WIDTH]; height:StyleSheet.ok[StyleSheet.HEIGHT];textColor:StyleSheet.okText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.okText[StyleSheet.PIXELSIZE]; + source:StyleSheet.ok[Constants.SOURCE]; x:StyleSheet.ok[Constants.X]; y:StyleSheet.ok[Constants.Y]; width:StyleSheet.ok[Constants.WIDTH]; height:StyleSheet.ok[Constants.HEIGHT];textColor:StyleSheet.okText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.okText[Constants.PIXELSIZE]; id:ok text:Genivi.gettext("Ok") next:back @@ -175,7 +176,7 @@ HMIMenu { } } StdButton { - source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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");} } diff --git a/src/hmi/qml/NavigationSearchHistory.qml b/src/hmi/qml/NavigationSearchHistory.qml index 05cfc8a..6c6cf76 100644 --- a/src/hmi/qml/NavigationSearchHistory.qml +++ b/src/hmi/qml/NavigationSearchHistory.qml @@ -30,6 +30,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import lbs.plugin.dbusif 1.0 HMIMenu { diff --git a/src/hmi/qml/NavigationSettings.qml b/src/hmi/qml/NavigationSettings.qml index 0a71a56..7aed90a 100644 --- a/src/hmi/qml/NavigationSettings.qml +++ b/src/hmi/qml/NavigationSettings.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-settings-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -250,32 +251,32 @@ HMIMenu { HMIBgImage { id: content - image:StyleSheet.navigation_settings_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_settings_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.simulationTitle[StyleSheet.X]; y:StyleSheet.simulationTitle[StyleSheet.Y]; width:StyleSheet.simulationTitle[StyleSheet.WIDTH]; height:StyleSheet.simulationTitle[StyleSheet.HEIGHT];color:StyleSheet.simulationTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.simulationTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.simulationTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.simulationTitle[Constants.X]; y:StyleSheet.simulationTitle[Constants.Y]; width:StyleSheet.simulationTitle[Constants.WIDTH]; height:StyleSheet.simulationTitle[Constants.HEIGHT];color:StyleSheet.simulationTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.simulationTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.simulationTitle[Constants.PIXELSIZE]; id:simulationTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("Simulation") } Text { - x:StyleSheet.speedTitle[StyleSheet.X]; y:StyleSheet.speedTitle[StyleSheet.Y]; width:StyleSheet.speedTitle[StyleSheet.WIDTH]; height:StyleSheet.speedTitle[StyleSheet.HEIGHT];color:StyleSheet.speedTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.speedTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.speedTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.speedTitle[Constants.X]; y:StyleSheet.speedTitle[Constants.Y]; width:StyleSheet.speedTitle[Constants.WIDTH]; height:StyleSheet.speedTitle[Constants.HEIGHT];color:StyleSheet.speedTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.speedTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.speedTitle[Constants.PIXELSIZE]; id:speedTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("Speed") } Text { - x:StyleSheet.speedValue[StyleSheet.X]; y:StyleSheet.speedValue[StyleSheet.Y]; width:StyleSheet.speedValue[StyleSheet.WIDTH]; height:StyleSheet.speedValue[StyleSheet.HEIGHT];color:StyleSheet.speedValue[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.speedValue[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.speedValue[StyleSheet.PIXELSIZE]; + x:StyleSheet.speedValue[Constants.X]; y:StyleSheet.speedValue[Constants.Y]; width:StyleSheet.speedValue[Constants.WIDTH]; height:StyleSheet.speedValue[Constants.HEIGHT];color:StyleSheet.speedValue[Constants.TEXTCOLOR];styleColor:StyleSheet.speedValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.speedValue[Constants.PIXELSIZE]; id:speedValue style: Text.Sunken; smooth: true text: "" } - StdButton {source:StyleSheet.speed_down[StyleSheet.SOURCE]; x:StyleSheet.speed_down[StyleSheet.X]; y:StyleSheet.speed_down[StyleSheet.Y]; width:StyleSheet.speed_down[StyleSheet.WIDTH]; height:StyleSheet.speed_down[StyleSheet.HEIGHT]; + StdButton {source:StyleSheet.speed_down[Constants.SOURCE]; x:StyleSheet.speed_down[Constants.X]; y:StyleSheet.speed_down[Constants.Y]; width:StyleSheet.speed_down[Constants.WIDTH]; height:StyleSheet.speed_down[Constants.HEIGHT]; id:speed_down; explode:false; disabled:false; next:back; prev:back; onClicked: { @@ -286,7 +287,7 @@ HMIMenu { Genivi.mapmatch_message(dbusIf,"SetSimulationSpeed",["uint8",getDBusSpeedValue(speedValueSent)]); } } - StdButton {source:StyleSheet.speed_up[StyleSheet.SOURCE]; x:StyleSheet.speed_up[StyleSheet.X]; y:StyleSheet.speed_up[StyleSheet.Y]; width:StyleSheet.speed_up[StyleSheet.WIDTH]; height:StyleSheet.speed_up[StyleSheet.HEIGHT]; + StdButton {source:StyleSheet.speed_up[Constants.SOURCE]; x:StyleSheet.speed_up[Constants.X]; y:StyleSheet.speed_up[Constants.Y]; width:StyleSheet.speed_up[Constants.WIDTH]; height:StyleSheet.speed_up[Constants.HEIGHT]; id:speed_up; explode:false; disabled:false; next:back; prev:back; onClicked: { @@ -299,14 +300,14 @@ HMIMenu { } Text { - x:StyleSheet.modeTitle[StyleSheet.X]; y:StyleSheet.modeTitle[StyleSheet.Y]; width:StyleSheet.modeTitle[StyleSheet.WIDTH]; height:StyleSheet.modeTitle[StyleSheet.HEIGHT];color:StyleSheet.modeTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.modeTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.modeTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.modeTitle[Constants.X]; y:StyleSheet.modeTitle[Constants.Y]; width:StyleSheet.modeTitle[Constants.WIDTH]; height:StyleSheet.modeTitle[Constants.HEIGHT];color:StyleSheet.modeTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.modeTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.modeTitle[Constants.PIXELSIZE]; id:modeTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("Mode") } - StdButton { x:StyleSheet.simulation_on[StyleSheet.X]; y:StyleSheet.simulation_on[StyleSheet.Y]; width:StyleSheet.simulation_on[StyleSheet.WIDTH]; height:StyleSheet.simulation_on[StyleSheet.HEIGHT]; + StdButton { x:StyleSheet.simulation_on[Constants.X]; y:StyleSheet.simulation_on[Constants.Y]; width:StyleSheet.simulation_on[Constants.WIDTH]; height:StyleSheet.simulation_on[Constants.HEIGHT]; id:on_off; next:back; prev:back; explode:false; disabled:false; property int status: 0; function setState(name) @@ -314,12 +315,12 @@ HMIMenu { if (name=="ON") { status=1; - source=StyleSheet.simulation_off[StyleSheet.SOURCE]; + source=StyleSheet.simulation_off[Constants.SOURCE]; } else { status=0; - source=StyleSheet.simulation_on[StyleSheet.SOURCE]; + source=StyleSheet.simulation_on[Constants.SOURCE]; } } onClicked: @@ -339,7 +340,7 @@ HMIMenu { } } - StdButton { x:StyleSheet.play[StyleSheet.X]; y:StyleSheet.play[StyleSheet.Y]; width:StyleSheet.play[StyleSheet.WIDTH]; height:StyleSheet.play[StyleSheet.HEIGHT]; + StdButton { x:StyleSheet.play[Constants.X]; y:StyleSheet.play[Constants.Y]; width:StyleSheet.play[Constants.WIDTH]; height:StyleSheet.play[Constants.HEIGHT]; id:simu_mode; next:back; prev:back; explode:false; disabled:false; property int status: 0; function setState(name) @@ -347,7 +348,7 @@ HMIMenu { if (name=="FREE") { status=0; - source=StyleSheet.play[StyleSheet.SOURCE]; + source=StyleSheet.play[Constants.SOURCE]; disabled=true; } else @@ -355,7 +356,7 @@ HMIMenu { if (name=="PLAY") { status=1; - source=StyleSheet.pause[StyleSheet.SOURCE]; + source=StyleSheet.pause[Constants.SOURCE]; enabled=true; disabled=false; } @@ -364,7 +365,7 @@ HMIMenu { if (name=="PAUSE") { status=2; - source=StyleSheet.play[StyleSheet.SOURCE]; + source=StyleSheet.play[Constants.SOURCE]; enabled=true; disabled=false; } @@ -389,13 +390,13 @@ HMIMenu { } } - StdButton { source:StyleSheet.preferences[StyleSheet.SOURCE]; x:StyleSheet.preferences[StyleSheet.X]; y:StyleSheet.preferences[StyleSheet.Y]; width:StyleSheet.preferences[StyleSheet.WIDTH]; height:StyleSheet.preferences[StyleSheet.HEIGHT];textColor:StyleSheet.preferencesText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.preferencesText[StyleSheet.PIXELSIZE]; + 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"} - StdButton {source:StyleSheet.languageAndUnit[StyleSheet.SOURCE]; x:StyleSheet.languageAndUnit[StyleSheet.X]; y:StyleSheet.languageAndUnit[StyleSheet.Y]; width:StyleSheet.languageAndUnit[StyleSheet.WIDTH]; height:StyleSheet.languageAndUnit[StyleSheet.HEIGHT];textColor:StyleSheet.languageAndUnitText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.languageAndUnitText[StyleSheet.PIXELSIZE]; + 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"} - StdButton { source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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:preferences; prev:languageAndUnit; onClicked:{leave(); pageOpen("MainMenu");} } diff --git a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml index 720ffb0..9f86526 100644 --- a/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml +++ b/src/hmi/qml/NavigationSettingsLanguageAndUnits.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-settings-language-and-units-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -133,47 +134,47 @@ HMIMenu { HMIBgImage { id: content - image:StyleSheet.navigation_settings_language_and_units_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_settings_language_and_units_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.languagesTitle[StyleSheet.X]; y:StyleSheet.languagesTitle[StyleSheet.Y]; width:StyleSheet.languagesTitle[StyleSheet.WIDTH]; height:StyleSheet.languagesTitle[StyleSheet.HEIGHT];color:StyleSheet.languagesTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.languagesTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.languagesTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.languagesTitle[Constants.X]; y:StyleSheet.languagesTitle[Constants.Y]; width:StyleSheet.languagesTitle[Constants.WIDTH]; height:StyleSheet.languagesTitle[Constants.HEIGHT];color:StyleSheet.languagesTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.languagesTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.languagesTitle[Constants.PIXELSIZE]; id:languagesTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("Language") } StdButton { objectName:"fra_FRA"; - source:StyleSheet.french_flag[StyleSheet.SOURCE]; x:StyleSheet.french_flag[StyleSheet.X]; y:StyleSheet.french_flag[StyleSheet.Y]; width:StyleSheet.french_flag[StyleSheet.WIDTH]; height:StyleSheet.french_flag[StyleSheet.HEIGHT]; + source:StyleSheet.french_flag[Constants.SOURCE]; x:StyleSheet.french_flag[Constants.X]; y:StyleSheet.french_flag[Constants.Y]; width:StyleSheet.french_flag[Constants.WIDTH]; height:StyleSheet.french_flag[Constants.HEIGHT]; id:fra_FRA; disabled:false; next:deu_DEU; prev:back; explode:false; onClicked: {setLocale("fra","FRA");}} StdButton { objectName:"deu_DEU"; - source:StyleSheet.german_flag[StyleSheet.SOURCE]; x:StyleSheet.german_flag[StyleSheet.X]; y:StyleSheet.german_flag[StyleSheet.Y]; width:StyleSheet.german_flag[StyleSheet.WIDTH]; height:StyleSheet.german_flag[StyleSheet.HEIGHT]; + source:StyleSheet.german_flag[Constants.SOURCE]; x:StyleSheet.german_flag[Constants.X]; y:StyleSheet.german_flag[Constants.Y]; width:StyleSheet.german_flag[Constants.WIDTH]; height:StyleSheet.german_flag[Constants.HEIGHT]; id:deu_DEU; disabled:false; next:eng_USA; prev:fra_FRA; explode:false; onClicked: {setLocale("deu","DEU");}} StdButton { objectName:"eng_USA"; - source:StyleSheet.usa_flag[StyleSheet.SOURCE]; x:StyleSheet.usa_flag[StyleSheet.X]; y:StyleSheet.usa_flag[StyleSheet.Y]; width:StyleSheet.usa_flag[StyleSheet.WIDTH]; height:StyleSheet.usa_flag[StyleSheet.HEIGHT]; + source:StyleSheet.usa_flag[Constants.SOURCE]; x:StyleSheet.usa_flag[Constants.X]; y:StyleSheet.usa_flag[Constants.Y]; width:StyleSheet.usa_flag[Constants.WIDTH]; height:StyleSheet.usa_flag[Constants.HEIGHT]; id:eng_USA; disabled:false; next:jpn_JPN; prev:deu_DEU; explode:false; onClicked: {setLocale("eng","USA");}} StdButton { objectName:"jpn_JPN"; - source:StyleSheet.japanese_flag[StyleSheet.SOURCE]; x:StyleSheet.japanese_flag[StyleSheet.X]; y:StyleSheet.japanese_flag[StyleSheet.Y]; width:StyleSheet.japanese_flag[StyleSheet.WIDTH]; height:StyleSheet.japanese_flag[StyleSheet.HEIGHT]; + source:StyleSheet.japanese_flag[Constants.SOURCE]; x:StyleSheet.japanese_flag[Constants.X]; y:StyleSheet.japanese_flag[Constants.Y]; width:StyleSheet.japanese_flag[Constants.WIDTH]; height:StyleSheet.japanese_flag[Constants.HEIGHT]; id:jpn_JPN; disabled:false; next:back; prev:eng_USA; explode:false; onClicked: {setLocale("jpn","JPN");}} Text { - x:StyleSheet.unitsTitle[StyleSheet.X]; y:StyleSheet.unitsTitle[StyleSheet.Y]; width:StyleSheet.unitsTitle[StyleSheet.WIDTH]; height:StyleSheet.unitsTitle[StyleSheet.HEIGHT];color:StyleSheet.unitsTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.unitsTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.unitsTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.unitsTitle[Constants.X]; y:StyleSheet.unitsTitle[Constants.Y]; width:StyleSheet.unitsTitle[Constants.WIDTH]; height:StyleSheet.unitsTitle[Constants.HEIGHT];color:StyleSheet.unitsTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.unitsTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.unitsTitle[Constants.PIXELSIZE]; id:unitsTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("Units") } - StdButton { source:StyleSheet.unit_km[StyleSheet.SOURCE]; x:StyleSheet.unit_km[StyleSheet.X]; y:StyleSheet.unit_km[StyleSheet.Y]; width:StyleSheet.unit_km[StyleSheet.WIDTH]; height:StyleSheet.unit_km[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.unit_km[Constants.SOURCE]; x:StyleSheet.unit_km[Constants.X]; y:StyleSheet.unit_km[Constants.Y]; width:StyleSheet.unit_km[Constants.WIDTH]; height:StyleSheet.unit_km[Constants.HEIGHT]; id:unit_km; explode:false; disabled:false; next:back; prev:back; onClicked: { setUnits(Genivi.NAVIGATIONCORE_KM,Genivi.MAPVIEWER_KM);} } - StdButton { source:StyleSheet.unit_mile[StyleSheet.SOURCE]; x:StyleSheet.unit_mile[StyleSheet.X]; y:StyleSheet.unit_mile[StyleSheet.Y]; width:StyleSheet.unit_mile[StyleSheet.WIDTH]; height:StyleSheet.unit_mile[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.unit_mile[Constants.SOURCE]; x:StyleSheet.unit_mile[Constants.X]; y:StyleSheet.unit_mile[Constants.Y]; width:StyleSheet.unit_mile[Constants.WIDTH]; height:StyleSheet.unit_mile[Constants.HEIGHT]; id:unit_mile; explode:false; disabled:false; next:back; prev:back; onClicked: { setUnits(Genivi.NAVIGATIONCORE_MILE,Genivi.MAPVIEWER_MILE);} } - StdButton { source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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"} } diff --git a/src/hmi/qml/NavigationSettingsPreferences.qml b/src/hmi/qml/NavigationSettingsPreferences.qml index df04b75..463838f 100644 --- a/src/hmi/qml/NavigationSettingsPreferences.qml +++ b/src/hmi/qml/NavigationSettingsPreferences.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/navigation-settings-preference-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 import lbs.plugin.preference 1.0 @@ -155,10 +156,10 @@ HMIMenu { HMIBgImage { id: content - image:StyleSheet.navigation_settings_preference_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.navigation_settings_preference_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.costModelTitle[StyleSheet.X]; y:StyleSheet.costModelTitle[StyleSheet.Y]; width:StyleSheet.costModelTitle[StyleSheet.WIDTH]; height:StyleSheet.costModelTitle[StyleSheet.HEIGHT];color:StyleSheet.costModelTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.costModelTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.costModelTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.costModelTitle[Constants.X]; y:StyleSheet.costModelTitle[Constants.Y]; width:StyleSheet.costModelTitle[Constants.WIDTH]; height:StyleSheet.costModelTitle[Constants.HEIGHT];color:StyleSheet.costModelTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.costModelTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.costModelTitle[Constants.PIXELSIZE]; id:costModelTitle; style: Text.Sunken; smooth: true @@ -166,7 +167,7 @@ HMIMenu { } Text { - x:StyleSheet.routingPreferencesTitle[StyleSheet.X]; y:StyleSheet.routingPreferencesTitle[StyleSheet.Y]; width:StyleSheet.routingPreferencesTitle[StyleSheet.WIDTH]; height:StyleSheet.routingPreferencesTitle[StyleSheet.HEIGHT];color:StyleSheet.routingPreferencesTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.routingPreferencesTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.routingPreferencesTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.routingPreferencesTitle[Constants.X]; y:StyleSheet.routingPreferencesTitle[Constants.Y]; width:StyleSheet.routingPreferencesTitle[Constants.WIDTH]; height:StyleSheet.routingPreferencesTitle[Constants.HEIGHT];color:StyleSheet.routingPreferencesTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.routingPreferencesTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.routingPreferencesTitle[Constants.PIXELSIZE]; id:routingPreferencesTitle; style: Text.Sunken; smooth: true @@ -174,42 +175,42 @@ HMIMenu { } Text { - x:StyleSheet.ferriesText[StyleSheet.X]; y:StyleSheet.ferriesText[StyleSheet.Y]; width:StyleSheet.ferriesText[StyleSheet.WIDTH]; height:StyleSheet.ferriesText[StyleSheet.HEIGHT];color:StyleSheet.ferriesText[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.ferriesText[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.ferriesText[StyleSheet.PIXELSIZE]; + x:StyleSheet.ferriesText[Constants.X]; y:StyleSheet.ferriesText[Constants.Y]; width:StyleSheet.ferriesText[Constants.WIDTH]; height:StyleSheet.ferriesText[Constants.HEIGHT];color:StyleSheet.ferriesText[Constants.TEXTCOLOR];styleColor:StyleSheet.ferriesText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.ferriesText[Constants.PIXELSIZE]; id: ferriesText; style: Text.Sunken; smooth: true text: Genivi.gettext("Ferries") } - StdButton { source:StyleSheet.allow_ferries[StyleSheet.SOURCE]; x:StyleSheet.allow_ferries[StyleSheet.X]; y:StyleSheet.allow_ferries[StyleSheet.Y]; width:StyleSheet.allow_ferries[StyleSheet.WIDTH]; height:StyleSheet.allow_ferries[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.allow_ferries[Constants.SOURCE]; x:StyleSheet.allow_ferries[Constants.X]; y:StyleSheet.allow_ferries[Constants.Y]; width:StyleSheet.allow_ferries[Constants.WIDTH]; height:StyleSheet.allow_ferries[Constants.HEIGHT]; id:ferries_yes; next:back; prev:back; explode:false; onClicked:{remove(Genivi.NAVIGATIONCORE_AVOID,Genivi.NAVIGATIONCORE_FERRY)}} - StdButton { source:StyleSheet.avoid_ferries[StyleSheet.SOURCE]; x:StyleSheet.avoid_ferries[StyleSheet.X]; y:StyleSheet.avoid_ferries[StyleSheet.Y]; width:StyleSheet.avoid_ferries[StyleSheet.WIDTH]; height:StyleSheet.avoid_ferries[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.avoid_ferries[Constants.SOURCE]; x:StyleSheet.avoid_ferries[Constants.X]; y:StyleSheet.avoid_ferries[Constants.Y]; width:StyleSheet.avoid_ferries[Constants.WIDTH]; height:StyleSheet.avoid_ferries[Constants.HEIGHT]; id:ferries_no; next:back; prev:back; explode:false; onClicked:{add(Genivi.NAVIGATIONCORE_AVOID,Genivi.NAVIGATIONCORE_FERRY)}} Text { - x:StyleSheet.tollRoadsText[StyleSheet.X]; y:StyleSheet.tollRoadsText[StyleSheet.Y]; width:StyleSheet.tollRoadsText[StyleSheet.WIDTH]; height:StyleSheet.tollRoadsText[StyleSheet.HEIGHT];color:StyleSheet.tollRoadsText[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.tollRoadsText[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.tollRoadsText[StyleSheet.PIXELSIZE]; + x:StyleSheet.tollRoadsText[Constants.X]; y:StyleSheet.tollRoadsText[Constants.Y]; width:StyleSheet.tollRoadsText[Constants.WIDTH]; height:StyleSheet.tollRoadsText[Constants.HEIGHT];color:StyleSheet.tollRoadsText[Constants.TEXTCOLOR];styleColor:StyleSheet.tollRoadsText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.tollRoadsText[Constants.PIXELSIZE]; id: tollRoadsText; style: Text.Sunken; smooth: true text: Genivi.gettext("TollRoads") } - StdButton { source:StyleSheet.allow_tollRoads[StyleSheet.SOURCE]; x:StyleSheet.allow_tollRoads[StyleSheet.X]; y:StyleSheet.allow_tollRoads[StyleSheet.Y]; width:StyleSheet.allow_tollRoads[StyleSheet.WIDTH]; height:StyleSheet.allow_tollRoads[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.allow_tollRoads[Constants.SOURCE]; x:StyleSheet.allow_tollRoads[Constants.X]; y:StyleSheet.allow_tollRoads[Constants.Y]; width:StyleSheet.allow_tollRoads[Constants.WIDTH]; height:StyleSheet.allow_tollRoads[Constants.HEIGHT]; id:toll_roads_yes; next:back; prev:back; explode:false; onClicked:{remove(Genivi.NAVIGATIONCORE_AVOID,Genivi.NAVIGATIONCORE_TOLL_ROADS)}} - StdButton { source:StyleSheet.avoid_tollRoads[StyleSheet.SOURCE]; x:StyleSheet.avoid_tollRoads[StyleSheet.X]; y:StyleSheet.avoid_tollRoads[StyleSheet.Y]; width:StyleSheet.avoid_tollRoads[StyleSheet.WIDTH]; height:StyleSheet.avoid_tollRoads[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.avoid_tollRoads[Constants.SOURCE]; x:StyleSheet.avoid_tollRoads[Constants.X]; y:StyleSheet.avoid_tollRoads[Constants.Y]; width:StyleSheet.avoid_tollRoads[Constants.WIDTH]; height:StyleSheet.avoid_tollRoads[Constants.HEIGHT]; id:toll_roads_no; next:back; prev:back; explode:false; onClicked:{add(Genivi.NAVIGATIONCORE_AVOID,Genivi.NAVIGATIONCORE_TOLL_ROADS)}} Text { - x:StyleSheet.motorWaysText[StyleSheet.X]; y:StyleSheet.motorWaysText[StyleSheet.Y]; width:StyleSheet.motorWaysText[StyleSheet.WIDTH]; height:StyleSheet.motorWaysText[StyleSheet.HEIGHT];color:StyleSheet.motorWaysText[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.motorWaysText[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.motorWaysText[StyleSheet.PIXELSIZE]; + x:StyleSheet.motorWaysText[Constants.X]; y:StyleSheet.motorWaysText[Constants.Y]; width:StyleSheet.motorWaysText[Constants.WIDTH]; height:StyleSheet.motorWaysText[Constants.HEIGHT];color:StyleSheet.motorWaysText[Constants.TEXTCOLOR];styleColor:StyleSheet.motorWaysText[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.motorWaysText[Constants.PIXELSIZE]; id:motorWaysText; style: Text.Sunken; smooth: true text: Genivi.gettext("MotorWays") } - StdButton { source:StyleSheet.allow_motorways[StyleSheet.SOURCE]; x:StyleSheet.allow_motorways[StyleSheet.X]; y:StyleSheet.allow_motorways[StyleSheet.Y]; width:StyleSheet.allow_motorways[StyleSheet.WIDTH]; height:StyleSheet.allow_motorways[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.allow_motorways[Constants.SOURCE]; x:StyleSheet.allow_motorways[Constants.X]; y:StyleSheet.allow_motorways[Constants.Y]; width:StyleSheet.allow_motorways[Constants.WIDTH]; height:StyleSheet.allow_motorways[Constants.HEIGHT]; id:motorways_yes; next:back; prev:back; explode:false; onClicked:{remove(Genivi.NAVIGATIONCORE_AVOID,Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}} - StdButton { source:StyleSheet.avoid_motorways[StyleSheet.SOURCE]; x:StyleSheet.avoid_motorways[StyleSheet.X]; y:StyleSheet.avoid_motorways[StyleSheet.Y]; width:StyleSheet.avoid_motorways[StyleSheet.WIDTH]; height:StyleSheet.avoid_motorways[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.avoid_motorways[Constants.SOURCE]; x:StyleSheet.avoid_motorways[Constants.X]; y:StyleSheet.avoid_motorways[Constants.Y]; width:StyleSheet.avoid_motorways[Constants.WIDTH]; height:StyleSheet.avoid_motorways[Constants.HEIGHT]; id:motorways_no; next:back; prev:back; explode:false; onClicked:{add(Genivi.NAVIGATIONCORE_AVOID,Genivi.NAVIGATIONCORE_HIGHWAYS_MOTORWAYS)}} - StdButton { source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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"} } diff --git a/src/hmi/qml/POI.qml b/src/hmi/qml/POI.qml index 4c45692..47a55c5 100644 --- a/src/hmi/qml/POI.qml +++ b/src/hmi/qml/POI.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/fsa-poi-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -46,24 +47,24 @@ HMIMenu { selectedStationValue.text="See details of \nthe station \nhere" } HMIBgImage { - image:StyleSheet.fsa_poi_menu_background[StyleSheet.SOURCE]; + image:StyleSheet.fsa_poi_menu_background[Constants.SOURCE]; anchors { fill: parent; topMargin: parent.headlineHeight } Text { - x:StyleSheet.searchResultTitle[StyleSheet.X]; y:StyleSheet.searchResultTitle[StyleSheet.Y]; width:StyleSheet.searchResultTitle[StyleSheet.WIDTH]; height:StyleSheet.searchResultTitle[StyleSheet.HEIGHT];color:StyleSheet.searchResultTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.searchResultTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.searchResultTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.searchResultTitle[Constants.X]; y:StyleSheet.searchResultTitle[Constants.Y]; width:StyleSheet.searchResultTitle[Constants.WIDTH]; height:StyleSheet.searchResultTitle[Constants.HEIGHT];color:StyleSheet.searchResultTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.searchResultTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.searchResultTitle[Constants.PIXELSIZE]; id:searchResultTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("SearchResult") } Text { - x:StyleSheet.selectedStationTitle[StyleSheet.X]; y:StyleSheet.selectedStationTitle[StyleSheet.Y]; width:StyleSheet.selectedStationTitle[StyleSheet.WIDTH]; height:StyleSheet.selectedStationTitle[StyleSheet.HEIGHT];color:StyleSheet.selectedStationTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.selectedStationTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.selectedStationTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.selectedStationTitle[Constants.X]; y:StyleSheet.selectedStationTitle[Constants.Y]; width:StyleSheet.selectedStationTitle[Constants.WIDTH]; height:StyleSheet.selectedStationTitle[Constants.HEIGHT];color:StyleSheet.selectedStationTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.selectedStationTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.selectedStationTitle[Constants.PIXELSIZE]; id:selectedStationTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("SelectedStation") } Text { - x:StyleSheet.selectedStationValue[StyleSheet.X]; y:StyleSheet.selectedStationValue[StyleSheet.Y]; width:StyleSheet.selectedStationValue[StyleSheet.WIDTH]; height:StyleSheet.selectedStationValue[StyleSheet.HEIGHT];color:StyleSheet.selectedStationValue[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.selectedStationValue[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.selectedStationValue[StyleSheet.PIXELSIZE]; + x:StyleSheet.selectedStationValue[Constants.X]; y:StyleSheet.selectedStationValue[Constants.Y]; width:StyleSheet.selectedStationValue[Constants.WIDTH]; height:StyleSheet.selectedStationValue[Constants.HEIGHT];color:StyleSheet.selectedStationValue[Constants.TEXTCOLOR];styleColor:StyleSheet.selectedStationValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.selectedStationValue[Constants.PIXELSIZE]; id:selectedStationValue style: Text.Sunken; smooth: true @@ -73,7 +74,7 @@ HMIMenu { Component { id: searchResultList Text { - x:StyleSheet.searchResultValue[StyleSheet.X]; y:StyleSheet.searchResultValue[StyleSheet.Y]; width:StyleSheet.searchResultValue[StyleSheet.WIDTH]; height:StyleSheet.searchResultValue[StyleSheet.HEIGHT];color:StyleSheet.searchResultValue[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.searchResultValue[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.searchResultValue[StyleSheet.PIXELSIZE]; + x:StyleSheet.searchResultValue[Constants.X]; y:StyleSheet.searchResultValue[Constants.Y]; width:StyleSheet.searchResultValue[Constants.WIDTH]; height:StyleSheet.searchResultValue[Constants.HEIGHT];color:StyleSheet.searchResultValue[Constants.TEXTCOLOR];styleColor:StyleSheet.searchResultValue[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.searchResultValue[Constants.PIXELSIZE]; id:searchResultValue; property real index:number; text: name; @@ -82,7 +83,7 @@ HMIMenu { } } HMIList { - x:StyleSheet.searchResultList[StyleSheet.X]; y:StyleSheet.searchResultList[StyleSheet.Y]; width:StyleSheet.searchResultList[StyleSheet.WIDTH]; height:StyleSheet.searchResultList[StyleSheet.HEIGHT]; + x:StyleSheet.searchResultList[Constants.X]; y:StyleSheet.searchResultList[Constants.Y]; width:StyleSheet.searchResultList[Constants.WIDTH]; height:StyleSheet.searchResultList[Constants.HEIGHT]; property real selectedEntry id:view delegate: searchResultList @@ -104,7 +105,7 @@ HMIMenu { } } StdButton { - source:StyleSheet.select_search_for_refill[StyleSheet.SOURCE]; x:StyleSheet.select_search_for_refill[StyleSheet.X]; y:StyleSheet.select_search_for_refill[StyleSheet.Y]; width:StyleSheet.select_search_for_refill[StyleSheet.WIDTH]; height:StyleSheet.select_search_for_refill[StyleSheet.HEIGHT]; + source:StyleSheet.select_search_for_refill[Constants.SOURCE]; x:StyleSheet.select_search_for_refill[Constants.X]; y:StyleSheet.select_search_for_refill[Constants.Y]; width:StyleSheet.select_search_for_refill[Constants.WIDTH]; height:StyleSheet.select_search_for_refill[Constants.HEIGHT]; id:select_search_for_refill explode: false onClicked: { @@ -158,14 +159,14 @@ HMIMenu { } } Text { - x:StyleSheet.searchTitle[StyleSheet.X]; y:StyleSheet.searchTitle[StyleSheet.Y]; width:StyleSheet.searchTitle[StyleSheet.WIDTH]; height:StyleSheet.searchTitle[StyleSheet.HEIGHT];color:StyleSheet.searchTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.searchTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.searchTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.searchTitle[Constants.X]; y:StyleSheet.searchTitle[Constants.Y]; width:StyleSheet.searchTitle[Constants.WIDTH]; height:StyleSheet.searchTitle[Constants.HEIGHT];color:StyleSheet.searchTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.searchTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.searchTitle[Constants.PIXELSIZE]; id:searchTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("SearchForPOI") } StdButton { - source:StyleSheet.select_reroute[StyleSheet.SOURCE]; x:StyleSheet.select_reroute[StyleSheet.X]; y:StyleSheet.select_reroute[StyleSheet.Y]; width:StyleSheet.select_reroute[StyleSheet.WIDTH]; height:StyleSheet.select_reroute[StyleSheet.HEIGHT]; + source:StyleSheet.select_reroute[Constants.SOURCE]; x:StyleSheet.select_reroute[Constants.X]; y:StyleSheet.select_reroute[Constants.Y]; width:StyleSheet.select_reroute[Constants.WIDTH]; height:StyleSheet.select_reroute[Constants.HEIGHT]; id:select_reroute; explode:false; disabled:true; @@ -181,14 +182,14 @@ HMIMenu { } } Text { - x:StyleSheet.rerouteTitle[StyleSheet.X]; y:StyleSheet.rerouteTitle[StyleSheet.Y]; width:StyleSheet.rerouteTitle[StyleSheet.WIDTH]; height:StyleSheet.rerouteTitle[StyleSheet.HEIGHT];color:StyleSheet.rerouteTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.rerouteTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.rerouteTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.rerouteTitle[Constants.X]; y:StyleSheet.rerouteTitle[Constants.Y]; width:StyleSheet.rerouteTitle[Constants.WIDTH]; height:StyleSheet.rerouteTitle[Constants.HEIGHT];color:StyleSheet.rerouteTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.rerouteTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.rerouteTitle[Constants.PIXELSIZE]; id:rerouteTitle; style: Text.Sunken; smooth: true text: Genivi.gettext("Reroute") } StdButton { - source:StyleSheet.select_display_on_map[StyleSheet.SOURCE]; x:StyleSheet.select_display_on_map[StyleSheet.X]; y:StyleSheet.select_display_on_map[StyleSheet.Y]; width:StyleSheet.select_display_on_map[StyleSheet.WIDTH]; height:StyleSheet.select_display_on_map[StyleSheet.HEIGHT]; + source:StyleSheet.select_display_on_map[Constants.SOURCE]; x:StyleSheet.select_display_on_map[Constants.X]; y:StyleSheet.select_display_on_map[Constants.Y]; width:StyleSheet.select_display_on_map[Constants.WIDTH]; height:StyleSheet.select_display_on_map[Constants.HEIGHT]; id:select_display_on_map; explode:false; disabled:true; @@ -203,14 +204,14 @@ HMIMenu { } } Text { - x:StyleSheet.displayTitle[StyleSheet.X]; y:StyleSheet.displayTitle[StyleSheet.Y]; width:StyleSheet.displayTitle[StyleSheet.WIDTH]; height:StyleSheet.displayTitle[StyleSheet.HEIGHT];color:StyleSheet.displayTitle[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.displayTitle[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.displayTitle[StyleSheet.PIXELSIZE]; + x:StyleSheet.displayTitle[Constants.X]; y:StyleSheet.displayTitle[Constants.Y]; width:StyleSheet.displayTitle[Constants.WIDTH]; height:StyleSheet.displayTitle[Constants.HEIGHT];color:StyleSheet.displayTitle[Constants.TEXTCOLOR];styleColor:StyleSheet.displayTitle[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.displayTitle[Constants.PIXELSIZE]; id:displayTitle; style: Text.Sunken; smooth: true; text: Genivi.gettext("DisplayPOI") } StdButton { - source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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; diff --git a/src/hmi/qml/TripComputer.qml b/src/hmi/qml/TripComputer.qml index a812245..fbe50cc 100644 --- a/src/hmi/qml/TripComputer.qml +++ b/src/hmi/qml/TripComputer.qml @@ -29,6 +29,7 @@ import QtQuick 2.1 import "Core" import "Core/genivi.js" as Genivi; +import "Core/style-sheets/style-constants.js" as Constants; import "Core/style-sheets/trip-computer-menu-css.js" as StyleSheet; import lbs.plugin.dbusif 1.0 @@ -88,7 +89,7 @@ HMIMenu { hideAll() if (Genivi.tripMode=="TRIP_NUMBER1") { - content.image=StyleSheet.trip1_background[StyleSheet.SOURCE] + content.image=StyleSheet.trip1_background[Constants.SOURCE] avg_speed_value.visible=true avg_speed_unit.visible=true avg_speed_title.visible=true @@ -106,7 +107,7 @@ HMIMenu { else if (Genivi.tripMode=="TRIP_NUMBER2") { - content.image=StyleSheet.trip2_background[StyleSheet.SOURCE] + content.image=StyleSheet.trip2_background[Constants.SOURCE] avg_speed_value.visible=true avg_speed_unit.visible=true avg_speed_title.visible=true @@ -124,7 +125,7 @@ HMIMenu { else if (Genivi.tripMode=="TRIP_INSTANT") { - content.image=StyleSheet.trip_instant_background[StyleSheet.SOURCE] + content.image=StyleSheet.trip_instant_background[Constants.SOURCE] fuel_value.visible=true fuel_unit.visible=true fuel_title.visible=true @@ -140,7 +141,7 @@ HMIMenu { } else { - content.image=StyleSheet.trip1_background[StyleSheet.SOURCE] + content.image=StyleSheet.trip1_background[Constants.SOURCE] avg_speed_value.visible=true avg_speed_unit.visible=true avg_speed_title.visible=true @@ -222,7 +223,7 @@ HMIMenu { id:content anchors { fill: parent; topMargin: parent.headlineHeight} Text { - x:StyleSheet.avg_speed_value[StyleSheet.X]; y:StyleSheet.avg_speed_value[StyleSheet.Y]; width:StyleSheet.avg_speed_value[StyleSheet.WIDTH]; height:StyleSheet.avg_speed_value[StyleSheet.HEIGHT];color:StyleSheet.avg_speed_value[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.avg_speed_value[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.avg_speed_value[StyleSheet.PIXELSIZE]; + x:StyleSheet.avg_speed_value[Constants.X]; y:StyleSheet.avg_speed_value[Constants.Y]; width:StyleSheet.avg_speed_value[Constants.WIDTH]; height:StyleSheet.avg_speed_value[Constants.HEIGHT];color:StyleSheet.avg_speed_value[Constants.TEXTCOLOR];styleColor:StyleSheet.avg_speed_value[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.avg_speed_value[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -230,7 +231,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.avg_speed_unit[StyleSheet.X]; y:StyleSheet.avg_speed_unit[StyleSheet.Y]; width:StyleSheet.avg_speed_unit[StyleSheet.WIDTH]; height:StyleSheet.avg_speed_unit[StyleSheet.HEIGHT];color:StyleSheet.avg_speed_unit[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.avg_speed_unit[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.avg_speed_unit[StyleSheet.PIXELSIZE]; + x:StyleSheet.avg_speed_unit[Constants.X]; y:StyleSheet.avg_speed_unit[Constants.Y]; width:StyleSheet.avg_speed_unit[Constants.WIDTH]; height:StyleSheet.avg_speed_unit[Constants.HEIGHT];color:StyleSheet.avg_speed_unit[Constants.TEXTCOLOR];styleColor:StyleSheet.avg_speed_unit[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.avg_speed_unit[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -238,7 +239,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.avg_speed_title[StyleSheet.X]; y:StyleSheet.avg_speed_title[StyleSheet.Y]; width:StyleSheet.avg_speed_title[StyleSheet.WIDTH]; height:StyleSheet.avg_speed_title[StyleSheet.HEIGHT];color:StyleSheet.avg_speed_title[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.avg_speed_title[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.avg_speed_title[StyleSheet.PIXELSIZE]; + x:StyleSheet.avg_speed_title[Constants.X]; y:StyleSheet.avg_speed_title[Constants.Y]; width:StyleSheet.avg_speed_title[Constants.WIDTH]; height:StyleSheet.avg_speed_title[Constants.HEIGHT];color:StyleSheet.avg_speed_title[Constants.TEXTCOLOR];styleColor:StyleSheet.avg_speed_title[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.avg_speed_title[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -246,7 +247,7 @@ HMIMenu { text: Genivi.gettext("AvgSpeed") } Text { - x:StyleSheet.avg_fuel_value[StyleSheet.X]; y:StyleSheet.avg_fuel_value[StyleSheet.Y]; width:StyleSheet.avg_fuel_value[StyleSheet.WIDTH]; height:StyleSheet.avg_fuel_value[StyleSheet.HEIGHT];color:StyleSheet.avg_fuel_value[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.avg_fuel_value[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.avg_fuel_value[StyleSheet.PIXELSIZE]; + x:StyleSheet.avg_fuel_value[Constants.X]; y:StyleSheet.avg_fuel_value[Constants.Y]; width:StyleSheet.avg_fuel_value[Constants.WIDTH]; height:StyleSheet.avg_fuel_value[Constants.HEIGHT];color:StyleSheet.avg_fuel_value[Constants.TEXTCOLOR];styleColor:StyleSheet.avg_fuel_value[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.avg_fuel_value[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -254,7 +255,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.avg_fuel_unit[StyleSheet.X]; y:StyleSheet.avg_fuel_unit[StyleSheet.Y]; width:StyleSheet.avg_fuel_unit[StyleSheet.WIDTH]; height:StyleSheet.avg_fuel_unit[StyleSheet.HEIGHT];color:StyleSheet.avg_fuel_unit[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.avg_fuel_unit[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.avg_fuel_unit[StyleSheet.PIXELSIZE]; + x:StyleSheet.avg_fuel_unit[Constants.X]; y:StyleSheet.avg_fuel_unit[Constants.Y]; width:StyleSheet.avg_fuel_unit[Constants.WIDTH]; height:StyleSheet.avg_fuel_unit[Constants.HEIGHT];color:StyleSheet.avg_fuel_unit[Constants.TEXTCOLOR];styleColor:StyleSheet.avg_fuel_unit[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.avg_fuel_unit[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -262,7 +263,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.avg_fuel_title[StyleSheet.X]; y:StyleSheet.avg_fuel_title[StyleSheet.Y]; width:StyleSheet.avg_fuel_title[StyleSheet.WIDTH]; height:StyleSheet.avg_fuel_title[StyleSheet.HEIGHT];color:StyleSheet.avg_fuel_title[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.avg_fuel_title[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.avg_fuel_title[StyleSheet.PIXELSIZE]; + x:StyleSheet.avg_fuel_title[Constants.X]; y:StyleSheet.avg_fuel_title[Constants.Y]; width:StyleSheet.avg_fuel_title[Constants.WIDTH]; height:StyleSheet.avg_fuel_title[Constants.HEIGHT];color:StyleSheet.avg_fuel_title[Constants.TEXTCOLOR];styleColor:StyleSheet.avg_fuel_title[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.avg_fuel_title[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -270,7 +271,7 @@ HMIMenu { text: Genivi.gettext("AvgFuel") } Text { - x:StyleSheet.distance_value[StyleSheet.X]; y:StyleSheet.distance_value[StyleSheet.Y]; width:StyleSheet.distance_value[StyleSheet.WIDTH]; height:StyleSheet.distance_value[StyleSheet.HEIGHT];color:StyleSheet.distance_value[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.distance_value[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.distance_value[StyleSheet.PIXELSIZE]; + x:StyleSheet.distance_value[Constants.X]; y:StyleSheet.distance_value[Constants.Y]; width:StyleSheet.distance_value[Constants.WIDTH]; height:StyleSheet.distance_value[Constants.HEIGHT];color:StyleSheet.distance_value[Constants.TEXTCOLOR];styleColor:StyleSheet.distance_value[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.distance_value[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -278,7 +279,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.distance_unit[StyleSheet.X]; y:StyleSheet.distance_unit[StyleSheet.Y]; width:StyleSheet.distance_unit[StyleSheet.WIDTH]; height:StyleSheet.distance_unit[StyleSheet.HEIGHT];color:StyleSheet.distance_unit[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.distance_unit[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.distance_unit[StyleSheet.PIXELSIZE]; + x:StyleSheet.distance_unit[Constants.X]; y:StyleSheet.distance_unit[Constants.Y]; width:StyleSheet.distance_unit[Constants.WIDTH]; height:StyleSheet.distance_unit[Constants.HEIGHT];color:StyleSheet.distance_unit[Constants.TEXTCOLOR];styleColor:StyleSheet.distance_unit[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.distance_unit[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -286,7 +287,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.distance_title[StyleSheet.X]; y:StyleSheet.distance_title[StyleSheet.Y]; width:StyleSheet.distance_title[StyleSheet.WIDTH]; height:StyleSheet.distance_title[StyleSheet.HEIGHT];color:StyleSheet.distance_title[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.distance_title[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.distance_title[StyleSheet.PIXELSIZE]; + x:StyleSheet.distance_title[Constants.X]; y:StyleSheet.distance_title[Constants.Y]; width:StyleSheet.distance_title[Constants.WIDTH]; height:StyleSheet.distance_title[Constants.HEIGHT];color:StyleSheet.distance_title[Constants.TEXTCOLOR];styleColor:StyleSheet.distance_title[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.distance_title[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -294,7 +295,7 @@ HMIMenu { text: Genivi.gettext("Distance") } Text { - x:StyleSheet.fuel_value[StyleSheet.X]; y:StyleSheet.fuel_value[StyleSheet.Y]; width:StyleSheet.fuel_value[StyleSheet.WIDTH]; height:StyleSheet.fuel_value[StyleSheet.HEIGHT];color:StyleSheet.fuel_value[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.fuel_value[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.fuel_value[StyleSheet.PIXELSIZE]; + x:StyleSheet.fuel_value[Constants.X]; y:StyleSheet.fuel_value[Constants.Y]; width:StyleSheet.fuel_value[Constants.WIDTH]; height:StyleSheet.fuel_value[Constants.HEIGHT];color:StyleSheet.fuel_value[Constants.TEXTCOLOR];styleColor:StyleSheet.fuel_value[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.fuel_value[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -302,7 +303,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.fuel_unit[StyleSheet.X]; y:StyleSheet.fuel_unit[StyleSheet.Y]; width:StyleSheet.fuel_unit[StyleSheet.WIDTH]; height:StyleSheet.fuel_unit[StyleSheet.HEIGHT];color:StyleSheet.fuel_unit[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.fuel_unit[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.fuel_unit[StyleSheet.PIXELSIZE]; + x:StyleSheet.fuel_unit[Constants.X]; y:StyleSheet.fuel_unit[Constants.Y]; width:StyleSheet.fuel_unit[Constants.WIDTH]; height:StyleSheet.fuel_unit[Constants.HEIGHT];color:StyleSheet.fuel_unit[Constants.TEXTCOLOR];styleColor:StyleSheet.fuel_unit[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.fuel_unit[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -310,7 +311,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.fuel_title[StyleSheet.X]; y:StyleSheet.fuel_title[StyleSheet.Y]; width:StyleSheet.fuel_title[StyleSheet.WIDTH]; height:StyleSheet.fuel_title[StyleSheet.HEIGHT];color:StyleSheet.fuel_title[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.fuel_title[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.fuel_title[StyleSheet.PIXELSIZE]; + x:StyleSheet.fuel_title[Constants.X]; y:StyleSheet.fuel_title[Constants.Y]; width:StyleSheet.fuel_title[Constants.WIDTH]; height:StyleSheet.fuel_title[Constants.HEIGHT];color:StyleSheet.fuel_title[Constants.TEXTCOLOR];styleColor:StyleSheet.fuel_title[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.fuel_title[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -318,7 +319,7 @@ HMIMenu { text: Genivi.gettext("FuelLevel") } Text { - x:StyleSheet.tank_distance_value[StyleSheet.X]; y:StyleSheet.tank_distance_value[StyleSheet.Y]; width:StyleSheet.tank_distance_value[StyleSheet.WIDTH]; height:StyleSheet.tank_distance_value[StyleSheet.HEIGHT];color:StyleSheet.tank_distance_value[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.tank_distance_value[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.tank_distance_value[StyleSheet.PIXELSIZE]; + x:StyleSheet.tank_distance_value[Constants.X]; y:StyleSheet.tank_distance_value[Constants.Y]; width:StyleSheet.tank_distance_value[Constants.WIDTH]; height:StyleSheet.tank_distance_value[Constants.HEIGHT];color:StyleSheet.tank_distance_value[Constants.TEXTCOLOR];styleColor:StyleSheet.tank_distance_value[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.tank_distance_value[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -326,7 +327,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.tank_distance_unit[StyleSheet.X]; y:StyleSheet.tank_distance_unit[StyleSheet.Y]; width:StyleSheet.tank_distance_unit[StyleSheet.WIDTH]; height:StyleSheet.tank_distance_unit[StyleSheet.HEIGHT];color:StyleSheet.tank_distance_unit[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.tank_distance_unit[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.tank_distance_unit[StyleSheet.PIXELSIZE]; + x:StyleSheet.tank_distance_unit[Constants.X]; y:StyleSheet.tank_distance_unit[Constants.Y]; width:StyleSheet.tank_distance_unit[Constants.WIDTH]; height:StyleSheet.tank_distance_unit[Constants.HEIGHT];color:StyleSheet.tank_distance_unit[Constants.TEXTCOLOR];styleColor:StyleSheet.tank_distance_unit[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.tank_distance_unit[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -334,7 +335,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.tank_distance_title[StyleSheet.X]; y:StyleSheet.tank_distance_title[StyleSheet.Y]; width:StyleSheet.tank_distance_title[StyleSheet.WIDTH]; height:StyleSheet.tank_distance_title[StyleSheet.HEIGHT];color:StyleSheet.tank_distance_title[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.tank_distance_title[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.tank_distance_title[StyleSheet.PIXELSIZE]; + x:StyleSheet.tank_distance_title[Constants.X]; y:StyleSheet.tank_distance_title[Constants.Y]; width:StyleSheet.tank_distance_title[Constants.WIDTH]; height:StyleSheet.tank_distance_title[Constants.HEIGHT];color:StyleSheet.tank_distance_title[Constants.TEXTCOLOR];styleColor:StyleSheet.tank_distance_title[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.tank_distance_title[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -342,7 +343,7 @@ HMIMenu { text: Genivi.gettext("TankDistance") } Text { - x:StyleSheet.predictive_tank_distance_value[StyleSheet.X]; y:StyleSheet.predictive_tank_distance_value[StyleSheet.Y]; width:StyleSheet.predictive_tank_distance_value[StyleSheet.WIDTH]; height:StyleSheet.predictive_tank_distance_value[StyleSheet.HEIGHT];color:StyleSheet.predictive_tank_distance_value[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.predictive_tank_distance_value[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.predictive_tank_distance_value[StyleSheet.PIXELSIZE]; + x:StyleSheet.predictive_tank_distance_value[Constants.X]; y:StyleSheet.predictive_tank_distance_value[Constants.Y]; width:StyleSheet.predictive_tank_distance_value[Constants.WIDTH]; height:StyleSheet.predictive_tank_distance_value[Constants.HEIGHT];color:StyleSheet.predictive_tank_distance_value[Constants.TEXTCOLOR];styleColor:StyleSheet.predictive_tank_distance_value[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.predictive_tank_distance_value[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -350,7 +351,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.predictive_tank_distance_unit[StyleSheet.X]; y:StyleSheet.predictive_tank_distance_unit[StyleSheet.Y]; width:StyleSheet.predictive_tank_distance_unit[StyleSheet.WIDTH]; height:StyleSheet.predictive_tank_distance_unit[StyleSheet.HEIGHT];color:StyleSheet.predictive_tank_distance_unit[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.predictive_tank_distance_unit[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.predictive_tank_distance_unit[StyleSheet.PIXELSIZE]; + x:StyleSheet.predictive_tank_distance_unit[Constants.X]; y:StyleSheet.predictive_tank_distance_unit[Constants.Y]; width:StyleSheet.predictive_tank_distance_unit[Constants.WIDTH]; height:StyleSheet.predictive_tank_distance_unit[Constants.HEIGHT];color:StyleSheet.predictive_tank_distance_unit[Constants.TEXTCOLOR];styleColor:StyleSheet.predictive_tank_distance_unit[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.predictive_tank_distance_unit[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -358,7 +359,7 @@ HMIMenu { text: " " } Text { - x:StyleSheet.predictive_tank_distance_title[StyleSheet.X]; y:StyleSheet.predictive_tank_distance_title[StyleSheet.Y]; width:StyleSheet.predictive_tank_distance_title[StyleSheet.WIDTH]; height:StyleSheet.predictive_tank_distance_title[StyleSheet.HEIGHT];color:StyleSheet.predictive_tank_distance_title[StyleSheet.TEXTCOLOR];styleColor:StyleSheet.predictive_tank_distance_title[StyleSheet.STYLECOLOR]; font.pixelSize:StyleSheet.predictive_tank_distance_title[StyleSheet.PIXELSIZE]; + x:StyleSheet.predictive_tank_distance_title[Constants.X]; y:StyleSheet.predictive_tank_distance_title[Constants.Y]; width:StyleSheet.predictive_tank_distance_title[Constants.WIDTH]; height:StyleSheet.predictive_tank_distance_title[Constants.HEIGHT];color:StyleSheet.predictive_tank_distance_title[Constants.TEXTCOLOR];styleColor:StyleSheet.predictive_tank_distance_title[Constants.STYLECOLOR]; font.pixelSize:StyleSheet.predictive_tank_distance_title[Constants.PIXELSIZE]; visible: false style: Text.Sunken; smooth: true @@ -366,7 +367,7 @@ HMIMenu { text: Genivi.gettext("PredictiveTankDistance") } - StdButton { source:StyleSheet.reset[StyleSheet.SOURCE]; x:StyleSheet.reset[StyleSheet.X]; y:StyleSheet.reset[StyleSheet.Y]; width:StyleSheet.reset[StyleSheet.WIDTH]; height:StyleSheet.reset[StyleSheet.HEIGHT];textColor:StyleSheet.resetText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.resetText[StyleSheet.PIXELSIZE]; + StdButton { source:StyleSheet.reset[Constants.SOURCE]; x:StyleSheet.reset[Constants.X]; y:StyleSheet.reset[Constants.Y]; width:StyleSheet.reset[Constants.WIDTH]; height:StyleSheet.reset[Constants.HEIGHT];textColor:StyleSheet.resetText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.resetText[Constants.PIXELSIZE]; visible: false; id:reset; text: Genivi.gettext("Reset"); explode:false; disabled:false; next:select_trip1; prev:back; onClicked:{ @@ -379,7 +380,7 @@ HMIMenu { updateTripMode(); } } - StdButton { source:StyleSheet.select_trip1[StyleSheet.SOURCE]; x:StyleSheet.select_trip1[StyleSheet.X]; y:StyleSheet.select_trip1[StyleSheet.Y]; width:StyleSheet.select_trip1[StyleSheet.WIDTH]; height:StyleSheet.select_trip1[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.select_trip1[Constants.SOURCE]; x:StyleSheet.select_trip1[Constants.X]; y:StyleSheet.select_trip1[Constants.Y]; width:StyleSheet.select_trip1[Constants.WIDTH]; height:StyleSheet.select_trip1[Constants.HEIGHT]; visible: false; id:select_trip1; explode:false; disabled:false; next:select_trip2; prev:reset; onClicked:{ @@ -387,7 +388,7 @@ HMIMenu { updateTripMode(); } } - StdButton { source:StyleSheet.select_trip2[StyleSheet.SOURCE]; x:StyleSheet.select_trip2[StyleSheet.X]; y:StyleSheet.select_trip2[StyleSheet.Y]; width:StyleSheet.select_trip2[StyleSheet.WIDTH]; height:StyleSheet.select_trip2[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.select_trip2[Constants.SOURCE]; x:StyleSheet.select_trip2[Constants.X]; y:StyleSheet.select_trip2[Constants.Y]; width:StyleSheet.select_trip2[Constants.WIDTH]; height:StyleSheet.select_trip2[Constants.HEIGHT]; visible: false; id:select_trip2; explode:false; disabled:false; next:select_instant; prev:select_trip1; onClicked:{ @@ -395,7 +396,7 @@ HMIMenu { updateTripMode(); } } - StdButton { source:StyleSheet.select_instant[StyleSheet.SOURCE]; x:StyleSheet.select_instant[StyleSheet.X]; y:StyleSheet.select_instant[StyleSheet.Y]; width:StyleSheet.select_instant[StyleSheet.WIDTH]; height:StyleSheet.select_instant[StyleSheet.HEIGHT]; + StdButton { source:StyleSheet.select_instant[Constants.SOURCE]; x:StyleSheet.select_instant[Constants.X]; y:StyleSheet.select_instant[Constants.Y]; width:StyleSheet.select_instant[Constants.WIDTH]; height:StyleSheet.select_instant[Constants.HEIGHT]; visible: false; id:select_instant; explode:false; disabled:false; next:back; prev:select_trip2; onClicked:{ @@ -403,7 +404,7 @@ HMIMenu { updateTripMode(); } } - StdButton { source:StyleSheet.back[StyleSheet.SOURCE]; x:StyleSheet.back[StyleSheet.X]; y:StyleSheet.back[StyleSheet.Y]; width:StyleSheet.back[StyleSheet.WIDTH]; height:StyleSheet.back[StyleSheet.HEIGHT];textColor:StyleSheet.backText[StyleSheet.TEXTCOLOR]; pixelSize:StyleSheet.backText[StyleSheet.PIXELSIZE]; + 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");} } diff --git a/src/script/navigation-service.mk b/src/script/navigation-service.mk index dd35f6f..446226b 100644 --- a/src/script/navigation-service.mk +++ b/src/script/navigation-service.mk @@ -24,7 +24,7 @@ # # @licence end@ navigation-service_URL="http://git.projects.genivi.org/lbs/navigation.git" -navigation-service_VERSION=bd2f6945f79388ad7b8f16c60130b75e7e85dfa0 +navigation-service_VERSION=50e6d0a351b7c79ff3d4905c446cd95f11482781 navigation-service_SRC=$(SRC_DIR)/navigation-service_$(navigation-service_VERSION) navigation-service_API=$(navigation-service_SRC)/api navigation-service_BIN=$(BIN_DIR)/navigation-service |
