From fa7106a72b082d5e5c18ef2e9cbefe0a63789567 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
Date: Fri, 3 Sep 2010 12:08:19 +0200
Subject: Update examples to new syntax

---
 examples/balls/balls.qml   |  7 +++++--
 examples/blob/blob.qml     |  6 +++---
 examples/clock/clock.qml   | 11 +++++++----
 examples/simple/Spiro.qml  |  9 ++++++++-
 examples/simple/simple.qml |  1 +
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/examples/balls/balls.qml b/examples/balls/balls.qml
index 604eb18..adccf20 100644
--- a/examples/balls/balls.qml
+++ b/examples/balls/balls.qml
@@ -10,10 +10,13 @@ Canvas {
     
     Timer {
         interval: 50; running: true; repeat: true
-        onTriggered: clock.updateCanvas()
+        onTriggered: draw();
     }
 
-    onPaint: { Balls.drawBalls(ctx) }
+    function draw() {
+        var ctx = getContext();
+        Balls.drawBalls(ctx);
+    }
 
     Component.onCompleted: Balls.init(width, height)
 }
diff --git a/examples/blob/blob.qml b/examples/blob/blob.qml
index 5dfdded..4ab27a5 100644
--- a/examples/blob/blob.qml
+++ b/examples/blob/blob.qml
@@ -13,9 +13,11 @@ Canvas {
         interval: 25;
         repeat: true
         running:true
+        triggeredOnStart: true;
         onTriggered: {
+            var ctx = getContext();
             Blob.update();
-            updateCanvas();
+            Blob.draw(ctx);
         }
     }
     MouseArea {
@@ -49,8 +51,6 @@ Canvas {
         }
     }
 
-    onPaint: { Blob.draw(ctx) }
-
     Component.onCompleted: Blob.init()
 }
 
diff --git a/examples/clock/clock.qml b/examples/clock/clock.qml
index 27b7293..090c94f 100644
--- a/examples/clock/clock.qml
+++ b/examples/clock/clock.qml
@@ -5,14 +5,17 @@ Canvas {
     id: clock
     width:150
     height:150
-    
+
     Timer {
         interval: 1000; running: true; repeat: true
-        onTriggered: clock.updateCanvas()
+        triggeredOnStart: true;
+        onTriggered: draw()
     }
 
-    onPaint : {
+
+    function draw() {
         var now = new Date();
+        var ctx = clock.getContext();
         ctx.save();
         ctx.drawLine
         ctx.clearRect(0,0,150,150);
@@ -102,7 +105,7 @@ Canvas {
         ctx.strokeStyle = '#325FA2';
         ctx.arc(0,0,142,0,Math.PI*2,true);
         ctx.stroke();
-        ctx.restore();        
+        ctx.restore();
     }
 }
 
diff --git a/examples/simple/Spiro.qml b/examples/simple/Spiro.qml
index 22c93e9..8c15f45 100644
--- a/examples/simple/Spiro.qml
+++ b/examples/simple/Spiro.qml
@@ -16,14 +16,21 @@ Canvas {
         onPositionChanged: { draw(); }
     }
 
+    onInit: {
+        draw();
+    }
+
     function draw() {
         var ctx = getContext();
+        ctx.save();
+        ctx.fillStyle = "white"
+        ctx.fillRect(0,0,width, height);
         ctx.strokeStyle = color;
         ctx.translate((width/2), (height/2));
         ctx.rotate(mousearea.mouseY/width)
         drawSpirograph(ctx,20*(2)/(1),-8*(3)/(1),mousearea.mouseX/2);
         ctx.globalAlpha = 0.5;
-        drawSpirograph(ctx,20*(2)/(1),-8*(3)/(1),mousearea.mouseX/2 -10);
+        ctx.restore();
     }
 
     function drawSpirograph(ctx,R,r,O){
diff --git a/examples/simple/simple.qml b/examples/simple/simple.qml
index a9f4a50..c289ab0 100644
--- a/examples/simple/simple.qml
+++ b/examples/simple/simple.qml
@@ -1,6 +1,7 @@
 import Qt 4.7
 import "../../Canvas"
 
+
 Grid {
     columns:2
     spacing:0    
-- 
cgit v1.2.3