--- /usr/lib/drive-qml/views/assistancePage.qml-original 2012-07-12 09:05:04.206678598 +0200 +++ /usr/lib/drive-qml/views/assistancePage.qml 2012-07-16 11:53:33.264261126 +0200 @@ -84,6 +84,10 @@ application.startPowersaveTimer(); } } + var mapSettingsModel = ModelFactory.getModel("MapSettingsModel"); + if (mapSettingsModel.dayNightMode === "auto") { + mapSettingsModel.setNightMode(mapSettingsModel.isNight()); + } setupTracking(); minimap.initializeMap(appModel.lastDestination); @@ -91,18 +95,18 @@ minimap.show(); // TODO: Uncomment when management makes up their minds - //setupTraffic(false, restartTraffic); + setupTraffic(false, restartTraffic); } else { mapModel.center = minimap.map.center; minimap.startupInitialization(); // app startup, defer initialization defferConfigTimer.running = true; - /** TODO: enable when this is fixed in plugin + var mapSettingsModel = ModelFactory.getModel("MapSettingsModel"); if (mapSettingsModel.dayNightMode === "auto") { mapSettingsModel.setNightMode(mapSettingsModel.isNight()); } - */ + } } @@ -117,15 +121,15 @@ // TODO: Uncomment when management makes up their minds // Setup traffic after application startup - //setupTraffic(true, false); + setupTraffic(true, false); application.setup(); } } onBeforeHide: { // TODO: Uncomment when management makes up their minds - //trafficModel.trafficError.disconnect(onTrafficError); - //trafficModel.trafficError.disconnect(onTrafficReady); + trafficModel.trafficError.disconnect(onTrafficError); + trafficModel.trafficError.disconnect(onTrafficReady); trackingHelper.pauseTracking(); minimap.setTransitionMap(); minimap.stopMapAnimation(); @@ -431,7 +435,7 @@ name: (positioningModel && positioningModel.currentStreetName) ? positioningModel.currentStreetName : "" hasGPS: (positioningModel && positioningModel.hasGPS) ? positioningModel.hasGPS : false // TODO: Uncomment when management makes up their minds - loadingTraffic: false //(trafficModel && trafficModel.isLoadingTraffic) ? trafficModel.isLoadingTraffic : false + loadingTraffic: (trafficModel && trafficModel.isLoadingTraffic) ? trafficModel.isLoadingTraffic : false } // dashboard --- /usr/lib/drive-qml/views/guidancePage.qml-original 2012-07-12 09:05:04.210678616 +0200 +++ /usr/lib/drive-qml/views/guidancePage.qml 2012-07-16 11:52:50.428048685 +0200 @@ -241,7 +241,7 @@ name: (positioningModel && positioningModel.currentStreetName) ? positioningModel.currentStreetName : "" hasGPS: (positioningModel && positioningModel.hasGPS) ? positioningModel.hasGPS : false // TODO: Uncomment when management makes up their minds - loadingTraffic: false //trafficModel === undefined ? false : trafficModel.isLoadingTraffic + loadingTraffic: trafficModel === undefined ? false : trafficModel.isLoadingTraffic } Dashboard { @@ -388,7 +388,11 @@ } // TODO: Uncomment when management makes up their minds - //setupTraffic(firstShow); + setupTraffic(firstShow); + var mapSettingsModel = ModelFactory.getModel("MapSettingsModel"); + if (mapSettingsModel.dayNightMode === "auto") { + mapSettingsModel.setNightMode(mapSettingsModel.isNight()); + } minimap.initializeMap(); //gotta do it again because showOnMap will override our map settings page.state != "mapInteraction" && (guidanceModel.mapUpdateMode = Guidance.MAP_UPDATE_ROADVIEW); @@ -399,8 +403,8 @@ onBeforeHide: { // TODO: Uncomment when management makes up their minds - //trafficModel.trafficError.disconnect(onTrafficReady); - //trafficModel.trafficError.disconnect(onTrafficError); + trafficModel.trafficError.disconnect(onTrafficReady); + trafficModel.trafficError.disconnect(onTrafficError); guidanceModel.mapUpdateMode = Guidance.MAP_UPDATE_NONE; //For the sake of transitions, stop the map movement minimap.setTransitionMap(); minimap.stopMapAnimation(); --- /usr/lib/drive-qml/views/settings/mapModeSettingsPage.qml-original 2012-07-13 22:07:17.926033862 +0200 +++ /usr/lib/drive-qml/views/settings/mapModeSettingsPage.qml 2012-07-13 22:04:36.177231806 +0200 @@ -35,7 +35,6 @@ group: group } - /** TODO: enable when plugin is fixed ButtonItem { id: autoMode itemId: "auto" @@ -44,7 +43,6 @@ style: Components.RadioButton group: group } - */ } List { --- /usr/lib/drive-qml/views/settings/assistanceModeSettingsPage.qml-original 2012-07-12 09:05:04.210678616 +0200 +++ /usr/lib/drive-qml/views/settings/assistanceModeSettingsPage.qml 2012-07-13 21:55:06.090404859 +0200 @@ -38,7 +38,7 @@ ListElement { _itemId: "destination"; _targetPage: "locationPicker.qml" } ListElement { _itemId: "saveLocation"; _hideArrow: true } // TODO: Uncomment when management makes up their minds -// ListElement { _itemId: "traffic_on"; _hideArrow: true } + ListElement { _itemId: "traffic_on"; _hideArrow: true } ListElement { _itemId: "settings"; _targetPage: "settings/settingsPage.qml" } ListElement { _itemId: "about"; _targetPage: "aboutPage.qml" } ListElement { _itemId: "feedback"; _targetPage: "npsPage.qml" } @@ -205,6 +205,7 @@ onBeforeShow: { buttonModel.updateFeedback(); + buttonModel.updateTraffic(); } Component.onCompleted: { --- /usr/lib/drive-qml/views/settings/settingsPage.qml-original 2012-07-12 09:05:04.214678635 +0200 +++ /usr/lib/drive-qml/views/settings/settingsPage.qml 2012-07-10 20:40:16.000000000 +0200 @@ -69,7 +69,7 @@ subtitle: "" } - /** TODO: uncomment when management makes up their minds + ButtonItem { id: traffic itemId: "traffic" @@ -77,7 +77,7 @@ subtitle: trafficSettingsSubtitle(); iconUrl: "../../resources/traffic/list_item/traffic_on.png" } - */ + ButtonItem { id: home --- /usr/lib/drive-qml/views/guidanceMenuPage.qml-original 2012-07-12 09:05:04.202678580 +0200 +++ /usr/lib/drive-qml/views/guidanceMenuPage.qml 2012-07-10 20:40:16.000000000 +0200 @@ -14,8 +14,8 @@ property variant stopGuidanceDialog // TODO: Uncomment when management makes up their minds - //property string trafficTxt: modelFactory.getModel("AppSettingsModel").trafficOn ? qsTrId("qtn_drive_trafficoff_item") : qsTrId("qtn_drive_trafficon_item") - //property string trafficIcon: modelFactory.getModel("AppSettingsModel").trafficOn ? "traffic_off.png" : "traffic_on.png" + property string trafficTxt: modelFactory.getModel("AppSettingsModel").trafficOn ? qsTrId("qtn_drive_trafficoff_item") : qsTrId("qtn_drive_trafficon_item") + property string trafficIcon: modelFactory.getModel("AppSettingsModel").trafficOn ? "traffic_off.png" : "traffic_on.png" VisualItemModel { id: listModel @@ -42,7 +42,7 @@ } // TODO: Uncomment when management makes up their minds - /** + ButtonItem { id: toggletraffic itemId: "toggletraffic" @@ -50,7 +50,7 @@ iconUrl: Components.imagePath + "traffic/list_item/"+trafficIcon hideArrow: true } - */ + ButtonItem { id: settings --- /usr/lib/drive-qml/models/AppSettingsModel.qml-original 2012-07-12 09:05:04.214678635 +0200 +++ /usr/lib/drive-qml/models/AppSettingsModel.qml 2012-07-10 20:40:18.000000000 +0200 @@ -20,7 +20,7 @@ routeOptions: 63, serviceAgreedOn: "", ssoDone: false, - traffic: false, //true, // TODO: change back when management makes up their mind + traffic: true, // TODO: change back when management makes up their mind trafficUpdateInterval: 5, unitSystem: "" } @@ -163,7 +163,7 @@ gpsPowersaving = get('gpsPowersaving'); // TODO: change back when management makes up their minds - trafficOn = false; //get('traffic'); + trafficOn = get('traffic'); mapSensorEnabled = get('mapSensor'); trafficUpdateInterval = get('trafficUpdateInterval'); @@ -178,7 +178,7 @@ Units.currentSystem = getUnitSystem(); // TODO: change back when management makes up their minds - trafficOn = false; //get('allowConnections') && get('mapSensor') && get('traffic') && device.online; + trafficOn = get('allowConnections') && get('mapSensor') && get('traffic') && device.online; } Component.onCompleted: { --- /usr/lib/drive-qml/models/MapSettingsModel.qml-original 2012-07-13 22:34:47.122211771 +0200 +++ /usr/lib/drive-qml/models/MapSettingsModel.qml 2012-07-13 22:27:04.151916017 +0200 @@ -35,7 +35,7 @@ Component.onCompleted: { loadMapSettings(); - //MapsPlugin.dayNightSwitch.connect(onDayNightSwitch); + MapsPlugin.dayNightSwitch.connect(onDayNightSwitch); } //The settings party starts here @@ -84,11 +84,11 @@ dayNightMode = newvalue; //do plugin connecting here //possible values for newvalue string:"day", string:"night", string:"auto" - /* + if (newvalue === "auto") { setNightMode(isNight()); } - else*/ { + else { setNightMode(newvalue === "night"); } } @@ -126,7 +126,7 @@ return ModelHelper.serialize(); } - /** TODO: Fix when plugin support automatic day/night + function isNight() { var positioningModel = ModelFactory.getModel("PositioningModel"), pos = positioningModel.getReferencePosition(); @@ -137,8 +137,8 @@ var lat_rad = pos.latitude * (Math.PI/180); var declination = (23.4*Math.PI)/180 * Math.sin(2*Math.PI * (284+dayOfTheYear)/365); var omega = Math.acos(-Math.tan(declination) * Math.tan(lat_rad)); - var sunset = 12 - (1/15) * omega * (180/Math.PI) - pos.longitude/15 + today.getTimezoneOffset()/60; - var sunrise = 24 - sunset; //(1/15) * omega * (180/Math.PI) - pos.longitude/15 + today.getTimezoneOffset()/60; + var sunset = 12 + (1/15) * omega * (180/Math.PI) - pos.longitude/15 - today.getTimezoneOffset()/60; + var sunrise = 12 - (1/15) * omega * (180/Math.PI) - pos.longitude/15 - today.getTimezoneOffset()/60; console.log("Sunset:" + sunset); console.log("Sunrise:" + sunrise); @@ -158,5 +158,5 @@ setNightMode(isNight()); } } - */ + }