Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

4 files changed, 20 insertions, 3 deletions

diff --git a/demos/declarative/samegame/content/BoomBlock.qml b/demos/declarative/samegame/content/BoomBlock.qml
index 68e0e1a..0d05772 100644
--- a/demos/declarative/samegame/content/BoomBlock.qml
+++ b/demos/declarative/samegame/content/BoomBlock.qml
@@ -9,19 +9,36 @@ Item { id:block
     y: Follow { source: targetY; spring: 1.2; damping: 0.1 }
 
     Image { id: img
-        source: {if(type==0){"pics/redStone.png";}else if(type==1){"pics/blueStone.png";}else{"pics/greenStone.png";}}
+        source: {
+            if(type == 0){
+                "pics/redStone.png";
+            } else if(type == 1) {
+                "pics/blueStone.png";
+            } else {
+                "pics/greenStone.png";
+            }
+        }
         opacity: 0
         opacity: Behavior { NumberAnimation { properties:"opacity"; duration: 200 } }
         anchors.fill: parent
     }
     Particles { id: particles
         width:1; height:1; anchors.centeredIn: parent; opacity: 0
-        lifeSpan: 100000; source: "pics/star.png"; count:1; streamIn: false
+        lifeSpan: 1000000000; count:0; streamIn: false
         angle: 0; angleDeviation: 360; velocity: 100; velocityDeviation:30
+        source: {
+            if(type == 0){
+                "pics/redStar.png";
+            } else if (type == 1) {
+                "pics/blueStar.png";
+            } else {
+                "pics/greenStar.png";
+            }
+        }
     }
     states: [
 
-        State{ name: "SpawnState"; when: spawning == true && dying == false
+        State{ name: "AliveState"; when: spawning == true && dying == false
             SetProperties { target: img; opacity: 1 }
         },
         State{ name: "DeathState"; when: dying == true
diff --git a/demos/declarative/samegame/content/pics/blueStar.png b/demos/declarative/samegame/content/pics/blueStar.png
new file mode 100644
index 0000000..822dc53
--- /dev/null
+++ b/demos/declarative/samegame/content/pics/blueStar.png
diff --git a/demos/declarative/samegame/content/pics/greenStar.png b/demos/declarative/samegame/content/pics/greenStar.png
new file mode 100644
index 0000000..1abbcf0
--- /dev/null
+++ b/demos/declarative/samegame/content/pics/greenStar.png
diff --git a/demos/declarative/samegame/content/pics/redStar.png b/demos/declarative/samegame/content/pics/redStar.png
new file mode 100644
index 0000000..b18834f
--- /dev/null
+++ b/demos/declarative/samegame/content/pics/redStar.png