Merge lp:~neokore/ubuntu-weather-app/currentWeatherAnimations into lp:ubuntu-weather-app/obsolete.trunk
- currentWeatherAnimations
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Martin Borho |
Approved revision: | 9 |
Merged at revision: | 10 |
Proposed branch: | lp:~neokore/ubuntu-weather-app/currentWeatherAnimations |
Merge into: | lp:ubuntu-weather-app/obsolete.trunk |
Diff against target: |
1038 lines (+867/-21) 6 files modified
components/AddLocationDialog.qml (+2/-2) components/CurrentWeather.qml (+18/-8) components/DayWeatherComponent.qml (+6/-7) components/LocationTab.qml (+5/-3) components/WeatherApi.js (+1/-1) components/WeatherConditionIconComponent.qml (+835/-0) |
To merge this branch: | bzr merge lp:~neokore/ubuntu-weather-app/currentWeatherAnimations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Borho | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+160107@code.launchpad.net |
Commit message
Added a WeatherConditio
Description of the change
Added a WeatherConditio
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
Martin Borho (martin-borho) wrote : | # |
Looks great, well done!
Is only the sun animated? Somehow the clouds don't move like in http://
Raúl Yeguas (neokore) wrote : | # |
Other conditions like some clouds, thunderstorm or snow are animated too.
El 22/04/2013 16:06, "Martin Borho" <email address hidden> escribió:
> Looks great, well done!
>
> Is only the sun animated? Somehow the clouds don't move like in
> http://
> --
>
> https:/
> You are the owner of
> lp:~neokore/ubuntu-weather-app/currentWeatherAnimations.
>
Martin Borho (martin-borho) wrote : | # |
Looks great!
Preview Diff
1 | === modified file 'components/AddLocationDialog.qml' | |||
2 | --- components/AddLocationDialog.qml 2013-04-20 18:31:16 +0000 | |||
3 | +++ components/AddLocationDialog.qml 2013-04-22 13:29:40 +0000 | |||
4 | @@ -11,7 +11,7 @@ | |||
5 | 11 | id: addLocationDialogue | 11 | id: addLocationDialogue |
6 | 12 | height: units.gu(10) | 12 | height: units.gu(10) |
7 | 13 | title: i18n.tr("Add location") | 13 | title: i18n.tr("Add location") |
9 | 14 | text: i18n.tr("Write a city name o pick it by GPS location") | 14 | text: i18n.tr("Write a city name o pick it by your location") |
10 | 15 | 15 | ||
11 | 16 | function locationSelected(index) { | 16 | function locationSelected(index) { |
12 | 17 | var location = citiesModel.get(index); | 17 | var location = citiesModel.get(index); |
13 | @@ -54,7 +54,7 @@ | |||
14 | 54 | 54 | ||
15 | 55 | Button { | 55 | Button { |
16 | 56 | id: locationGPSButton | 56 | id: locationGPSButton |
18 | 57 | text: i18n.tr("Get by GPS location") | 57 | text: i18n.tr("Use my own location") |
19 | 58 | onClicked: { | 58 | onClicked: { |
20 | 59 | citiesModel.clear(); | 59 | citiesModel.clear(); |
21 | 60 | Api.WeatherApi.searchLocationByPoint({coords: {"lon":10,"lat":53.549999}, units:"metric"}, onSearchSuccess,onApiError); | 60 | Api.WeatherApi.searchLocationByPoint({coords: {"lon":10,"lat":53.549999}, units:"metric"}, onSearchSuccess,onApiError); |
22 | 61 | 61 | ||
23 | === modified file 'components/CurrentWeather.qml' | |||
24 | --- components/CurrentWeather.qml 2013-03-12 17:36:19 +0000 | |||
25 | +++ components/CurrentWeather.qml 2013-04-22 13:29:40 +0000 | |||
26 | @@ -1,12 +1,13 @@ | |||
27 | 1 | import QtQuick 2.0 | 1 | import QtQuick 2.0 |
28 | 2 | import Ubuntu.Components 0.1 | 2 | import Ubuntu.Components 0.1 |
30 | 3 | import "OpenWeatherMap.js" as Weather | 3 | import "./" as Components |
31 | 4 | 4 | ||
32 | 5 | Rectangle { | 5 | Rectangle { |
33 | 6 | id: currentWeather | 6 | id: currentWeather |
34 | 7 | 7 | ||
35 | 8 | // For Status I take the same condition codes from OpenWeatherMap (http://openweathermap.org/wiki/API/Weather_Condition_Codes) | 8 | // For Status I take the same condition codes from OpenWeatherMap (http://openweathermap.org/wiki/API/Weather_Condition_Codes) |
36 | 9 | property int condition | 9 | property int condition |
37 | 10 | property string icon | ||
38 | 10 | property int currentTemp | 11 | property int currentTemp |
39 | 11 | property int minTemp | 12 | property int minTemp |
40 | 12 | property int maxTemp | 13 | property int maxTemp |
41 | @@ -17,15 +18,24 @@ | |||
42 | 17 | height: childrenRect.height+units.gu(10) | 18 | height: childrenRect.height+units.gu(10) |
43 | 18 | anchors.horizontalCenter: parent.horizontalCenter | 19 | anchors.horizontalCenter: parent.horizontalCenter |
44 | 19 | 20 | ||
47 | 20 | Image { | 21 | Components.WeatherConditionIconComponent { |
48 | 21 | id: image1 | 22 | id: currentCondition |
49 | 22 | width: units.gu(30) | 23 | width: units.gu(30) |
50 | 23 | height: units.gu(30) | 24 | height: units.gu(30) |
51 | 24 | sourceSize.height: units.gu(30) | ||
52 | 25 | sourceSize.width: units.gu(30) | ||
53 | 26 | anchors.horizontalCenter: parent.horizontalCenter | 25 | anchors.horizontalCenter: parent.horizontalCenter |
56 | 27 | source: "../resources/images/"+Weather.getConditionIcon(condition)+".jpg" | 26 | condition: currentWeather.icon |
57 | 28 | fillMode: Image.PreserveAspectFit | 27 | |
58 | 28 | NumberAnimation on opacity { | ||
59 | 29 | id: createAnimation | ||
60 | 30 | easing.type: Easing.Linear | ||
61 | 31 | from: 0 | ||
62 | 32 | to: 1 | ||
63 | 33 | duration: 1000 | ||
64 | 34 | } | ||
65 | 35 | |||
66 | 36 | Component.onCompleted: { | ||
67 | 37 | createAnimation.start() | ||
68 | 38 | } | ||
69 | 29 | } | 39 | } |
70 | 30 | 40 | ||
71 | 31 | Rectangle { | 41 | Rectangle { |
72 | @@ -33,7 +43,7 @@ | |||
73 | 33 | width: units.gu(50) | 43 | width: units.gu(50) |
74 | 34 | height: units.gu(10) | 44 | height: units.gu(10) |
75 | 35 | anchors.horizontalCenter: parent.horizontalCenter | 45 | anchors.horizontalCenter: parent.horizontalCenter |
77 | 36 | anchors.top: image1.bottom | 46 | anchors.top: currentCondition.bottom |
78 | 37 | anchors.topMargin: 0 | 47 | anchors.topMargin: 0 |
79 | 38 | color: "#00000000" | 48 | color: "#00000000" |
80 | 39 | 49 | ||
81 | 40 | 50 | ||
82 | === modified file 'components/DayWeatherComponent.qml' | |||
83 | --- components/DayWeatherComponent.qml 2013-03-09 15:30:09 +0000 | |||
84 | +++ components/DayWeatherComponent.qml 2013-04-22 13:29:40 +0000 | |||
85 | @@ -1,5 +1,6 @@ | |||
86 | 1 | import QtQuick 2.0 | 1 | import QtQuick 2.0 |
87 | 2 | import Ubuntu.Components 0.1 | 2 | import Ubuntu.Components 0.1 |
88 | 3 | import "./" as Components | ||
89 | 3 | import "OpenWeatherMap.js" as Weather | 4 | import "OpenWeatherMap.js" as Weather |
90 | 4 | 5 | ||
91 | 5 | Rectangle { | 6 | Rectangle { |
92 | @@ -9,29 +10,27 @@ | |||
93 | 9 | height:contentShape.height+units.gu(2) | 10 | height:contentShape.height+units.gu(2) |
94 | 10 | 11 | ||
95 | 11 | property int condition | 12 | property int condition |
96 | 13 | property string icon | ||
97 | 12 | property int temperature | 14 | property int temperature |
98 | 13 | property int temperatureMin | 15 | property int temperatureMin |
99 | 14 | property bool metric: true | 16 | property bool metric: true |
100 | 15 | property string scale: (metric) ? "C" : "F" | 17 | property string scale: (metric) ? "C" : "F" |
101 | 16 | property string shapeColor: "#D6D6D6" | 18 | property string shapeColor: "#D6D6D6" |
102 | 17 | 19 | ||
103 | 18 | onConditionChanged: { | ||
104 | 19 | currentIcon.source = "../resources/images/"+Weather.getConditionIcon(condition)+"-day.png" | ||
105 | 20 | } | ||
106 | 21 | |||
107 | 22 | UbuntuShape{ | 20 | UbuntuShape{ |
108 | 23 | id: contentShape | 21 | id: contentShape |
109 | 24 | radius: "small" | 22 | radius: "small" |
110 | 25 | width: parent.width | 23 | width: parent.width |
111 | 26 | color: shapeColor | 24 | color: shapeColor |
112 | 27 | anchors.centerIn: parent | 25 | anchors.centerIn: parent |
114 | 28 | height:childrenRect.height | 26 | height: childrenRect.height |
115 | 29 | Row { | 27 | Row { |
116 | 30 | width:parent.width | 28 | width:parent.width |
118 | 31 | Image { | 29 | Components.WeatherConditionIconComponent { |
119 | 32 | id: currentIcon | 30 | id: currentIcon |
120 | 33 | height: units.gu(10) | 31 | height: units.gu(10) |
122 | 34 | fillMode: Image.PreserveAspectFit | 32 | width:units.gu(10) |
123 | 33 | condition: dayWeatherComponent.icon | ||
124 | 35 | } | 34 | } |
125 | 36 | Label { | 35 | Label { |
126 | 37 | id: currentTemp | 36 | id: currentTemp |
127 | 38 | 37 | ||
128 | === modified file 'components/LocationTab.qml' | |||
129 | --- components/LocationTab.qml 2013-04-20 16:17:57 +0000 | |||
130 | +++ components/LocationTab.qml 2013-04-22 13:29:40 +0000 | |||
131 | @@ -30,7 +30,8 @@ | |||
132 | 30 | todayDateComponent.renderText() | 30 | todayDateComponent.renderText() |
133 | 31 | 31 | ||
134 | 32 | // set current Condition | 32 | // set current Condition |
136 | 33 | currentCondition.condition = 801; //currentData.condition.id; | 33 | currentCondition.condition = currentData.condition.id; |
137 | 34 | currentCondition.icon = currentData.condition.icon; | ||
138 | 34 | currentCondition.currentTemp = currentData.temp; | 35 | currentCondition.currentTemp = currentData.temp; |
139 | 35 | currentCondition.minTemp = currentData.temp_min; | 36 | currentCondition.minTemp = currentData.temp_min; |
140 | 36 | currentCondition.maxTemp = currentData.temp_max; | 37 | currentCondition.maxTemp = currentData.temp_max; |
141 | @@ -44,7 +45,8 @@ | |||
142 | 44 | date: formatTimestamp(dailyForecasts[x].timestamp, 'dddd, dd MMMM yyyy'), | 45 | date: formatTimestamp(dailyForecasts[x].timestamp, 'dddd, dd MMMM yyyy'), |
143 | 45 | temp: dailyForecasts[x].temp, | 46 | temp: dailyForecasts[x].temp, |
144 | 46 | tempMin: dailyForecasts[x].night, | 47 | tempMin: dailyForecasts[x].night, |
146 | 47 | cond: 801 // dailyForecasts[x].condition.id; | 48 | cond: dailyForecasts[x].condition.id, |
147 | 49 | condIcon: dailyForecasts[x].condition.icon | ||
148 | 48 | }); | 50 | }); |
149 | 49 | } | 51 | } |
150 | 50 | } | 52 | } |
151 | @@ -111,7 +113,6 @@ | |||
152 | 111 | CurrentWeather { | 113 | CurrentWeather { |
153 | 112 | id: currentCondition | 114 | id: currentCondition |
154 | 113 | anchors.top: todayDateComponent.bottom | 115 | anchors.top: todayDateComponent.bottom |
155 | 114 | condition: 801 | ||
156 | 115 | } | 116 | } |
157 | 116 | /*ChartComponent{ | 117 | /*ChartComponent{ |
158 | 117 | id: chartComponent | 118 | id: chartComponent |
159 | @@ -138,6 +139,7 @@ | |||
160 | 138 | temperature: temp | 139 | temperature: temp |
161 | 139 | temperatureMin: tempMin | 140 | temperatureMin: tempMin |
162 | 140 | condition: cond | 141 | condition: cond |
163 | 142 | icon: condIcon | ||
164 | 141 | } | 143 | } |
165 | 142 | } | 144 | } |
166 | 143 | } | 145 | } |
167 | 144 | 146 | ||
168 | === modified file 'components/WeatherApi.js' | |||
169 | --- components/WeatherApi.js 2013-04-20 16:17:57 +0000 | |||
170 | +++ components/WeatherApi.js 2013-04-22 13:29:40 +0000 | |||
171 | @@ -79,7 +79,7 @@ | |||
172 | 79 | morn: f.morn, | 79 | morn: f.morn, |
173 | 80 | pressure: f.pressure, | 80 | pressure: f.pressure, |
174 | 81 | humidity: f.humidity, | 81 | humidity: f.humidity, |
176 | 82 | condition: f.weather, | 82 | condition: f.weather[0], |
177 | 83 | wind_speed: f.speed, | 83 | wind_speed: f.speed, |
178 | 84 | wind_deg: f.deg | 84 | wind_deg: f.deg |
179 | 85 | }); | 85 | }); |
180 | 86 | 86 | ||
181 | === added file 'components/WeatherConditionIconComponent.qml' | |||
182 | --- components/WeatherConditionIconComponent.qml 1970-01-01 00:00:00 +0000 | |||
183 | +++ components/WeatherConditionIconComponent.qml 2013-04-22 13:29:40 +0000 | |||
184 | @@ -0,0 +1,835 @@ | |||
185 | 1 | import QtQuick 2.0 | ||
186 | 2 | import QtGraphicalEffects 1.0 | ||
187 | 3 | import Ubuntu.Components 0.1 | ||
188 | 4 | |||
189 | 5 | Rectangle { | ||
190 | 6 | id: weatherCondition | ||
191 | 7 | color: "transparent" | ||
192 | 8 | state: "" | ||
193 | 9 | |||
194 | 10 | property string condition: "" | ||
195 | 11 | property bool __sun: false | ||
196 | 12 | property bool __moon: false | ||
197 | 13 | property bool __fewClouds: true | ||
198 | 14 | property bool __scattered: false | ||
199 | 15 | property bool __broken: false | ||
200 | 16 | property bool __rain: false | ||
201 | 17 | property bool __storm: false | ||
202 | 18 | property bool __snow: false | ||
203 | 19 | property bool __fog: false | ||
204 | 20 | |||
205 | 21 | onConditionChanged: weatherCondition.state = condition | ||
206 | 22 | |||
207 | 23 | Image { | ||
208 | 24 | id: sun | ||
209 | 25 | width: weatherCondition.width | ||
210 | 26 | height: weatherCondition.height | ||
211 | 27 | anchors.horizontalCenter: weatherCondition.horizontalCenter | ||
212 | 28 | anchors.top: weatherCondition.top | ||
213 | 29 | opacity: 0 | ||
214 | 30 | source: "../resources/images/sun.png" | ||
215 | 31 | fillMode: Image.PreserveAspectFit | ||
216 | 32 | } | ||
217 | 33 | Image { | ||
218 | 34 | id: moon | ||
219 | 35 | width: weatherCondition.width | ||
220 | 36 | height: weatherCondition.height | ||
221 | 37 | anchors.horizontalCenter: weatherCondition.horizontalCenter | ||
222 | 38 | anchors.top: weatherCondition.top | ||
223 | 39 | opacity: 0 | ||
224 | 40 | source: "../resources/images/moon.png" | ||
225 | 41 | fillMode: Image.PreserveAspectFit | ||
226 | 42 | } | ||
227 | 43 | Image { | ||
228 | 44 | id: snowflake1 | ||
229 | 45 | width: weatherCondition.width/6 | ||
230 | 46 | height: weatherCondition.height/6 | ||
231 | 47 | anchors { | ||
232 | 48 | left: weatherCondition.left | ||
233 | 49 | leftMargin: units.gu(0) | ||
234 | 50 | top: weatherCondition.top | ||
235 | 51 | topMargin:weatherCondition.height/1.5 | ||
236 | 52 | } | ||
237 | 53 | source: "../resources/images/snow.png" | ||
238 | 54 | fillMode: Image.PreserveAspectFit | ||
239 | 55 | opacity: 0 | ||
240 | 56 | RotationAnimation { id: snowflake1_anim; running: false; targets: snowflake1; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} | ||
241 | 57 | } | ||
242 | 58 | Image { | ||
243 | 59 | id: snowflake2 | ||
244 | 60 | width: weatherCondition.width/6 | ||
245 | 61 | height: weatherCondition.height/6 | ||
246 | 62 | anchors { | ||
247 | 63 | left: weatherCondition.left | ||
248 | 64 | leftMargin: weatherCondition.width/2.5 | ||
249 | 65 | top: weatherCondition.top | ||
250 | 66 | topMargin:weatherCondition.height/1.5 | ||
251 | 67 | } | ||
252 | 68 | source: "../resources/images/snow.png" | ||
253 | 69 | fillMode: Image.PreserveAspectFit | ||
254 | 70 | opacity: 0 | ||
255 | 71 | RotationAnimation { id: snowflake2_anim; running: false; targets: snowflake2; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} | ||
256 | 72 | } | ||
257 | 73 | Image { | ||
258 | 74 | id: snowflake3 | ||
259 | 75 | width: weatherCondition.width/6 | ||
260 | 76 | height: weatherCondition.height/6 | ||
261 | 77 | anchors { | ||
262 | 78 | left: weatherCondition.left | ||
263 | 79 | leftMargin: weatherCondition.width/1.2 | ||
264 | 80 | top: weatherCondition.top | ||
265 | 81 | topMargin:weatherCondition.height/1.5 | ||
266 | 82 | } | ||
267 | 83 | source: "../resources/images/snow.png" | ||
268 | 84 | fillMode: Image.PreserveAspectFit | ||
269 | 85 | opacity: 0 | ||
270 | 86 | RotationAnimation { id: snowflake3_anim; running: false; targets: snowflake3; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} | ||
271 | 87 | } | ||
272 | 88 | Image { | ||
273 | 89 | id: cloud1 | ||
274 | 90 | width: weatherCondition.width | ||
275 | 91 | height: weatherCondition.height | ||
276 | 92 | opacity: 0 | ||
277 | 93 | anchors { | ||
278 | 94 | left: weatherCondition.left | ||
279 | 95 | leftMargin: weatherCondition.width/3.6 | ||
280 | 96 | top: weatherCondition.top | ||
281 | 97 | topMargin: weatherCondition.height/7.5 | ||
282 | 98 | } | ||
283 | 99 | |||
284 | 100 | source: "../resources/images/cloud.png" | ||
285 | 101 | fillMode: Image.PreserveAspectFit | ||
286 | 102 | } | ||
287 | 103 | InnerShadow { | ||
288 | 104 | id: cloud1Glow | ||
289 | 105 | anchors.fill: cloud1 | ||
290 | 106 | radius: weatherCondition.height/10 | ||
291 | 107 | samples: 24 | ||
292 | 108 | horizontalOffset: 0 | ||
293 | 109 | verticalOffset: weatherCondition.height/-10 | ||
294 | 110 | color: "#FFFFFFFF" | ||
295 | 111 | source: cloud1 | ||
296 | 112 | opacity: 0 | ||
297 | 113 | } | ||
298 | 114 | Image { | ||
299 | 115 | id: rain1 | ||
300 | 116 | width: weatherCondition.width | ||
301 | 117 | height: weatherCondition.height | ||
302 | 118 | opacity: 0 | ||
303 | 119 | anchors { | ||
304 | 120 | left: cloud1.left | ||
305 | 121 | top: cloud1.top | ||
306 | 122 | topMargin: weatherCondition.height/10 | ||
307 | 123 | } | ||
308 | 124 | |||
309 | 125 | source: "../resources/images/rain.png" | ||
310 | 126 | fillMode: Image.PreserveAspectFit | ||
311 | 127 | } | ||
312 | 128 | Image { | ||
313 | 129 | id: lightning | ||
314 | 130 | width: weatherCondition.width | ||
315 | 131 | height: weatherCondition.height | ||
316 | 132 | opacity: 0 | ||
317 | 133 | anchors { | ||
318 | 134 | left: weatherCondition.left | ||
319 | 135 | top: weatherCondition.top | ||
320 | 136 | topMargin: weatherCondition.height/7.5 | ||
321 | 137 | } | ||
322 | 138 | |||
323 | 139 | source: "../resources/images/lightning.png" | ||
324 | 140 | fillMode: Image.PreserveAspectFit | ||
325 | 141 | } | ||
326 | 142 | ColorOverlay { | ||
327 | 143 | id: lightningfx | ||
328 | 144 | anchors.fill: lightning | ||
329 | 145 | source: lightning | ||
330 | 146 | color: "#FFFFFFFF" | ||
331 | 147 | opacity: 0 | ||
332 | 148 | } | ||
333 | 149 | Glow { | ||
334 | 150 | id: lightningGlow | ||
335 | 151 | anchors.fill: lightning | ||
336 | 152 | radius: weatherCondition.width/3.6 | ||
337 | 153 | samples: 24 | ||
338 | 154 | color: "yellow" | ||
339 | 155 | source: lightning | ||
340 | 156 | opacity: 0 | ||
341 | 157 | } | ||
342 | 158 | Image { | ||
343 | 159 | id: cloud2 | ||
344 | 160 | width: weatherCondition.width/1.2 | ||
345 | 161 | height: weatherCondition.height/1.2 | ||
346 | 162 | opacity: 0 | ||
347 | 163 | anchors { | ||
348 | 164 | left: weatherCondition.left | ||
349 | 165 | leftMargin: weatherCondition.width/3.6 | ||
350 | 166 | top: weatherCondition.top | ||
351 | 167 | topMargin: weatherCondition.height/10 | ||
352 | 168 | } | ||
353 | 169 | source: "../resources/images/cloud_darker.png" | ||
354 | 170 | fillMode: Image.PreserveAspectFit | ||
355 | 171 | } | ||
356 | 172 | Image { | ||
357 | 173 | id: cloud_dark1 | ||
358 | 174 | width: weatherCondition.width/1.2 | ||
359 | 175 | height: weatherCondition.height/1.2 | ||
360 | 176 | opacity: 0 | ||
361 | 177 | anchors { | ||
362 | 178 | left: weatherCondition.left | ||
363 | 179 | leftMargin: weatherCondition.width/3.6 | ||
364 | 180 | top: weatherCondition.top | ||
365 | 181 | topMargin: weatherCondition.height/10 | ||
366 | 182 | } | ||
367 | 183 | source: "../resources/images/cloud_dark.png" | ||
368 | 184 | fillMode: Image.PreserveAspectFit | ||
369 | 185 | } | ||
370 | 186 | InnerShadow { | ||
371 | 187 | id: cloud_dark1Glow | ||
372 | 188 | anchors.fill: cloud_dark1 | ||
373 | 189 | radius: weatherCondition.height/10 | ||
374 | 190 | samples: 24 | ||
375 | 191 | horizontalOffset: 0 | ||
376 | 192 | verticalOffset: weatherCondition.height/-10 | ||
377 | 193 | color: "#FFFFFFFF" | ||
378 | 194 | source: cloud_dark1 | ||
379 | 195 | opacity: 0 | ||
380 | 196 | } | ||
381 | 197 | Image { | ||
382 | 198 | id: rain2 | ||
383 | 199 | width: weatherCondition.width/1.2 | ||
384 | 200 | height: weatherCondition.height/1.2 | ||
385 | 201 | opacity: 0 | ||
386 | 202 | anchors { | ||
387 | 203 | left: weatherCondition.left | ||
388 | 204 | leftMargin: weatherCondition.height/-15 | ||
389 | 205 | top: weatherCondition.top | ||
390 | 206 | topMargin: weatherCondition.height/4.5 | ||
391 | 207 | } | ||
392 | 208 | |||
393 | 209 | source: "../resources/images/rain.png" | ||
394 | 210 | fillMode: Image.PreserveAspectFit | ||
395 | 211 | } | ||
396 | 212 | Image { | ||
397 | 213 | id: fog | ||
398 | 214 | width: weatherCondition.width | ||
399 | 215 | height: weatherCondition.width | ||
400 | 216 | anchors { | ||
401 | 217 | left:weatherCondition.left | ||
402 | 218 | top: weatherCondition.top | ||
403 | 219 | } | ||
404 | 220 | source: "../resources/images/fog.png" | ||
405 | 221 | fillMode: Image.PreserveAspectFit | ||
406 | 222 | opacity: 0 | ||
407 | 223 | } | ||
408 | 224 | FastBlur { | ||
409 | 225 | id: fogBlur1 | ||
410 | 226 | anchors.fill: fog | ||
411 | 227 | source: fog | ||
412 | 228 | radius: 24 | ||
413 | 229 | opacity: 0 | ||
414 | 230 | } | ||
415 | 231 | Image { | ||
416 | 232 | id: fog2 | ||
417 | 233 | width: weatherCondition.width/1.5 | ||
418 | 234 | height: weatherCondition.height/1.5 | ||
419 | 235 | anchors { | ||
420 | 236 | left:weatherCondition.left | ||
421 | 237 | leftMargin: weatherCondition.width/2 | ||
422 | 238 | top: weatherCondition.top | ||
423 | 239 | topMargin: weatherCondition.height/7.5 | ||
424 | 240 | } | ||
425 | 241 | source: "../resources/images/fog.png" | ||
426 | 242 | fillMode: Image.PreserveAspectFit | ||
427 | 243 | opacity: 0 | ||
428 | 244 | } | ||
429 | 245 | FastBlur { | ||
430 | 246 | id: fogBlur2 | ||
431 | 247 | anchors.fill: fog2 | ||
432 | 248 | source: fog2 | ||
433 | 249 | radius: 18 | ||
434 | 250 | opacity: 0 | ||
435 | 251 | } | ||
436 | 252 | |||
437 | 253 | // CONDITION ANIMATIONS | ||
438 | 254 | RotationAnimation { | ||
439 | 255 | id: anim_01 | ||
440 | 256 | running: false | ||
441 | 257 | targets: sun | ||
442 | 258 | properties: "rotation" | ||
443 | 259 | from: 0 | ||
444 | 260 | to: 360 | ||
445 | 261 | loops: Animation.Infinite | ||
446 | 262 | duration: 60000 | ||
447 | 263 | } | ||
448 | 264 | ParallelAnimation{ | ||
449 | 265 | id: anim_02 | ||
450 | 266 | running: false | ||
451 | 267 | SequentialAnimation { | ||
452 | 268 | loops: Animation.Infinite | ||
453 | 269 | ParallelAnimation{ | ||
454 | 270 | SequentialAnimation { | ||
455 | 271 | NumberAnimation { targets: cloud1; properties: "opacity"; from: 0; to: 1; duration: 1000 } | ||
456 | 272 | PauseAnimation {duration: 13000} | ||
457 | 273 | NumberAnimation { targets: cloud1; properties: "opacity"; from: 1; to: 0; duration: 1000 } | ||
458 | 274 | } | ||
459 | 275 | NumberAnimation {target: cloud1; property: "anchors.leftMargin"; from: weatherCondition.width/3.6; to: weatherCondition.width/-3.6; duration: 15000 } | ||
460 | 276 | ScriptAction {script: cloud1.anchors.topMargin = weatherCondition.height/7.5;} | ||
461 | 277 | } | ||
462 | 278 | PauseAnimation {duration: 15000} | ||
463 | 279 | } | ||
464 | 280 | SequentialAnimation { | ||
465 | 281 | loops: Animation.Infinite | ||
466 | 282 | PauseAnimation {duration: 17000} | ||
467 | 283 | ParallelAnimation{ | ||
468 | 284 | SequentialAnimation { | ||
469 | 285 | NumberAnimation { targets: cloud2; properties: "opacity"; from: 0; to: 1; duration: 1000 } | ||
470 | 286 | PauseAnimation {duration: 8000} | ||
471 | 287 | NumberAnimation { targets: cloud2; properties: "opacity"; from: 1; to: 0; duration: 1000 } | ||
472 | 288 | } | ||
473 | 289 | NumberAnimation { target: cloud2; property: "anchors.leftMargin"; from: weatherCondition.width/3.6; to: weatherCondition.height/-7.5; duration: 10000} | ||
474 | 290 | ScriptAction {script: cloud2.anchors.topMargin = weatherCondition.height/10;} | ||
475 | 291 | } | ||
476 | 292 | } | ||
477 | 293 | } | ||
478 | 294 | ParallelAnimation { | ||
479 | 295 | id: anim_11 | ||
480 | 296 | running: false | ||
481 | 297 | loops: Animation.Infinite | ||
482 | 298 | |||
483 | 299 | SequentialAnimation{ | ||
484 | 300 | PauseAnimation { duration: 2000 } | ||
485 | 301 | NumberAnimation {targets: cloud1Glow; properties: "opacity"; from: 0; to: 1; duration: 10} | ||
486 | 302 | NumberAnimation {targets: cloud1Glow; properties: "opacity"; from: 1; to: 0; duration: 1000} | ||
487 | 303 | } | ||
488 | 304 | SequentialAnimation{ | ||
489 | 305 | PauseAnimation { duration: 3000 } | ||
490 | 306 | NumberAnimation {targets: cloud_dark1Glow; properties: "opacity"; from: 0; to: 1; duration: 10} | ||
491 | 307 | NumberAnimation {targets: cloud_dark1Glow; properties: "opacity"; from: 1; to: 0; duration: 1000} | ||
492 | 308 | } | ||
493 | 309 | SequentialAnimation{ | ||
494 | 310 | PauseAnimation { duration: 2000 } | ||
495 | 311 | ParallelAnimation{ | ||
496 | 312 | NumberAnimation {targets: lightning; properties: "opacity"; from: 0; to: 1; duration: 10} | ||
497 | 313 | NumberAnimation {targets: lightningfx; properties: "opacity"; from: 0; to: 1; duration: 10} | ||
498 | 314 | NumberAnimation {targets: lightningGlow; properties: "opacity"; from: 0; to: 1; duration: 10} | ||
499 | 315 | } | ||
500 | 316 | ParallelAnimation { | ||
501 | 317 | NumberAnimation {targets: lightningGlow; properties: "opacity"; from: 1; to: 0; duration: 1000} | ||
502 | 318 | NumberAnimation {targets: lightningfx; properties: "opacity"; from: 1; to: 0; duration: 1000} | ||
503 | 319 | NumberAnimation {targets: lightning; properties: "opacity"; to: 0; duration: 2000} | ||
504 | 320 | } | ||
505 | 321 | } | ||
506 | 322 | } | ||
507 | 323 | ParallelAnimation { | ||
508 | 324 | id: anim_13 | ||
509 | 325 | running: false | ||
510 | 326 | SequentialAnimation { | ||
511 | 327 | loops: Animation.Infinite | ||
512 | 328 | |||
513 | 329 | PauseAnimation { duration: 1000 } | ||
514 | 330 | ParallelAnimation{ | ||
515 | 331 | NumberAnimation {target: snowflake1; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000} | ||
516 | 332 | NumberAnimation {target: snowflake1; properties: "anchors.leftMargin"; from:weatherCondition.width/6; to:weatherCondition.height/15; duration: 4000} | ||
517 | 333 | NumberAnimation {target: snowflake1; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000} | ||
518 | 334 | } | ||
519 | 335 | } | ||
520 | 336 | SequentialAnimation { | ||
521 | 337 | loops: Animation.Infinite | ||
522 | 338 | |||
523 | 339 | PauseAnimation { duration: 3000 } | ||
524 | 340 | ParallelAnimation { | ||
525 | 341 | NumberAnimation {target: snowflake2; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000} | ||
526 | 342 | NumberAnimation {target: snowflake2; properties: "anchors.leftMargin"; from:weatherCondition.width/2; to:weatherCondition.width/2.5; duration: 4000} | ||
527 | 343 | NumberAnimation {target: snowflake2; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000} | ||
528 | 344 | } | ||
529 | 345 | } | ||
530 | 346 | SequentialAnimation { | ||
531 | 347 | loops: Animation.Infinite | ||
532 | 348 | |||
533 | 349 | PauseAnimation { duration: 2000 } | ||
534 | 350 | ParallelAnimation { | ||
535 | 351 | NumberAnimation {target: snowflake3; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000} | ||
536 | 352 | NumberAnimation {target: snowflake3; properties: "anchors.leftMargin"; from:weatherCondition.width/1.2; to:weatherCondition.width/1.4; duration: 4000} | ||
537 | 353 | NumberAnimation {target: snowflake3; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000} | ||
538 | 354 | } | ||
539 | 355 | } | ||
540 | 356 | } | ||
541 | 357 | ParallelAnimation{ | ||
542 | 358 | id: anim_50 | ||
543 | 359 | running: false | ||
544 | 360 | SequentialAnimation { | ||
545 | 361 | loops: Animation.Infinite | ||
546 | 362 | ParallelAnimation{ | ||
547 | 363 | SequentialAnimation { | ||
548 | 364 | NumberAnimation { targets: fogBlur1; properties: "opacity"; from: 0; to: 1; duration: 1000 } | ||
549 | 365 | PauseAnimation {duration: 13000} | ||
550 | 366 | NumberAnimation { targets: fogBlur1; properties: "opacity"; from: 1; to: 0; duration: 1000 } | ||
551 | 367 | } | ||
552 | 368 | NumberAnimation {target: fogBlur1; property: "anchors.leftMargin"; from: weatherCondition.width/-3.6; to: weatherCondition.width/3.6; duration: 15000 } | ||
553 | 369 | } | ||
554 | 370 | PauseAnimation {duration: 2000} | ||
555 | 371 | } | ||
556 | 372 | SequentialAnimation { | ||
557 | 373 | loops: Animation.Infinite | ||
558 | 374 | PauseAnimation {duration: 3000} | ||
559 | 375 | ParallelAnimation{ | ||
560 | 376 | SequentialAnimation { | ||
561 | 377 | NumberAnimation { targets: fogBlur2; properties: "opacity"; from: 0; to: 0.8; duration: 1000 } | ||
562 | 378 | PauseAnimation {duration: 8000} | ||
563 | 379 | NumberAnimation { targets: fogBlur2; properties: "opacity"; from: 0.8; to: 0; duration: 1000 } | ||
564 | 380 | } | ||
565 | 381 | NumberAnimation { target: fogBlur2; property: "anchors.leftMargin"; from: weatherCondition.width/3.6; to: weatherCondition.height/-7.5; duration: 10000} | ||
566 | 382 | } | ||
567 | 383 | } | ||
568 | 384 | } | ||
569 | 385 | |||
570 | 386 | // CONDITION TRANSITION ANIMATIONS | ||
571 | 387 | ParallelAnimation { | ||
572 | 388 | id: anim_sunIn | ||
573 | 389 | NumberAnimation { targets: sun; properties: "opacity"; to: 1; duration: 1000 } | ||
574 | 390 | ScriptAction {script:{sun.anchors.horizontalCenterOffset=0;sun.anchors.topMargin=0;__sun = true;anim_01.start();}} | ||
575 | 391 | } | ||
576 | 392 | ParallelAnimation { | ||
577 | 393 | id: anim_moonIn | ||
578 | 394 | NumberAnimation { targets: moon; properties: "opacity"; to: 1; duration: 1000 } | ||
579 | 395 | ScriptAction {script:{moon.anchors.horizontalCenterOffset=0;moon.anchors.topMargin=0;__moon = true;}} | ||
580 | 396 | } | ||
581 | 397 | ParallelAnimation { | ||
582 | 398 | id: anim_sunOut | ||
583 | 399 | NumberAnimation { targets: sun; properties: "opacity"; to: 0; duration: 1000 } | ||
584 | 400 | ScriptAction {script:{__sun = false;anim_01.stop();}} | ||
585 | 401 | } | ||
586 | 402 | ParallelAnimation { | ||
587 | 403 | id: anim_moonOut | ||
588 | 404 | NumberAnimation { targets: moon; properties: "opacity"; to: 0; duration: 1000 } | ||
589 | 405 | ScriptAction {script:__moon = false;} | ||
590 | 406 | } | ||
591 | 407 | SequentialAnimation { | ||
592 | 408 | id: anim_moon2sun | ||
593 | 409 | ParallelAnimation { | ||
594 | 410 | NumberAnimation { targets: moon; properties: "anchors.horizontalCenterOffset"; from: units.gu(0); to: weatherCondition.width/1.5; duration: 1000 } | ||
595 | 411 | NumberAnimation { easing.type: Easing.InQuad; targets: moon; properties: "anchors.topMargin"; from: units.gu(0); to: weatherCondition.height/2.5; duration: 1000 } | ||
596 | 412 | NumberAnimation { targets: moon; properties: "opacity"; from: 1; to: 0; duration: 1000 } | ||
597 | 413 | } | ||
598 | 414 | ParallelAnimation { | ||
599 | 415 | NumberAnimation { targets: sun; properties: "anchors.horizontalCenterOffset"; from: weatherCondition.width/-1.5; to: units.gu(0); duration: 1000} | ||
600 | 416 | NumberAnimation { easing.type: Easing.OutQuad; targets: sun; properties: "anchors.topMargin"; from: weatherCondition.height/2.5; to: units.gu(0); duration: 1000 } | ||
601 | 417 | NumberAnimation { targets: sun; properties: "opacity"; from: 0; to: 1; duration: 1000 } | ||
602 | 418 | } | ||
603 | 419 | ScriptAction {script:{__sun=true; __moon=false;anim_01.start();}} | ||
604 | 420 | } | ||
605 | 421 | SequentialAnimation { | ||
606 | 422 | id: anim_sun2moon | ||
607 | 423 | ParallelAnimation { | ||
608 | 424 | NumberAnimation { targets: sun; properties: "anchors.horizontalCenterOffset"; from: units.gu(0); to: weatherCondition.width/1.5; duration: 1000 } | ||
609 | 425 | NumberAnimation { easing.type: Easing.InQuad; targets: sun; properties: "anchors.topMargin"; from: units.gu(0); to: weatherCondition.height/2.5; duration: 1000 } | ||
610 | 426 | NumberAnimation { targets: sun; properties: "opacity"; from: 1; to: 0; duration: 1000 } | ||
611 | 427 | } | ||
612 | 428 | ParallelAnimation { | ||
613 | 429 | NumberAnimation { targets: moon; properties: "anchors.horizontalCenterOffset"; from: weatherCondition.width/-1.5; to: units.gu(0); duration: 1000} | ||
614 | 430 | NumberAnimation { easing.type: Easing.OutQuad; targets: moon; properties: "anchors.topMargin"; from: weatherCondition.height/2.5; to: units.gu(0); duration: 1000 } | ||
615 | 431 | NumberAnimation { targets: moon; properties: "opacity"; from: 0; to: 1; duration: 1000 } | ||
616 | 432 | } | ||
617 | 433 | ScriptAction {script:{__sun=false; __moon=true;anim_01.stop();}} | ||
618 | 434 | } | ||
619 | 435 | ParallelAnimation { | ||
620 | 436 | id: anim_fewCloudsIn | ||
621 | 437 | SequentialAnimation{ | ||
622 | 438 | PauseAnimation {duration: 1000} | ||
623 | 439 | ScriptAction {script:{ | ||
624 | 440 | anim_02.restart(); | ||
625 | 441 | }} | ||
626 | 442 | } | ||
627 | 443 | ScriptAction {script:__fewClouds = true;} | ||
628 | 444 | } | ||
629 | 445 | ParallelAnimation { | ||
630 | 446 | id: anim_fewCloudsOut | ||
631 | 447 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000} | ||
632 | 448 | NumberAnimation { targets: cloud2; properties: "opacity"; to: 0; duration: 1000} | ||
633 | 449 | SequentialAnimation{ | ||
634 | 450 | PauseAnimation {duration: 1000} | ||
635 | 451 | ScriptAction {script:{ | ||
636 | 452 | anim_02.stop(); | ||
637 | 453 | }} | ||
638 | 454 | } | ||
639 | 455 | ScriptAction {script:__fewClouds = false;} | ||
640 | 456 | } | ||
641 | 457 | ParallelAnimation { | ||
642 | 458 | id: anim_scatCloudsIn | ||
643 | 459 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; to: weatherCondition.width/6; duration: 1000 } | ||
644 | 460 | NumberAnimation { target: cloud1; property: "anchors.topMargin"; to: weatherCondition.height/-15; duration: 1000 } | ||
645 | 461 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 1; duration: 1000 } | ||
646 | 462 | NumberAnimation { targets: cloud2; properties: "anchors.leftMargin"; to: weatherCondition.width/-15; duration: 1000 } | ||
647 | 463 | NumberAnimation { target: cloud2; property: "anchors.topMargin"; to: weatherCondition.height/7.5; duration: 1000 } | ||
648 | 464 | NumberAnimation { targets: cloud2; properties: "opacity"; to: 1; duration: 1000 } | ||
649 | 465 | ScriptAction {script:__scattered = true;} | ||
650 | 466 | } | ||
651 | 467 | ParallelAnimation { | ||
652 | 468 | id: anim_scatCloudsOut | ||
653 | 469 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; from: weatherCondition.width/6; to: weatherCondition.width/1.5; duration: 1000 } | ||
654 | 470 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000 } | ||
655 | 471 | NumberAnimation { targets: cloud2; properties: "anchors.leftMargin"; from: weatherCondition.width/-15; to: weatherCondition.width/-1.5; duration: 1000 } | ||
656 | 472 | NumberAnimation { targets: cloud2; properties: "opacity"; to: 0; duration: 1000 } | ||
657 | 473 | ScriptAction {script:__scattered = false;} | ||
658 | 474 | } | ||
659 | 475 | ParallelAnimation { | ||
660 | 476 | id: anim_brokenCloudsIn | ||
661 | 477 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; to: weatherCondition.width/6; duration: 1000 } | ||
662 | 478 | NumberAnimation { target: cloud1; property: "anchors.topMargin"; to: weatherCondition.height/-15; duration: 1000 } | ||
663 | 479 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 1; duration: 1000 } | ||
664 | 480 | NumberAnimation { targets: cloud_dark1; properties: "anchors.leftMargin"; to: weatherCondition.height/-15; duration: 1000 } | ||
665 | 481 | NumberAnimation { target: cloud_dark1; property: "anchors.topMargin"; to: weatherCondition.height/7.5; duration: 1000 } | ||
666 | 482 | NumberAnimation { targets: cloud_dark1; properties: "opacity"; to: 1; duration: 1000 } | ||
667 | 483 | ScriptAction {script:__broken = true;} | ||
668 | 484 | } | ||
669 | 485 | ParallelAnimation { | ||
670 | 486 | id: anim_brokenCloudsOut | ||
671 | 487 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; from: weatherCondition.width/6; to: weatherCondition.width/1.5; duration: 1000 } | ||
672 | 488 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000 } | ||
673 | 489 | NumberAnimation { targets: cloud_dark1; properties: "anchors.leftMargin"; from: weatherCondition.height/-15; to: weatherCondition.width/-1.5; duration: 1000 } | ||
674 | 490 | NumberAnimation { targets: cloud_dark1; properties: "opacity"; to: 0; duration: 1000 } | ||
675 | 491 | ScriptAction {script:__broken = false;} | ||
676 | 492 | } | ||
677 | 493 | ParallelAnimation { | ||
678 | 494 | id: anim_rainIn | ||
679 | 495 | NumberAnimation { targets: rain1; properties: "opacity"; to: 1; duration: 1000 } | ||
680 | 496 | NumberAnimation { targets: rain2; properties: "opacity"; to: 1; duration: 1000 } | ||
681 | 497 | ScriptAction {script:__rain = true;} | ||
682 | 498 | } | ||
683 | 499 | ParallelAnimation { | ||
684 | 500 | id: anim_rainOut | ||
685 | 501 | NumberAnimation { targets: rain1; properties: "opacity"; to: 0; duration: 1000 } | ||
686 | 502 | NumberAnimation { targets: rain2; properties: "opacity"; to: 0; duration: 1000 } | ||
687 | 503 | ScriptAction {script:__rain = false;} | ||
688 | 504 | } | ||
689 | 505 | ParallelAnimation { | ||
690 | 506 | id: anim_stormIn | ||
691 | 507 | ScriptAction {script:{__storm = true; anim_11.restart();}} | ||
692 | 508 | } | ||
693 | 509 | ParallelAnimation { | ||
694 | 510 | id: anim_stormOut | ||
695 | 511 | NumberAnimation { targets: lightning; properties: "opacity"; to: 0; duration: 1 } | ||
696 | 512 | NumberAnimation { targets: lightningfx; properties: "opacity"; to: 0; duration: 1 } | ||
697 | 513 | NumberAnimation { targets: lightningGlow; properties: "opacity"; to: 0; duration: 1 } | ||
698 | 514 | NumberAnimation { targets: cloud1Glow; properties: "opacity"; to: 0; duration: 1 } | ||
699 | 515 | NumberAnimation { targets: cloud_dark1Glow; properties: "opacity"; to: 0; duration: 1 } | ||
700 | 516 | ScriptAction {script:{__storm = false; anim_11.stop();}} | ||
701 | 517 | } | ||
702 | 518 | ParallelAnimation { | ||
703 | 519 | id: anim_snowIn | ||
704 | 520 | ScriptAction {script:{__snow = true; snowflake1_anim.start(); snowflake2_anim.start(); snowflake3_anim.start(); anim_13.restart();}} | ||
705 | 521 | } | ||
706 | 522 | ParallelAnimation { | ||
707 | 523 | id: anim_snowOut | ||
708 | 524 | NumberAnimation {targets: snowflake1; properties: "opacity"; to:0; duration: 1000} | ||
709 | 525 | NumberAnimation {targets: snowflake2; properties: "opacity"; to:0; duration: 1000} | ||
710 | 526 | NumberAnimation {targets: snowflake3; properties: "opacity"; to:0; duration: 1000} | ||
711 | 527 | ScriptAction {script:{__snow = false; snowflake1_anim.stop(); snowflake2_anim.stop(); snowflake3_anim.stop(); anim_13.stop();}} | ||
712 | 528 | } | ||
713 | 529 | SequentialAnimation { | ||
714 | 530 | id: anim_fogIn | ||
715 | 531 | |||
716 | 532 | PauseAnimation {duration: 1000} | ||
717 | 533 | ScriptAction {script:{anim_50.restart(); script:__fog = true;}} | ||
718 | 534 | } | ||
719 | 535 | ParallelAnimation { | ||
720 | 536 | id: anim_fogOut | ||
721 | 537 | NumberAnimation { targets: fogBlur1; properties: "opacity"; to: 0; duration: 1000} | ||
722 | 538 | NumberAnimation { targets: fogBlur2; properties: "opacity"; to: 0; duration: 1000} | ||
723 | 539 | SequentialAnimation{ | ||
724 | 540 | PauseAnimation {duration: 1000} | ||
725 | 541 | ScriptAction {script:{ | ||
726 | 542 | anim_50.stop(); | ||
727 | 543 | }} | ||
728 | 544 | } | ||
729 | 545 | ScriptAction {script:__fog = false;} | ||
730 | 546 | } | ||
731 | 547 | |||
732 | 548 | states: [ | ||
733 | 549 | State { | ||
734 | 550 | name: "01d" | ||
735 | 551 | StateChangeScript { | ||
736 | 552 | script: { | ||
737 | 553 | if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start(); | ||
738 | 554 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
739 | 555 | if(__rain) anim_rainOut.start(); | ||
740 | 556 | if(__storm) anim_stormOut.start(); | ||
741 | 557 | if(__snow) anim_snowOut.start(); | ||
742 | 558 | if(__broken) anim_brokenCloudsOut.start(); | ||
743 | 559 | if(__scattered) anim_scatCloudsOut.start(); | ||
744 | 560 | if(__fog) anim_fogOut.start(); | ||
745 | 561 | } | ||
746 | 562 | } | ||
747 | 563 | }, | ||
748 | 564 | State { | ||
749 | 565 | name: "01n" | ||
750 | 566 | StateChangeScript { | ||
751 | 567 | script: { | ||
752 | 568 | if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start(); | ||
753 | 569 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
754 | 570 | if(__rain) anim_rainOut.start(); | ||
755 | 571 | if(__storm) anim_stormOut.start(); | ||
756 | 572 | if(__snow) anim_snowOut.start(); | ||
757 | 573 | if(__broken) anim_brokenCloudsOut.start(); | ||
758 | 574 | if(__scattered) anim_scatCloudsOut.start(); | ||
759 | 575 | if(__fog) anim_fogOut.start(); | ||
760 | 576 | } | ||
761 | 577 | } | ||
762 | 578 | }, | ||
763 | 579 | State { | ||
764 | 580 | name: "02d" | ||
765 | 581 | StateChangeScript { | ||
766 | 582 | script: { | ||
767 | 583 | if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start(); | ||
768 | 584 | if(__scattered) anim_scatCloudsOut.start(); | ||
769 | 585 | if(__rain) anim_rainOut.start(); | ||
770 | 586 | if(__storm) anim_stormOut.start(); | ||
771 | 587 | if(__snow) anim_snowOut.start(); | ||
772 | 588 | if(__broken) anim_brokenCloudsOut.start(); | ||
773 | 589 | if(__fog) anim_fogOut.start(); | ||
774 | 590 | if(!__fewClouds) anim_fewCloudsIn.start(); | ||
775 | 591 | } | ||
776 | 592 | } | ||
777 | 593 | }, | ||
778 | 594 | State { | ||
779 | 595 | name: "02n" | ||
780 | 596 | StateChangeScript { | ||
781 | 597 | script: { | ||
782 | 598 | if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start(); | ||
783 | 599 | if(__scattered) anim_scatCloudsOut.start(); | ||
784 | 600 | if(__rain) anim_rainOut.start(); | ||
785 | 601 | if(__storm) anim_stormOut.start(); | ||
786 | 602 | if(__snow) anim_snowOut.start(); | ||
787 | 603 | if(__broken) anim_brokenCloudsOut.start(); | ||
788 | 604 | if(__fog) anim_fogOut.start(); | ||
789 | 605 | if(!__fewClouds) anim_fewCloudsIn.start(); | ||
790 | 606 | } | ||
791 | 607 | } | ||
792 | 608 | |||
793 | 609 | PropertyChanges { | ||
794 | 610 | target: lightning | ||
795 | 611 | opacity: 0 | ||
796 | 612 | } | ||
797 | 613 | }, | ||
798 | 614 | State { | ||
799 | 615 | name: "03d" | ||
800 | 616 | StateChangeScript { | ||
801 | 617 | script: { | ||
802 | 618 | if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start(); | ||
803 | 619 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
804 | 620 | if(__rain) anim_rainOut.start(); | ||
805 | 621 | if(__storm) anim_stormOut.start(); | ||
806 | 622 | if(__snow) anim_snowOut.start(); | ||
807 | 623 | if(__broken) anim_brokenCloudsOut.start(); | ||
808 | 624 | if(__fog) anim_fogOut.start(); | ||
809 | 625 | if(!__scattered) anim_scatCloudsIn.start(); | ||
810 | 626 | } | ||
811 | 627 | } | ||
812 | 628 | }, | ||
813 | 629 | State { | ||
814 | 630 | name: "03n" | ||
815 | 631 | StateChangeScript { | ||
816 | 632 | script: { | ||
817 | 633 | if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start(); | ||
818 | 634 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
819 | 635 | if(__rain) anim_rainOut.start(); | ||
820 | 636 | if(__storm) anim_stormOut.start(); | ||
821 | 637 | if(__snow) anim_snowOut.start(); | ||
822 | 638 | if(__broken) anim_brokenCloudsOut.start(); | ||
823 | 639 | if(__fog) anim_fogOut.start(); | ||
824 | 640 | if(!__scattered) anim_scatCloudsIn.start(); | ||
825 | 641 | } | ||
826 | 642 | } | ||
827 | 643 | }, | ||
828 | 644 | State { | ||
829 | 645 | name: "04d" | ||
830 | 646 | StateChangeScript { | ||
831 | 647 | script: { | ||
832 | 648 | if(__moon) anim_moonOut.start(); | ||
833 | 649 | if(__sun) anim_sunOut.start(); | ||
834 | 650 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
835 | 651 | if(__scattered) anim_scatCloudsOut.start(); | ||
836 | 652 | if(__rain) anim_rainOut.start(); | ||
837 | 653 | if(__storm) anim_stormOut.start(); | ||
838 | 654 | if(__snow) anim_snowOut.start(); | ||
839 | 655 | if(__fog) anim_fogOut.start(); | ||
840 | 656 | if(!__broken) anim_brokenCloudsIn.start(); | ||
841 | 657 | } | ||
842 | 658 | } | ||
843 | 659 | }, | ||
844 | 660 | State { | ||
845 | 661 | name: "04n" | ||
846 | 662 | StateChangeScript { | ||
847 | 663 | script: { | ||
848 | 664 | if(__moon) anim_moonOut.start(); | ||
849 | 665 | if(__sun) anim_sunOut.start(); | ||
850 | 666 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
851 | 667 | if(__scattered) anim_scatCloudsOut.start(); | ||
852 | 668 | if(__rain) anim_rainOut.start(); | ||
853 | 669 | if(__storm) anim_stormOut.start(); | ||
854 | 670 | if(__snow) anim_snowOut.start(); | ||
855 | 671 | if(__fog) anim_fogOut.start(); | ||
856 | 672 | if(!__broken) anim_brokenCloudsIn.start(); | ||
857 | 673 | } | ||
858 | 674 | } | ||
859 | 675 | }, | ||
860 | 676 | State { | ||
861 | 677 | name: "09d" | ||
862 | 678 | StateChangeScript { | ||
863 | 679 | script: { | ||
864 | 680 | if(__moon) anim_moonOut.start(); | ||
865 | 681 | if(__sun) anim_sunOut.start(); | ||
866 | 682 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
867 | 683 | if(__scattered) anim_scatCloudsOut.start(); | ||
868 | 684 | if(__storm) anim_stormOut.start(); | ||
869 | 685 | if(__snow) anim_snowOut.start(); | ||
870 | 686 | if(__fog) anim_fogOut.start(); | ||
871 | 687 | if(!__broken) anim_brokenCloudsIn.start(); | ||
872 | 688 | if(!__rain) anim_rainIn.start(); | ||
873 | 689 | } | ||
874 | 690 | } | ||
875 | 691 | }, | ||
876 | 692 | State { | ||
877 | 693 | name: "09n" | ||
878 | 694 | StateChangeScript { | ||
879 | 695 | script: { | ||
880 | 696 | if(__moon) anim_moonOut.start(); | ||
881 | 697 | if(__sun) anim_sunOut.start(); | ||
882 | 698 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
883 | 699 | if(__scattered) anim_scatCloudsOut.start(); | ||
884 | 700 | if(__storm) anim_stormOut.start(); | ||
885 | 701 | if(__snow) anim_snowOut.start(); | ||
886 | 702 | if(__fog) anim_fogOut.start(); | ||
887 | 703 | if(!__broken) anim_brokenCloudsIn.start(); | ||
888 | 704 | if(!__rain) anim_rainIn.start(); | ||
889 | 705 | } | ||
890 | 706 | } | ||
891 | 707 | }, | ||
892 | 708 | State { | ||
893 | 709 | name: "10d" | ||
894 | 710 | StateChangeScript { | ||
895 | 711 | script: { | ||
896 | 712 | if(__moon) anim_moon2sun.start(); else if(!__sun) anim_sunIn.start(); | ||
897 | 713 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
898 | 714 | if(__broken) anim_brokenCloudsOut.start(); | ||
899 | 715 | if(__storm) anim_stormOut.start(); | ||
900 | 716 | if(__snow) anim_snowOut.start(); | ||
901 | 717 | if(__fog) anim_fogOut.start(); | ||
902 | 718 | if(!__scattered) anim_scatCloudsIn.start(); | ||
903 | 719 | if(!__rain) anim_rainIn.start(); | ||
904 | 720 | } | ||
905 | 721 | } | ||
906 | 722 | }, | ||
907 | 723 | State { | ||
908 | 724 | name: "10n" | ||
909 | 725 | StateChangeScript { | ||
910 | 726 | script: { | ||
911 | 727 | if(__sun) anim_sun2moon.start(); else if(!__moon) anim_moonIn.start(); | ||
912 | 728 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
913 | 729 | if(__broken) anim_brokenCloudsOut.start(); | ||
914 | 730 | if(__storm) anim_stormOut.start(); | ||
915 | 731 | if(__snow) anim_snowOut.start(); | ||
916 | 732 | if(__fog) anim_fogOut.start(); | ||
917 | 733 | if(!__scattered) anim_scatCloudsIn.start(); | ||
918 | 734 | if(!__rain) anim_rainIn.start(); | ||
919 | 735 | } | ||
920 | 736 | } | ||
921 | 737 | }, | ||
922 | 738 | State { | ||
923 | 739 | name: "11d" | ||
924 | 740 | StateChangeScript { | ||
925 | 741 | script: { | ||
926 | 742 | if(__moon) anim_moonOut.start(); | ||
927 | 743 | if(__sun) anim_sunOut.start(); | ||
928 | 744 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
929 | 745 | if(__scattered) anim_scatCloudsOut.start(); | ||
930 | 746 | if(__rain) anim_rainOut.start(); | ||
931 | 747 | if(__snow) anim_snowOut.start(); | ||
932 | 748 | if(__fog) anim_fogOut.start(); | ||
933 | 749 | if(!__broken) anim_brokenCloudsIn.start(); | ||
934 | 750 | if(!__storm) anim_stormIn.start(); | ||
935 | 751 | } | ||
936 | 752 | } | ||
937 | 753 | }, | ||
938 | 754 | State { | ||
939 | 755 | name: "11n" | ||
940 | 756 | StateChangeScript { | ||
941 | 757 | script: { | ||
942 | 758 | if(__moon) anim_moonOut.start(); | ||
943 | 759 | if(__sun) anim_sunOut.start(); | ||
944 | 760 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
945 | 761 | if(__scattered) anim_scatCloudsOut.start(); | ||
946 | 762 | if(__rain) anim_rainOut.start(); | ||
947 | 763 | if(__snow) anim_snowOut.start(); | ||
948 | 764 | if(__fog) anim_fogOut.start(); | ||
949 | 765 | if(!__broken) anim_brokenCloudsIn.start(); | ||
950 | 766 | if(!__storm) anim_stormIn.start(); | ||
951 | 767 | } | ||
952 | 768 | } | ||
953 | 769 | }, | ||
954 | 770 | State { | ||
955 | 771 | name: "13d" | ||
956 | 772 | StateChangeScript { | ||
957 | 773 | script: { | ||
958 | 774 | if(__moon) anim_moonOut.start(); | ||
959 | 775 | if(__sun) anim_sunOut.start(); | ||
960 | 776 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
961 | 777 | if(__scattered) anim_scatCloudsOut.start(); | ||
962 | 778 | if(__rain) anim_rainOut.start(); | ||
963 | 779 | if(__storm) anim_stormOut.start(); | ||
964 | 780 | if(__fog) anim_fogOut.start(); | ||
965 | 781 | if(!__broken) anim_brokenCloudsIn.start(); | ||
966 | 782 | if(!__snow) anim_snowIn.start(); | ||
967 | 783 | } | ||
968 | 784 | } | ||
969 | 785 | }, | ||
970 | 786 | State { | ||
971 | 787 | name: "13n" | ||
972 | 788 | StateChangeScript { | ||
973 | 789 | script: { | ||
974 | 790 | if(__moon) anim_moonOut.start(); | ||
975 | 791 | if(__sun) anim_sunOut.start(); | ||
976 | 792 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
977 | 793 | if(__scattered) anim_scatCloudsOut.start(); | ||
978 | 794 | if(__rain) anim_rainOut.start(); | ||
979 | 795 | if(__storm) anim_stormOut.start(); | ||
980 | 796 | if(__fog) anim_fogOut.start(); | ||
981 | 797 | if(!__broken) anim_brokenCloudsIn.start(); | ||
982 | 798 | if(!__snow) anim_snowIn.start(); | ||
983 | 799 | } | ||
984 | 800 | } | ||
985 | 801 | }, | ||
986 | 802 | State { | ||
987 | 803 | name: "50d" | ||
988 | 804 | StateChangeScript { | ||
989 | 805 | script: { | ||
990 | 806 | if(__moon) anim_moonOut.start(); | ||
991 | 807 | if(__sun) anim_sunOut.start(); | ||
992 | 808 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
993 | 809 | if(__scattered) anim_scatCloudsOut.start(); | ||
994 | 810 | if(__rain) anim_rainOut.start(); | ||
995 | 811 | if(__storm) anim_stormOut.start(); | ||
996 | 812 | if(__broken) anim_brokenCloudsOut.start(); | ||
997 | 813 | if(__snow) anim_snowOut.start(); | ||
998 | 814 | if(!__fog) anim_fogIn.start(); | ||
999 | 815 | } | ||
1000 | 816 | } | ||
1001 | 817 | }, | ||
1002 | 818 | State { | ||
1003 | 819 | name: "50n" | ||
1004 | 820 | StateChangeScript { | ||
1005 | 821 | script: { | ||
1006 | 822 | if(__moon) anim_moonOut.start(); | ||
1007 | 823 | if(__sun) anim_sunOut.start(); | ||
1008 | 824 | if(__fewClouds) anim_fewCloudsOut.start(); | ||
1009 | 825 | if(__scattered) anim_scatCloudsOut.start(); | ||
1010 | 826 | if(__rain) anim_rainOut.start(); | ||
1011 | 827 | if(__storm) anim_stormOut.start(); | ||
1012 | 828 | if(__broken) anim_brokenCloudsOut.start(); | ||
1013 | 829 | if(__snow) anim_snowOut.start(); | ||
1014 | 830 | if(!__fog) anim_fogIn.start(); | ||
1015 | 831 | } | ||
1016 | 832 | } | ||
1017 | 833 | } | ||
1018 | 834 | ] | ||
1019 | 835 | } | ||
1020 | 0 | 836 | ||
1021 | === added file 'resources/images/cloud.png' | |||
1022 | 1 | Binary files resources/images/cloud.png 1970-01-01 00:00:00 +0000 and resources/images/cloud.png 2013-04-22 13:29:40 +0000 differ | 837 | Binary files resources/images/cloud.png 1970-01-01 00:00:00 +0000 and resources/images/cloud.png 2013-04-22 13:29:40 +0000 differ |
1023 | === added file 'resources/images/cloud_dark.png' | |||
1024 | 2 | Binary files resources/images/cloud_dark.png 1970-01-01 00:00:00 +0000 and resources/images/cloud_dark.png 2013-04-22 13:29:40 +0000 differ | 838 | Binary files resources/images/cloud_dark.png 1970-01-01 00:00:00 +0000 and resources/images/cloud_dark.png 2013-04-22 13:29:40 +0000 differ |
1025 | === added file 'resources/images/cloud_darker.png' | |||
1026 | 3 | Binary files resources/images/cloud_darker.png 1970-01-01 00:00:00 +0000 and resources/images/cloud_darker.png 2013-04-22 13:29:40 +0000 differ | 839 | Binary files resources/images/cloud_darker.png 1970-01-01 00:00:00 +0000 and resources/images/cloud_darker.png 2013-04-22 13:29:40 +0000 differ |
1027 | === added file 'resources/images/fog.png' | |||
1028 | 4 | Binary files resources/images/fog.png 1970-01-01 00:00:00 +0000 and resources/images/fog.png 2013-04-22 13:29:40 +0000 differ | 840 | Binary files resources/images/fog.png 1970-01-01 00:00:00 +0000 and resources/images/fog.png 2013-04-22 13:29:40 +0000 differ |
1029 | === added file 'resources/images/lightning.png' | |||
1030 | 5 | Binary files resources/images/lightning.png 1970-01-01 00:00:00 +0000 and resources/images/lightning.png 2013-04-22 13:29:40 +0000 differ | 841 | Binary files resources/images/lightning.png 1970-01-01 00:00:00 +0000 and resources/images/lightning.png 2013-04-22 13:29:40 +0000 differ |
1031 | === added file 'resources/images/moon.png' | |||
1032 | 6 | Binary files resources/images/moon.png 1970-01-01 00:00:00 +0000 and resources/images/moon.png 2013-04-22 13:29:40 +0000 differ | 842 | Binary files resources/images/moon.png 1970-01-01 00:00:00 +0000 and resources/images/moon.png 2013-04-22 13:29:40 +0000 differ |
1033 | === added file 'resources/images/rain.png' | |||
1034 | 7 | Binary files resources/images/rain.png 1970-01-01 00:00:00 +0000 and resources/images/rain.png 2013-04-22 13:29:40 +0000 differ | 843 | Binary files resources/images/rain.png 1970-01-01 00:00:00 +0000 and resources/images/rain.png 2013-04-22 13:29:40 +0000 differ |
1035 | === added file 'resources/images/snow.png' | |||
1036 | 8 | Binary files resources/images/snow.png 1970-01-01 00:00:00 +0000 and resources/images/snow.png 2013-04-22 13:29:40 +0000 differ | 844 | Binary files resources/images/snow.png 1970-01-01 00:00:00 +0000 and resources/images/snow.png 2013-04-22 13:29:40 +0000 differ |
1037 | === added file 'resources/images/sun.png' | |||
1038 | 9 | Binary files resources/images/sun.png 1970-01-01 00:00:00 +0000 and resources/images/sun.png 2013-04-22 13:29:40 +0000 differ | 845 | Binary files resources/images/sun.png 1970-01-01 00:00:00 +0000 and resources/images/sun.png 2013-04-22 13:29:40 +0000 differ |
PASSED: Continuous integration, rev:9 91.189. 93.125: 8080/job/ ubuntu- weather- app-ci/ 4/ 91.189. 93.125: 8080/job/ ubuntu- weather- app-quantal- amd64-ci/ 4 91.189. 93.125: 8080/job/ ubuntu- weather- app-raring- amd64-ci/ 4
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.125: 8080/job/ ubuntu- weather- app-ci/ 4/rebuild
http://