Merge lp:~martin-borho/ubuntu-weather-app/animations-stopper into lp:ubuntu-weather-app/obsolete.trunk
- animations-stopper
- Merge into trunk
Proposed by
Martin Borho
Status: | Merged |
---|---|
Approved by: | Raúl Yeguas |
Approved revision: | 38 |
Merged at revision: | 43 |
Proposed branch: | lp:~martin-borho/ubuntu-weather-app/animations-stopper |
Merge into: | lp:ubuntu-weather-app/obsolete.trunk |
Diff against target: |
279 lines (+59/-36) 1 file modified
components/WeatherConditionIconComponent.qml (+59/-36) |
To merge this branch: | bzr merge lp:~martin-borho/ubuntu-weather-app/animations-stopper |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raúl Yeguas | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+169832@code.launchpad.net |
Commit message
Stops animated icons to run forever.
Description of the change
Stops animated icons to run forever.
To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
review:
Approve
(continuous-integration)
Revision history for this message
Raúl Yeguas (neokore) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'components/WeatherConditionIconComponent.qml' | |||
2 | --- components/WeatherConditionIconComponent.qml 2013-05-18 10:57:14 +0000 | |||
3 | +++ components/WeatherConditionIconComponent.qml 2013-06-17 15:37:30 +0000 | |||
4 | @@ -58,7 +58,7 @@ | |||
5 | 58 | source: "../resources/images/snow.png" | 58 | source: "../resources/images/snow.png" |
6 | 59 | fillMode: Image.PreserveAspectFit | 59 | fillMode: Image.PreserveAspectFit |
7 | 60 | opacity: 0 | 60 | opacity: 0 |
9 | 61 | RotationAnimation { id: snowflake1_anim; running: false; targets: snowflake1; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} | 61 | //RotationAnimation { id: snowflake1_anim; running: false; targets: snowflake1; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} |
10 | 62 | } | 62 | } |
11 | 63 | Image { | 63 | Image { |
12 | 64 | id: snowflake2 | 64 | id: snowflake2 |
13 | @@ -73,7 +73,7 @@ | |||
14 | 73 | source: "../resources/images/snow.png" | 73 | source: "../resources/images/snow.png" |
15 | 74 | fillMode: Image.PreserveAspectFit | 74 | fillMode: Image.PreserveAspectFit |
16 | 75 | opacity: 0 | 75 | opacity: 0 |
18 | 76 | RotationAnimation { id: snowflake2_anim; running: false; targets: snowflake2; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} | 76 | //RotationAnimation { id: snowflake2_anim; running: false; targets: snowflake2; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} |
19 | 77 | } | 77 | } |
20 | 78 | Image { | 78 | Image { |
21 | 79 | id: snowflake3 | 79 | id: snowflake3 |
22 | @@ -88,7 +88,7 @@ | |||
23 | 88 | source: "../resources/images/snow.png" | 88 | source: "../resources/images/snow.png" |
24 | 89 | fillMode: Image.PreserveAspectFit | 89 | fillMode: Image.PreserveAspectFit |
25 | 90 | opacity: 0 | 90 | opacity: 0 |
27 | 91 | RotationAnimation { id: snowflake3_anim; running: false; targets: snowflake3; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} | 91 | //RotationAnimation { id: snowflake3_anim; running: false; targets: snowflake3; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite} |
28 | 92 | } | 92 | } |
29 | 93 | Image { | 93 | Image { |
30 | 94 | id: cloud1 | 94 | id: cloud1 |
31 | @@ -262,13 +262,14 @@ | |||
32 | 262 | targets: sun | 262 | targets: sun |
33 | 263 | properties: "rotation" | 263 | properties: "rotation" |
34 | 264 | from: 0 | 264 | from: 0 |
38 | 265 | to: 360 | 265 | to: 10 |
39 | 266 | loops: Animation.Infinite | 266 | //loops: Animation.Infinite |
40 | 267 | duration: 60000 | 267 | duration:1000 |
41 | 268 | } | 268 | } |
42 | 269 | ParallelAnimation{ | 269 | ParallelAnimation{ |
43 | 270 | id: anim_02 | 270 | id: anim_02 |
44 | 271 | running: false | 271 | running: false |
45 | 272 | paused: (running && !weatherCondition.visible) | ||
46 | 272 | SequentialAnimation { | 273 | SequentialAnimation { |
47 | 273 | loops: Animation.Infinite | 274 | loops: Animation.Infinite |
48 | 274 | ParallelAnimation{ | 275 | ParallelAnimation{ |
49 | @@ -284,6 +285,7 @@ | |||
50 | 284 | } | 285 | } |
51 | 285 | SequentialAnimation { | 286 | SequentialAnimation { |
52 | 286 | loops: Animation.Infinite | 287 | loops: Animation.Infinite |
53 | 288 | paused: (running && !weatherCondition.visible) | ||
54 | 287 | PauseAnimation {duration: 17000} | 289 | PauseAnimation {duration: 17000} |
55 | 288 | ParallelAnimation{ | 290 | ParallelAnimation{ |
56 | 289 | SequentialAnimation { | 291 | SequentialAnimation { |
57 | @@ -300,7 +302,7 @@ | |||
58 | 300 | id: anim_11 | 302 | id: anim_11 |
59 | 301 | running: false | 303 | running: false |
60 | 302 | loops: Animation.Infinite | 304 | loops: Animation.Infinite |
62 | 303 | 305 | paused: (running && !weatherCondition.visible) | |
63 | 304 | SequentialAnimation{ | 306 | SequentialAnimation{ |
64 | 305 | PauseAnimation { duration: 2000 } | 307 | PauseAnimation { duration: 2000 } |
65 | 306 | NumberAnimation {targets: cloud1Glow; properties: "opacity"; from: 0; to: 1; duration: 10} | 308 | NumberAnimation {targets: cloud1Glow; properties: "opacity"; from: 0; to: 1; duration: 10} |
66 | @@ -328,40 +330,42 @@ | |||
67 | 328 | ParallelAnimation { | 330 | ParallelAnimation { |
68 | 329 | id: anim_13 | 331 | id: anim_13 |
69 | 330 | running: false | 332 | running: false |
72 | 331 | SequentialAnimation { | 333 | paused: (running && !weatherCondition.visible) |
73 | 332 | loops: Animation.Infinite | 334 | SequentialAnimation { |
74 | 335 | //loops: Animation.Infinite | ||
75 | 336 | |||
76 | 337 | //PauseAnimation { duration: 1000 } | ||
77 | 338 | ParallelAnimation{ | ||
78 | 339 | NumberAnimation {target: snowflake1; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height*0.83; duration: 2000} | ||
79 | 340 | NumberAnimation {target: snowflake1; properties: "anchors.leftMargin"; from:weatherCondition.width/6; to:weatherCondition.height/15; duration: 2000} | ||
80 | 341 | NumberAnimation {target: snowflake1; easing.type: Easing.InQuint; properties: "opacity"; from: 0; to: 1; duration: 2000} | ||
81 | 342 | } | ||
82 | 343 | } | ||
83 | 344 | SequentialAnimation { | ||
84 | 345 | //loops: Animation.Infinite | ||
85 | 333 | 346 | ||
86 | 334 | PauseAnimation { duration: 1000 } | 347 | PauseAnimation { duration: 1000 } |
111 | 335 | ParallelAnimation{ | 348 | ParallelAnimation { |
112 | 336 | NumberAnimation {target: snowflake1; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000} | 349 | NumberAnimation {target: snowflake2; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height*0.8; duration: 2000} |
113 | 337 | NumberAnimation {target: snowflake1; properties: "anchors.leftMargin"; from:weatherCondition.width/6; to:weatherCondition.height/15; duration: 4000} | 350 | NumberAnimation {target: snowflake2; properties: "anchors.leftMargin"; from:weatherCondition.width/2; to:weatherCondition.width/2.5; duration: 2000} |
114 | 338 | NumberAnimation {target: snowflake1; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000} | 351 | NumberAnimation {target: snowflake2; easing.type: Easing.InQuint; properties: "opacity"; from: 0; to: 1; duration: 2000} |
115 | 339 | } | 352 | } |
116 | 340 | } | 353 | } |
117 | 341 | SequentialAnimation { | 354 | SequentialAnimation { |
118 | 342 | loops: Animation.Infinite | 355 | //loops: Animation.Infinite |
119 | 343 | 356 | ||
120 | 344 | PauseAnimation { duration: 3000 } | 357 | PauseAnimation { duration: 500 } |
121 | 345 | ParallelAnimation { | 358 | ParallelAnimation { |
122 | 346 | NumberAnimation {target: snowflake2; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000} | 359 | NumberAnimation {target: snowflake3; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height*0.86; duration: 2000} |
123 | 347 | NumberAnimation {target: snowflake2; properties: "anchors.leftMargin"; from:weatherCondition.width/2; to:weatherCondition.width/2.5; duration: 4000} | 360 | NumberAnimation {target: snowflake3; properties: "anchors.leftMargin"; from:weatherCondition.width/1.2; to:weatherCondition.width/1.4; duration: 2000} |
124 | 348 | NumberAnimation {target: snowflake2; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000} | 361 | NumberAnimation {target: snowflake3; easing.type: Easing.InQuint; properties: "opacity"; from: 0; to: 1; duration: 2000} |
101 | 349 | } | ||
102 | 350 | } | ||
103 | 351 | SequentialAnimation { | ||
104 | 352 | loops: Animation.Infinite | ||
105 | 353 | |||
106 | 354 | PauseAnimation { duration: 2000 } | ||
107 | 355 | ParallelAnimation { | ||
108 | 356 | NumberAnimation {target: snowflake3; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000} | ||
109 | 357 | NumberAnimation {target: snowflake3; properties: "anchors.leftMargin"; from:weatherCondition.width/1.2; to:weatherCondition.width/1.4; duration: 4000} | ||
110 | 358 | NumberAnimation {target: snowflake3; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000} | ||
125 | 359 | } | 362 | } |
126 | 360 | } | 363 | } |
127 | 361 | } | 364 | } |
128 | 362 | ParallelAnimation{ | 365 | ParallelAnimation{ |
129 | 363 | id: anim_50 | 366 | id: anim_50 |
130 | 364 | running: false | 367 | running: false |
131 | 368 | paused: (running && !weatherCondition.visible) | ||
132 | 365 | SequentialAnimation { | 369 | SequentialAnimation { |
133 | 366 | loops: Animation.Infinite | 370 | loops: Animation.Infinite |
134 | 367 | ParallelAnimation{ | 371 | ParallelAnimation{ |
135 | @@ -391,26 +395,31 @@ | |||
136 | 391 | // CONDITION TRANSITION ANIMATIONS | 395 | // CONDITION TRANSITION ANIMATIONS |
137 | 392 | ParallelAnimation { | 396 | ParallelAnimation { |
138 | 393 | id: anim_sunIn | 397 | id: anim_sunIn |
139 | 398 | paused: (running && !weatherCondition.visible) | ||
140 | 394 | NumberAnimation { targets: sun; properties: "opacity"; to: 1; duration: 1000 } | 399 | NumberAnimation { targets: sun; properties: "opacity"; to: 1; duration: 1000 } |
141 | 395 | ScriptAction {script:{sun.anchors.horizontalCenterOffset=0;sun.anchors.topMargin=0;__sun = true;anim_01.start();}} | 400 | ScriptAction {script:{sun.anchors.horizontalCenterOffset=0;sun.anchors.topMargin=0;__sun = true;anim_01.start();}} |
142 | 396 | } | 401 | } |
143 | 397 | ParallelAnimation { | 402 | ParallelAnimation { |
144 | 398 | id: anim_moonIn | 403 | id: anim_moonIn |
145 | 404 | paused: (running && !weatherCondition.visible) | ||
146 | 399 | NumberAnimation { targets: moon; properties: "opacity"; to: 1; duration: 1000 } | 405 | NumberAnimation { targets: moon; properties: "opacity"; to: 1; duration: 1000 } |
147 | 400 | ScriptAction {script:{moon.anchors.horizontalCenterOffset=0;moon.anchors.topMargin=0;__moon = true;}} | 406 | ScriptAction {script:{moon.anchors.horizontalCenterOffset=0;moon.anchors.topMargin=0;__moon = true;}} |
148 | 401 | } | 407 | } |
149 | 402 | ParallelAnimation { | 408 | ParallelAnimation { |
150 | 403 | id: anim_sunOut | 409 | id: anim_sunOut |
151 | 410 | paused: (running && !weatherCondition.visible) | ||
152 | 404 | NumberAnimation { targets: sun; properties: "opacity"; to: 0; duration: 1000 } | 411 | NumberAnimation { targets: sun; properties: "opacity"; to: 0; duration: 1000 } |
153 | 405 | ScriptAction {script:{__sun = false;anim_01.stop();}} | 412 | ScriptAction {script:{__sun = false;anim_01.stop();}} |
154 | 406 | } | 413 | } |
155 | 407 | ParallelAnimation { | 414 | ParallelAnimation { |
156 | 408 | id: anim_moonOut | 415 | id: anim_moonOut |
157 | 416 | paused: (running && !weatherCondition.visible) | ||
158 | 409 | NumberAnimation { targets: moon; properties: "opacity"; to: 0; duration: 1000 } | 417 | NumberAnimation { targets: moon; properties: "opacity"; to: 0; duration: 1000 } |
159 | 410 | ScriptAction {script:__moon = false;} | 418 | ScriptAction {script:__moon = false;} |
160 | 411 | } | 419 | } |
161 | 412 | SequentialAnimation { | 420 | SequentialAnimation { |
162 | 413 | id: anim_moon2sun | 421 | id: anim_moon2sun |
163 | 422 | paused: (running && !weatherCondition.visible) | ||
164 | 414 | ParallelAnimation { | 423 | ParallelAnimation { |
165 | 415 | NumberAnimation { targets: moon; properties: "anchors.horizontalCenterOffset"; from: units.gu(0); to: weatherCondition.width/1.5; duration: 1000 } | 424 | NumberAnimation { targets: moon; properties: "anchors.horizontalCenterOffset"; from: units.gu(0); to: weatherCondition.width/1.5; duration: 1000 } |
166 | 416 | NumberAnimation { easing.type: Easing.InQuad; targets: moon; properties: "anchors.topMargin"; from: units.gu(0); to: weatherCondition.height/2.5; duration: 1000 } | 425 | NumberAnimation { easing.type: Easing.InQuad; targets: moon; properties: "anchors.topMargin"; from: units.gu(0); to: weatherCondition.height/2.5; duration: 1000 } |
167 | @@ -425,6 +434,7 @@ | |||
168 | 425 | } | 434 | } |
169 | 426 | SequentialAnimation { | 435 | SequentialAnimation { |
170 | 427 | id: anim_sun2moon | 436 | id: anim_sun2moon |
171 | 437 | paused: (running && !weatherCondition.visible) | ||
172 | 428 | ParallelAnimation { | 438 | ParallelAnimation { |
173 | 429 | NumberAnimation { targets: sun; properties: "anchors.horizontalCenterOffset"; from: units.gu(0); to: weatherCondition.width/1.5; duration: 1000 } | 439 | NumberAnimation { targets: sun; properties: "anchors.horizontalCenterOffset"; from: units.gu(0); to: weatherCondition.width/1.5; duration: 1000 } |
174 | 430 | NumberAnimation { easing.type: Easing.InQuad; targets: sun; properties: "anchors.topMargin"; from: units.gu(0); to: weatherCondition.height/2.5; duration: 1000 } | 440 | NumberAnimation { easing.type: Easing.InQuad; targets: sun; properties: "anchors.topMargin"; from: units.gu(0); to: weatherCondition.height/2.5; duration: 1000 } |
175 | @@ -439,6 +449,7 @@ | |||
176 | 439 | } | 449 | } |
177 | 440 | ParallelAnimation { | 450 | ParallelAnimation { |
178 | 441 | id: anim_fewCloudsIn | 451 | id: anim_fewCloudsIn |
179 | 452 | paused: (running && !weatherCondition.visible) | ||
180 | 442 | SequentialAnimation{ | 453 | SequentialAnimation{ |
181 | 443 | PauseAnimation {duration: 1000} | 454 | PauseAnimation {duration: 1000} |
182 | 444 | ScriptAction {script:{ | 455 | ScriptAction {script:{ |
183 | @@ -449,6 +460,7 @@ | |||
184 | 449 | } | 460 | } |
185 | 450 | ParallelAnimation { | 461 | ParallelAnimation { |
186 | 451 | id: anim_fewCloudsOut | 462 | id: anim_fewCloudsOut |
187 | 463 | paused: (running && !weatherCondition.visible) | ||
188 | 452 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000} | 464 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000} |
189 | 453 | NumberAnimation { targets: cloud2; properties: "opacity"; to: 0; duration: 1000} | 465 | NumberAnimation { targets: cloud2; properties: "opacity"; to: 0; duration: 1000} |
190 | 454 | SequentialAnimation{ | 466 | SequentialAnimation{ |
191 | @@ -461,6 +473,7 @@ | |||
192 | 461 | } | 473 | } |
193 | 462 | ParallelAnimation { | 474 | ParallelAnimation { |
194 | 463 | id: anim_scatCloudsIn | 475 | id: anim_scatCloudsIn |
195 | 476 | paused: (running && !weatherCondition.visible) | ||
196 | 464 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; to: weatherCondition.width/6; duration: 1000 } | 477 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; to: weatherCondition.width/6; duration: 1000 } |
197 | 465 | NumberAnimation { target: cloud1; property: "anchors.topMargin"; to: weatherCondition.height/-15; duration: 1000 } | 478 | NumberAnimation { target: cloud1; property: "anchors.topMargin"; to: weatherCondition.height/-15; duration: 1000 } |
198 | 466 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 1; duration: 1000 } | 479 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 1; duration: 1000 } |
199 | @@ -471,6 +484,7 @@ | |||
200 | 471 | } | 484 | } |
201 | 472 | ParallelAnimation { | 485 | ParallelAnimation { |
202 | 473 | id: anim_scatCloudsOut | 486 | id: anim_scatCloudsOut |
203 | 487 | paused: (running && !weatherCondition.visible) | ||
204 | 474 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; from: weatherCondition.width/6; to: weatherCondition.width/1.5; duration: 1000 } | 488 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; from: weatherCondition.width/6; to: weatherCondition.width/1.5; duration: 1000 } |
205 | 475 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000 } | 489 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000 } |
206 | 476 | NumberAnimation { targets: cloud2; properties: "anchors.leftMargin"; from: weatherCondition.width/-15; to: weatherCondition.width/-1.5; duration: 1000 } | 490 | NumberAnimation { targets: cloud2; properties: "anchors.leftMargin"; from: weatherCondition.width/-15; to: weatherCondition.width/-1.5; duration: 1000 } |
207 | @@ -479,6 +493,7 @@ | |||
208 | 479 | } | 493 | } |
209 | 480 | ParallelAnimation { | 494 | ParallelAnimation { |
210 | 481 | id: anim_brokenCloudsIn | 495 | id: anim_brokenCloudsIn |
211 | 496 | paused: (running && !weatherCondition.visible) | ||
212 | 482 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; to: weatherCondition.width/6; duration: 1000 } | 497 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; to: weatherCondition.width/6; duration: 1000 } |
213 | 483 | NumberAnimation { target: cloud1; property: "anchors.topMargin"; to: weatherCondition.height/-15; duration: 1000 } | 498 | NumberAnimation { target: cloud1; property: "anchors.topMargin"; to: weatherCondition.height/-15; duration: 1000 } |
214 | 484 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 1; duration: 1000 } | 499 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 1; duration: 1000 } |
215 | @@ -489,6 +504,7 @@ | |||
216 | 489 | } | 504 | } |
217 | 490 | ParallelAnimation { | 505 | ParallelAnimation { |
218 | 491 | id: anim_brokenCloudsOut | 506 | id: anim_brokenCloudsOut |
219 | 507 | paused: (running && !weatherCondition.visible) | ||
220 | 492 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; from: weatherCondition.width/6; to: weatherCondition.width/1.5; duration: 1000 } | 508 | NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; from: weatherCondition.width/6; to: weatherCondition.width/1.5; duration: 1000 } |
221 | 493 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000 } | 509 | NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000 } |
222 | 494 | NumberAnimation { targets: cloud_dark1; properties: "anchors.leftMargin"; from: weatherCondition.height/-15; to: weatherCondition.width/-1.5; duration: 1000 } | 510 | NumberAnimation { targets: cloud_dark1; properties: "anchors.leftMargin"; from: weatherCondition.height/-15; to: weatherCondition.width/-1.5; duration: 1000 } |
223 | @@ -497,22 +513,26 @@ | |||
224 | 497 | } | 513 | } |
225 | 498 | ParallelAnimation { | 514 | ParallelAnimation { |
226 | 499 | id: anim_rainIn | 515 | id: anim_rainIn |
227 | 516 | paused: (running && !weatherCondition.visible) | ||
228 | 500 | NumberAnimation { targets: rain1; properties: "opacity"; to: 1; duration: 1000 } | 517 | NumberAnimation { targets: rain1; properties: "opacity"; to: 1; duration: 1000 } |
229 | 501 | NumberAnimation { targets: rain2; properties: "opacity"; to: 1; duration: 1000 } | 518 | NumberAnimation { targets: rain2; properties: "opacity"; to: 1; duration: 1000 } |
230 | 502 | ScriptAction {script:__rain = true;} | 519 | ScriptAction {script:__rain = true;} |
231 | 503 | } | 520 | } |
232 | 504 | ParallelAnimation { | 521 | ParallelAnimation { |
233 | 505 | id: anim_rainOut | 522 | id: anim_rainOut |
234 | 523 | paused: (running && !weatherCondition.visible) | ||
235 | 506 | NumberAnimation { targets: rain1; properties: "opacity"; to: 0; duration: 1000 } | 524 | NumberAnimation { targets: rain1; properties: "opacity"; to: 0; duration: 1000 } |
236 | 507 | NumberAnimation { targets: rain2; properties: "opacity"; to: 0; duration: 1000 } | 525 | NumberAnimation { targets: rain2; properties: "opacity"; to: 0; duration: 1000 } |
237 | 508 | ScriptAction {script:__rain = false;} | 526 | ScriptAction {script:__rain = false;} |
238 | 509 | } | 527 | } |
239 | 510 | ParallelAnimation { | 528 | ParallelAnimation { |
240 | 511 | id: anim_stormIn | 529 | id: anim_stormIn |
241 | 530 | paused: (running && !weatherCondition.visible) | ||
242 | 512 | ScriptAction {script:{__storm = true; anim_11.restart();}} | 531 | ScriptAction {script:{__storm = true; anim_11.restart();}} |
243 | 513 | } | 532 | } |
244 | 514 | ParallelAnimation { | 533 | ParallelAnimation { |
245 | 515 | id: anim_stormOut | 534 | id: anim_stormOut |
246 | 535 | paused: (running && !weatherCondition.visible) | ||
247 | 516 | NumberAnimation { targets: lightning; properties: "opacity"; to: 0; duration: 1 } | 536 | NumberAnimation { targets: lightning; properties: "opacity"; to: 0; duration: 1 } |
248 | 517 | NumberAnimation { targets: lightningfx; properties: "opacity"; to: 0; duration: 1 } | 537 | NumberAnimation { targets: lightningfx; properties: "opacity"; to: 0; duration: 1 } |
249 | 518 | NumberAnimation { targets: lightningGlow; properties: "opacity"; to: 0; duration: 1 } | 538 | NumberAnimation { targets: lightningGlow; properties: "opacity"; to: 0; duration: 1 } |
250 | @@ -522,23 +542,26 @@ | |||
251 | 522 | } | 542 | } |
252 | 523 | ParallelAnimation { | 543 | ParallelAnimation { |
253 | 524 | id: anim_snowIn | 544 | id: anim_snowIn |
255 | 525 | ScriptAction {script:{__snow = true; snowflake1_anim.start(); snowflake2_anim.start(); snowflake3_anim.start(); anim_13.restart();}} | 545 | paused: (running && !weatherCondition.visible) |
256 | 546 | ScriptAction {script:{__snow = true; /*snowflake1_anim.start(); snowflake2_anim.start(); snowflake3_anim.start();*/ anim_13.start();}} | ||
257 | 526 | } | 547 | } |
258 | 527 | ParallelAnimation { | 548 | ParallelAnimation { |
259 | 528 | id: anim_snowOut | 549 | id: anim_snowOut |
260 | 550 | paused: (running && !weatherCondition.visible) | ||
261 | 529 | NumberAnimation {targets: snowflake1; properties: "opacity"; to:0; duration: 1000} | 551 | NumberAnimation {targets: snowflake1; properties: "opacity"; to:0; duration: 1000} |
262 | 530 | NumberAnimation {targets: snowflake2; properties: "opacity"; to:0; duration: 1000} | 552 | NumberAnimation {targets: snowflake2; properties: "opacity"; to:0; duration: 1000} |
263 | 531 | NumberAnimation {targets: snowflake3; properties: "opacity"; to:0; duration: 1000} | 553 | NumberAnimation {targets: snowflake3; properties: "opacity"; to:0; duration: 1000} |
265 | 532 | ScriptAction {script:{__snow = false; snowflake1_anim.stop(); snowflake2_anim.stop(); snowflake3_anim.stop(); anim_13.stop();}} | 554 | ScriptAction {script:{__snow = false; /*snowflake1_anim.stop(); snowflake2_anim.stop(); snowflake3_anim.stop();*/ /*anim_13.stop();*/}} |
266 | 533 | } | 555 | } |
267 | 534 | SequentialAnimation { | 556 | SequentialAnimation { |
268 | 535 | id: anim_fogIn | 557 | id: anim_fogIn |
270 | 536 | 558 | paused: (running && !weatherCondition.visible) | |
271 | 537 | PauseAnimation {duration: 1000} | 559 | PauseAnimation {duration: 1000} |
272 | 538 | ScriptAction {script:{anim_50.restart(); script:__fog = true;}} | 560 | ScriptAction {script:{anim_50.restart(); script:__fog = true;}} |
273 | 539 | } | 561 | } |
274 | 540 | ParallelAnimation { | 562 | ParallelAnimation { |
275 | 541 | id: anim_fogOut | 563 | id: anim_fogOut |
276 | 564 | paused: (running && !weatherCondition.visible) | ||
277 | 542 | NumberAnimation { targets: fogBlur1; properties: "opacity"; to: 0; duration: 1000} | 565 | NumberAnimation { targets: fogBlur1; properties: "opacity"; to: 0; duration: 1000} |
278 | 543 | NumberAnimation { targets: fogBlur2; properties: "opacity"; to: 0; duration: 1000} | 566 | NumberAnimation { targets: fogBlur2; properties: "opacity"; to: 0; duration: 1000} |
279 | 544 | SequentialAnimation{ | 567 | SequentialAnimation{ |
PASSED: Continuous integration, rev:38 91.189. 93.125: 8080/job/ ubuntu- weather- app-ci/ 23/ 91.189. 93.125: 8080/job/ ubuntu- weather- app-quantal- amd64-ci/ 20 91.189. 93.125: 8080/job/ ubuntu- weather- app-raring- amd64-ci/ 23
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.125: 8080/job/ ubuntu- weather- app-ci/ 23/rebuild
http://