Split up ModelParticle

Now has DataParticle (with model and delegate) and an ItemParticle
(which you just feed items manually). ModelParticle left for now for
damage control - it will probably just disappear someday.

4 files changed, 5 insertions, 4 deletions

diff --git a/examples/declarative/particles/modelparticles/bubbles.qml b/examples/declarative/particles/modelparticles/bubbles.qml
index 711d52d522..80d03a9ea7 100644
--- a/examples/declarative/particles/modelparticles/bubbles.qml
+++ b/examples/declarative/particles/modelparticles/bubbles.qml
@@ -70,7 +70,7 @@ Item{
         system: sys
         xDrift: 200
     }
-    ModelParticle{
+    DataParticle{
         id: mp
         z: 0
         system: sys
diff --git a/examples/declarative/particles/modelparticles/gridsplosion.qml b/examples/declarative/particles/modelparticles/gridsplosion.qml
index a654124587..d45ef392e0 100644
--- a/examples/declarative/particles/modelparticles/gridsplosion.qml
+++ b/examples/declarative/particles/modelparticles/gridsplosion.qml
@@ -80,7 +80,7 @@ Item{
         width: 120
         height: 120
     }
-    ModelParticle{
+    DataParticle{
         system: sys
         model: theModel.parts.particles
     }
diff --git a/examples/declarative/particles/modelparticles/package.qml b/examples/declarative/particles/modelparticles/package.qml
index 402cdea84a..d5c104b480 100644
--- a/examples/declarative/particles/modelparticles/package.qml
+++ b/examples/declarative/particles/modelparticles/package.qml
@@ -69,7 +69,7 @@ Rectangle {
         width: 200; height:200
         model: visualModel.parts.list
     }
-    ModelParticle{
+    DataParticle{
         x: 200; width: 200; height:200
         model: visualModel.parts.grid
         system: sys
diff --git a/examples/declarative/particles/modelparticles/stream.qml b/examples/declarative/particles/modelparticles/stream.qml
index b67d6c42af..4a697184d2 100644
--- a/examples/declarative/particles/modelparticles/stream.qml
+++ b/examples/declarative/particles/modelparticles/stream.qml
@@ -94,7 +94,7 @@ Item{
         colorVariation: 0
         z: 1000
     }
-    ModelParticle{
+    ItemParticle{
         id: mp
         z: 0
         system: sys
@@ -231,6 +231,7 @@ Item{
                 fillMode: Image.PreserveAspectFit; 
                 width: parent.width-4; height: parent.height-4
                 onStatusChanged: if(img.status == Image.Ready){
+                    container.opacity = 0;
                     loading.opacity = 0;
                     mp.take(container);
                 }