Merge lp:~martin-borho/ubuntu-weather-app/animations-stopper into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Stops animated icons to run forever.

Stops animated icons to run forever.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:38
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/23/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/20
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/23

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/23/rebuild

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

review: Approve

=== modified file 'components/WeatherConditionIconComponent.qml'
--- components/WeatherConditionIconComponent.qml	2013-05-18 10:57:14 +0000
+++ components/WeatherConditionIconComponent.qml	2013-06-17 15:37:30 +0000
@@ -58,7 +58,7 @@
         source: "../resources/images/snow.png"
         fillMode: Image.PreserveAspectFit
         opacity: 0
-        RotationAnimation { id: snowflake1_anim; running: false; targets: snowflake1; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite}
+        //RotationAnimation { id: snowflake1_anim; running: false; targets: snowflake1; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite}
     }
     Image {
         id: snowflake2
@@ -73,7 +73,7 @@
         source: "../resources/images/snow.png"
         fillMode: Image.PreserveAspectFit
         opacity: 0
-        RotationAnimation { id: snowflake2_anim; running: false; targets: snowflake2; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite}
+        //RotationAnimation { id: snowflake2_anim; running: false; targets: snowflake2; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite}
     }
     Image {
         id: snowflake3
@@ -88,7 +88,7 @@
         source: "../resources/images/snow.png"
         fillMode: Image.PreserveAspectFit
         opacity: 0
-        RotationAnimation { id: snowflake3_anim; running: false; targets: snowflake3; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite}
+        //RotationAnimation { id: snowflake3_anim; running: false; targets: snowflake3; properties: "rotation"; from: 0; to: 360; duration: 30000; loops: Animation.Infinite}
     }
     Image {
         id: cloud1
@@ -262,13 +262,14 @@
         targets: sun
         properties: "rotation"
         from: 0
-        to: 360
-        loops: Animation.Infinite
-        duration: 60000
+        to: 10
+        //loops: Animation.Infinite
+        duration:1000
     }
     ParallelAnimation{
         id: anim_02
         running: false
+        paused: (running && !weatherCondition.visible)
         SequentialAnimation {
             loops: Animation.Infinite
             ParallelAnimation{
@@ -284,6 +285,7 @@
         }
         SequentialAnimation {
             loops: Animation.Infinite
+            paused: (running && !weatherCondition.visible)
             PauseAnimation {duration: 17000}
             ParallelAnimation{
                 SequentialAnimation {
@@ -300,7 +302,7 @@
         id: anim_11
         running: false
         loops: Animation.Infinite
-
+        paused: (running && !weatherCondition.visible)
         SequentialAnimation{
             PauseAnimation { duration: 2000 }
             NumberAnimation {targets: cloud1Glow; properties: "opacity"; from: 0; to: 1; duration: 10}
@@ -328,40 +330,42 @@
     ParallelAnimation {
         id: anim_13
         running: false
-        SequentialAnimation {
-            loops: Animation.Infinite
+        paused: (running && !weatherCondition.visible)
+        SequentialAnimation {
+            //loops: Animation.Infinite
+
+            //PauseAnimation { duration: 1000 }
+            ParallelAnimation{
+                NumberAnimation {target: snowflake1; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height*0.83; duration: 2000}
+                NumberAnimation {target: snowflake1; properties: "anchors.leftMargin"; from:weatherCondition.width/6; to:weatherCondition.height/15; duration: 2000}
+                NumberAnimation {target: snowflake1; easing.type: Easing.InQuint; properties: "opacity"; from: 0; to: 1; duration: 2000}
+            }
+        }
+        SequentialAnimation {
+            //loops: Animation.Infinite
 
             PauseAnimation { duration: 1000 }
-            ParallelAnimation{
-                NumberAnimation {target: snowflake1; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000}
-                NumberAnimation {target: snowflake1; properties: "anchors.leftMargin"; from:weatherCondition.width/6; to:weatherCondition.height/15; duration: 4000}
-                NumberAnimation {target: snowflake1; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000}
-            }
-        }
-        SequentialAnimation {
-            loops: Animation.Infinite
-
-            PauseAnimation { duration: 3000 }
-            ParallelAnimation {
-                NumberAnimation {target: snowflake2; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000}
-                NumberAnimation {target: snowflake2; properties: "anchors.leftMargin"; from:weatherCondition.width/2; to:weatherCondition.width/2.5; duration: 4000}
-                NumberAnimation {target: snowflake2; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000}
-            }
-        }
-        SequentialAnimation {
-            loops: Animation.Infinite
-
-            PauseAnimation { duration: 2000 }
-            ParallelAnimation {
-                NumberAnimation {target: snowflake3; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height; duration: 4000}
-                NumberAnimation {target: snowflake3; properties: "anchors.leftMargin"; from:weatherCondition.width/1.2; to:weatherCondition.width/1.4; duration: 4000}
-                NumberAnimation {target: snowflake3; easing.type: Easing.InQuint; properties: "opacity"; from: 1; to: 0; duration: 4000}
+            ParallelAnimation {
+                NumberAnimation {target: snowflake2; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height*0.8; duration: 2000}
+                NumberAnimation {target: snowflake2; properties: "anchors.leftMargin"; from:weatherCondition.width/2; to:weatherCondition.width/2.5; duration: 2000}
+                NumberAnimation {target: snowflake2; easing.type: Easing.InQuint; properties: "opacity"; from: 0; to: 1; duration: 2000}
+            }
+        }
+        SequentialAnimation {
+            //loops: Animation.Infinite
+
+            PauseAnimation { duration: 500 }
+            ParallelAnimation {
+                NumberAnimation {target: snowflake3; properties: "anchors.topMargin"; from:weatherCondition.height/1.5; to:weatherCondition.height*0.86; duration: 2000}
+                NumberAnimation {target: snowflake3; properties: "anchors.leftMargin"; from:weatherCondition.width/1.2; to:weatherCondition.width/1.4; duration: 2000}
+                NumberAnimation {target: snowflake3; easing.type: Easing.InQuint; properties: "opacity"; from: 0; to: 1; duration: 2000}
             }
         }
     }
     ParallelAnimation{
         id: anim_50
         running: false
+        paused: (running && !weatherCondition.visible)
         SequentialAnimation {
             loops: Animation.Infinite
             ParallelAnimation{
@@ -391,26 +395,31 @@
     // CONDITION TRANSITION ANIMATIONS
     ParallelAnimation {
         id: anim_sunIn
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: sun; properties: "opacity"; to: 1; duration: 1000 }
         ScriptAction {script:{sun.anchors.horizontalCenterOffset=0;sun.anchors.topMargin=0;__sun = true;anim_01.start();}}
     }
     ParallelAnimation {
         id: anim_moonIn
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: moon; properties: "opacity"; to: 1; duration: 1000 }
         ScriptAction {script:{moon.anchors.horizontalCenterOffset=0;moon.anchors.topMargin=0;__moon = true;}}
     }
     ParallelAnimation {
         id: anim_sunOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: sun; properties: "opacity"; to: 0; duration: 1000 }
         ScriptAction {script:{__sun = false;anim_01.stop();}}
     }
     ParallelAnimation {
         id: anim_moonOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: moon; properties: "opacity"; to: 0; duration: 1000 }
         ScriptAction {script:__moon = false;}
     }
     SequentialAnimation {
         id: anim_moon2sun
+        paused: (running && !weatherCondition.visible)
         ParallelAnimation {
             NumberAnimation { targets: moon; properties: "anchors.horizontalCenterOffset"; from: units.gu(0); to: weatherCondition.width/1.5; duration: 1000 }
             NumberAnimation { easing.type: Easing.InQuad; targets: moon; properties: "anchors.topMargin"; from: units.gu(0); to: weatherCondition.height/2.5; duration: 1000 }
@@ -425,6 +434,7 @@
     }
     SequentialAnimation {
         id: anim_sun2moon
+        paused: (running && !weatherCondition.visible)
         ParallelAnimation {
             NumberAnimation { targets: sun; properties: "anchors.horizontalCenterOffset"; from: units.gu(0); to: weatherCondition.width/1.5; duration: 1000 }
             NumberAnimation { easing.type: Easing.InQuad; targets: sun; properties: "anchors.topMargin"; from: units.gu(0); to: weatherCondition.height/2.5; duration: 1000 }
@@ -439,6 +449,7 @@
     }
     ParallelAnimation {
         id: anim_fewCloudsIn
+        paused: (running && !weatherCondition.visible)
         SequentialAnimation{
             PauseAnimation {duration: 1000}
             ScriptAction {script:{
@@ -449,6 +460,7 @@
     }
     ParallelAnimation {
         id: anim_fewCloudsOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000}
         NumberAnimation { targets: cloud2; properties: "opacity"; to: 0; duration: 1000}
         SequentialAnimation{
@@ -461,6 +473,7 @@
     }
     ParallelAnimation {
         id: anim_scatCloudsIn
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; to: weatherCondition.width/6; duration: 1000 }
         NumberAnimation { target: cloud1; property: "anchors.topMargin"; to: weatherCondition.height/-15; duration: 1000 }
         NumberAnimation { targets: cloud1; properties: "opacity"; to: 1; duration: 1000 }
@@ -471,6 +484,7 @@
     }
     ParallelAnimation {
         id: anim_scatCloudsOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; from: weatherCondition.width/6; to: weatherCondition.width/1.5; duration: 1000 }
         NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000 }
         NumberAnimation { targets: cloud2; properties: "anchors.leftMargin"; from: weatherCondition.width/-15; to: weatherCondition.width/-1.5; duration: 1000 }
@@ -479,6 +493,7 @@
     }
     ParallelAnimation {
         id: anim_brokenCloudsIn
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; to: weatherCondition.width/6; duration: 1000 }
         NumberAnimation { target: cloud1; property: "anchors.topMargin"; to: weatherCondition.height/-15; duration: 1000 }
         NumberAnimation { targets: cloud1; properties: "opacity"; to: 1; duration: 1000 }
@@ -489,6 +504,7 @@
     }
     ParallelAnimation {
         id: anim_brokenCloudsOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: cloud1; properties: "anchors.leftMargin"; from: weatherCondition.width/6; to: weatherCondition.width/1.5; duration: 1000 }
         NumberAnimation { targets: cloud1; properties: "opacity"; to: 0; duration: 1000 }
         NumberAnimation { targets: cloud_dark1; properties: "anchors.leftMargin"; from: weatherCondition.height/-15; to: weatherCondition.width/-1.5; duration: 1000 }
@@ -497,22 +513,26 @@
     }
     ParallelAnimation {
         id: anim_rainIn
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: rain1; properties: "opacity"; to: 1; duration: 1000 }
         NumberAnimation { targets: rain2; properties: "opacity"; to: 1; duration: 1000 }
         ScriptAction {script:__rain = true;}
     }
     ParallelAnimation {
         id: anim_rainOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: rain1; properties: "opacity"; to: 0; duration: 1000 }
         NumberAnimation { targets: rain2; properties: "opacity"; to: 0; duration: 1000 }
         ScriptAction {script:__rain = false;}
     }
     ParallelAnimation {
         id: anim_stormIn
+        paused: (running && !weatherCondition.visible)
         ScriptAction {script:{__storm = true; anim_11.restart();}}
     }
     ParallelAnimation {
         id: anim_stormOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: lightning; properties: "opacity"; to: 0; duration: 1 }
         NumberAnimation { targets: lightningfx; properties: "opacity"; to: 0; duration: 1 }
         NumberAnimation { targets: lightningGlow; properties: "opacity"; to: 0; duration: 1 }
@@ -522,23 +542,26 @@
     }
     ParallelAnimation {
         id: anim_snowIn
-        ScriptAction {script:{__snow = true; snowflake1_anim.start(); snowflake2_anim.start(); snowflake3_anim.start(); anim_13.restart();}}
+        paused: (running && !weatherCondition.visible)
+        ScriptAction {script:{__snow = true; /*snowflake1_anim.start(); snowflake2_anim.start(); snowflake3_anim.start();*/ anim_13.start();}}
     }
     ParallelAnimation {
         id: anim_snowOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation {targets: snowflake1; properties: "opacity"; to:0; duration: 1000}
         NumberAnimation {targets: snowflake2; properties: "opacity"; to:0; duration: 1000}
         NumberAnimation {targets: snowflake3; properties: "opacity"; to:0; duration: 1000}
-        ScriptAction {script:{__snow = false; snowflake1_anim.stop(); snowflake2_anim.stop(); snowflake3_anim.stop(); anim_13.stop();}}
+        ScriptAction {script:{__snow = false; /*snowflake1_anim.stop(); snowflake2_anim.stop(); snowflake3_anim.stop();*/ /*anim_13.stop();*/}}
     }
     SequentialAnimation {
         id: anim_fogIn
-
+        paused: (running && !weatherCondition.visible)
         PauseAnimation {duration: 1000}
         ScriptAction {script:{anim_50.restart(); script:__fog = true;}}
     }
     ParallelAnimation {
         id: anim_fogOut
+        paused: (running && !weatherCondition.visible)
         NumberAnimation { targets: fogBlur1; properties: "opacity"; to: 0; duration: 1000}
         NumberAnimation { targets: fogBlur2; properties: "opacity"; to: 0; duration: 1000}
         SequentialAnimation{