Refactoring. SVG -> PNG. Fixed Multitouch.

Change-Id: I9919be93c246fc25728cf1ae71e0d1440883092e Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>
author: Lasse Räihä <lasse.raiha@digia.com> 2013-05-27 15:26:06 +0300
committer: Kimmo Ollila <kimmo.ollila@digia.com> 2013-05-27 15:29:13 +0300
commit: ab54713923cfb3bcddca8deb146def8e62979492 (patch)
tree: 5aa936d2fec9acf64c577ada461a398ef53ad19c
parent: 54ba10ff1b8c89c3790e3ab5089bec9b24fb05e0 (diff)
55 files changed, 102 insertions, 1024 deletions
diff --git a/QtDemo/qml/QtDemo/Element.qml b/QtDemo/qml/QtDemo/Element.qml
index 3623be4..5150f4f 100644
--- a/QtDemo/qml/QtDemo/Element.qml
+++ b/QtDemo/qml/QtDemo/Element.qml
@@ -20,9 +20,9 @@ Rectangle {
         root.height = root.itemId == 2 ? root.itemWidth*0.8 : root.itemWidth*1.3
         root.x = root.posX - root.width/2
         root.y = root.posY - root.height/2
-        elementImage.source = root.itemId === 0 ? "images/tree1.svg" :
-                              root.itemId === 1 ? "images/tree2.svg" :
-                              root.itemId === 2 ? "images/stones.svg" :
+        elementImage.source = root.itemId === 0 ? "images/tree1.png" :
+                              root.itemId === 1 ? "images/tree2.png" :
+                              root.itemId === 2 ? "images/stones.png" :
                               ""
     }
 }
diff --git a/QtDemo/qml/QtDemo/NavigationPanel.qml b/QtDemo/qml/QtDemo/NavigationPanel.qml
index 901f0cc..8bf2d9e 100644
--- a/QtDemo/qml/QtDemo/NavigationPanel.qml
+++ b/QtDemo/qml/QtDemo/NavigationPanel.qml
@@ -28,19 +28,19 @@ Grid {
 
     Button {
         id: nextButton
-        imageSource: "images/btn_next.svg"
+        imageSource: "images/btn_next.png"
         onClicked: canvas.goNext()
     }
 
     Button {
         id: prevButton
-        imageSource: "images/btn_previous.svg"
+        imageSource: "images/btn_previous.png"
         onClicked: canvas.goPrevious()
     }
 
     Button {
         id: homeButton
-        imageSource: "images/btn_home.svg"
+        imageSource: "images/btn_home.png"
         onClicked: canvas.goHome()
     }
 }
diff --git a/QtDemo/qml/QtDemo/Slide.qml b/QtDemo/qml/QtDemo/Slide.qml
index d5d4171..ea1ac6b 100644
--- a/QtDemo/qml/QtDemo/Slide.qml
+++ b/QtDemo/qml/QtDemo/Slide.qml
@@ -23,6 +23,7 @@ Item {
     property int demoHeight: 378
     property int maskVerticalOffset: 51
     property int maskHorizontalOffset: 1
+    property string demoColor: "#883322"
     property string name: ""
     property real deltaRot: 0
     property int deltaY: 0
@@ -54,7 +55,7 @@ Item {
             anchors.centerIn: parent
             width: demoWidth
             height: demoHeight
-            color: "#262626"
+            color: demoColor
             clip: true
 
             Text {
@@ -110,7 +111,7 @@ Item {
         anchors.top: deviceMaskImage.bottom
         anchors.topMargin: -height * 0.3
         anchors.horizontalCenter: deviceMaskImage.horizontalCenter
-        source: "images/island.svg"
+        source: "images/island.png"
         smooth: !animationRunning
         antialiasing: !animationRunning
         width: Math.max(deviceMaskImage.width, deviceMaskImage.height) * 1.6
@@ -219,25 +220,31 @@ Item {
     }
 
     function releaseDemo(snapShotCreated){
+        print("releaseDemo 1 " + slide.url)
         if (!slide.loaded) return;
-
+        print("releaseDemo 2")
         if (!snapShotCreated){
             demo.updating = true
             demo.scheduleUpdate()
             return;
         }
+        print("releaseDemo 3")
 
         if (yAnimationEnabled)
             yAnimation.restart()
         if (rotAnimationEnabled)
             rotationAnimation.restart()
+        print("releaseDemo 4")
         if (slide.name === "Internet Radio") return; //Always alive
+        print("releaseDemo 5")
 
         app.forceActiveFocus();
 
+        print("releaseDemo 6")
         if (!slide.loaded)
             return;
 
+        print("releaseDemo 7")
         slide.loaded = false;
 
         for (var i =0; i<demoContainer.children.length; i++){
@@ -245,6 +252,7 @@ Item {
                 demoContainer.children[i].destroy();
             }
         }
+        print("releaseDemo 8")
     }
 
     function createElements()
@@ -255,7 +263,6 @@ Item {
     }
 
     Component.onCompleted: {
-        print ("new slide created!")
         if (yAnimationEnabled)
             yStarter.start()
         if (rotAnimationEnabled)
diff --git a/QtDemo/qml/QtDemo/WorldCanvas.qml b/QtDemo/qml/QtDemo/WorldCanvas.qml
index 1ef452e..2fdbb08 100644
--- a/QtDemo/qml/QtDemo/WorldCanvas.qml
+++ b/QtDemo/qml/QtDemo/WorldCanvas.qml
@@ -91,29 +91,6 @@ Item{
         enabled: !worldPinchArea.pinching
     }
 
-    /*Image{
-        id: logo
-        source: "QtLogo.png"
-        anchors.centerIn: parent
-        width: Style.LOGO_WIDTH
-        height: Style.LOGO_HEIGHT
-        sourceSize: Qt.size(Style.LOGO_WIDTH, Style.LOGO_HEIGHT)
-        smooth: !zoomAnimation.running
-        opacity: 1.0
-        z: 2
-    }*/
-
-    /*Image {
-        id: logoIsland
-        anchors.top: logo.bottom
-        anchors.topMargin: -logo.height*0.4
-        anchors.horizontalCenter: logo.horizontalCenter
-        source: "images/island.svg"
-        width: logo.width*1.5
-        height: logo.height
-        z: -2
-    }*/
-
     transform: [
 
         Scale{
diff --git a/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml b/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml
index f5563a0..6f68c41 100644
--- a/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml
+++ b/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml
@@ -77,6 +77,7 @@ function drawPointer(context, angle, len, thickness, color){
 }"
 
         Timer{
+            id: textTimer
             interval: 10
             onTriggered: {
                 codeText.pos++
diff --git a/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml b/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml
index 7d928d0..abaa356 100644
--- a/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml
+++ b/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml
@@ -13,7 +13,7 @@ Rectangle {
     property int bottomBarSize: height * 0.08
     property int tileMargin: height * 0.01
     property int appHeaderFontSize: topBarsize * 0.4
-    property string appBackground: "transparent"
+    property string appBackground: "#262626"
     property string tileBackground: "#86bc24"
     property string textColor: "white"
     property string uiFont: "Segoe UI"
diff --git a/QtDemo/qml/QtDemo/demos/heartmonitor/heart.png b/QtDemo/qml/QtDemo/demos/heartmonitor/heart.png
new file mode 100644
index 0000000..d7a6170
--- /dev/null
+++ b/QtDemo/qml/QtDemo/demos/heartmonitor/heart.png
diff --git a/QtDemo/qml/QtDemo/demos/heartmonitor/heart.svg b/QtDemo/qml/QtDemo/demos/heartmonitor/heart.svg
deleted file mode 100644
index 35aa372..0000000
--- a/QtDemo/qml/QtDemo/demos/heartmonitor/heart.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="150px" height="128px" viewBox="0 0 150 128" enable-background="new 0 0 150 128" xml:space="preserve">
-<g>
-	<radialGradient id="SVGID_1_" cx="75" cy="63.9399" r="69.6893" gradientUnits="userSpaceOnUse">
-		<stop  offset="0" style="stop-color:#C30000"/>
-		<stop  offset="1" style="stop-color:#AA0000"/>
-	</radialGradient>
-	<path fill="url(#SVGID_1_)" d="M150,38.904c0.003-0.119-0.02-0.226-0.02-0.342c0.001-0.135,0.02-0.263,0.02-0.397
-		c0-21.077-17.085-38.164-38.163-38.164C94.165,0.001,79.342,12.032,75,28.337C70.658,12.032,55.835,0.001,38.163,0.001
-		C17.085,0.001,0,17.088,0,38.165c0,0.135,0.019,0.263,0.02,0.397c0,0.116-0.023,0.223-0.02,0.342
-		c0.014,0.506,0.083,1.005,0.113,1.51c0.043,0.731,0.082,1.462,0.164,2.182c4.809,45.215,72.75,84.146,74.654,85.231l0.047,0.052
-		c0,0,0.021-0.012,0.022-0.015c0.002,0.003,0.023,0.015,0.023,0.015l0.047-0.052c1.903-1.085,69.845-40.017,74.653-85.231
-		c0.082-0.72,0.121-1.45,0.164-2.182C149.917,39.909,149.985,39.41,150,38.904z"/>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="81.165" y1="63.4434" x2="62.085" y2="-7.7644">
-		<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0.1"/>
-		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0.4"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" d="M79.646,63.85c31.312-8.392,55.896-25.49,65.873-43.616c-6.42-12.034-19.088-20.232-33.682-20.232
-		C94.165,0.001,79.342,12.032,75,28.337C70.658,12.032,55.835,0.001,38.163,0.001C17.085,0.001,0,17.088,0,38.165
-		c0,0.135,0.019,0.263,0.02,0.397c0,0.116-0.023,0.223-0.02,0.342c0.014,0.506,0.083,1.005,0.113,1.51
-		c0.043,0.731,0.082,1.462,0.164,2.182c0.698,6.557,2.753,12.977,5.712,19.173C24.012,70.096,51.222,71.466,79.646,63.85z"/>
-</g>
-<rect fill="none" width="150" height="128"/>
-</svg>
diff --git a/QtDemo/qml/QtDemo/demos/heartmonitor/main.qml b/QtDemo/qml/QtDemo/demos/heartmonitor/main.qml
index af1e7e3..979cea4 100644
--- a/QtDemo/qml/QtDemo/demos/heartmonitor/main.qml
+++ b/QtDemo/qml/QtDemo/demos/heartmonitor/main.qml
@@ -181,7 +181,7 @@ Rectangle {
         anchors.margins: app.width * 0.05
         height: parent.height * 0.2
         width: height*1.2
-        source: "heart.svg"
+        source: "heart.png"
         MouseArea {
             anchors.fill: parent
             onPressed: pulse()
diff --git a/QtDemo/qml/QtDemo/demos/particledemo/ParticleSysComponent.qml b/QtDemo/qml/QtDemo/demos/particledemo/ParticleSysComponent.qml
index 491d4df..a39d787 100644
--- a/QtDemo/qml/QtDemo/demos/particledemo/ParticleSysComponent.qml
+++ b/QtDemo/qml/QtDemo/demos/particledemo/ParticleSysComponent.qml
@@ -2,8 +2,7 @@ import QtQuick 2.0
 import QtQuick.Particles 2.0
 
 /**
- * ParticleSystem component draw particles with the given color. The
- * location of the particles depends on the given TouchPoint 'point'.
+ * ParticleSystem component draw particles with the given color.
  */
 
 ParticleSystem {
@@ -12,16 +11,18 @@ ParticleSystem {
     running: true
 
     property color particleColor: "#ff0000"
-    property TouchPoint point: null;
-    property int angle: 0
-    property int pointCount: 0
+    property real angle: particleRoot.angle;
+    property int pointCount: particleRoot.pointCount;
+    property real radius: particleRoot.distance;
+    property real movement: particleRoot.movement;
+    property bool emitting: particleRoot.running;
+    property int touchX: 0
+    property int touchY: 0
     property int startAngle: 0
-    property real radius: 0
-    property int movement: 1
-    property real targetX: root.point.pressed ? root.point.x : width/2+radius * Math.cos(targetAngle*(Math.PI/180))
-    property real targetY: root.point.pressed ? root.point.y : height/2+radius * Math.sin(targetAngle*(Math.PI/180))
+    property bool pressed: false
+    property real targetX: pressed ? touchX : width/2+radius * Math.cos(targetAngle*(Math.PI/180))
+    property real targetY: pressed ? touchY : height/2+radius * Math.sin(targetAngle*(Math.PI/180))
     property real targetAngle: angle+startAngle
-    property bool emitting: false
 
     Emitter {
         id: emitter
@@ -41,9 +42,9 @@ ParticleSystem {
     ImageParticle {
         id: imageParticle
         source: "images/particle.png"
-        color: root.pointCount >0 && root.point.pressed ? root.particleColor: "#444444"
+        color: root.pointCount >0 && root.pressed ? root.particleColor: "#444444"
         alpha: .0
-        colorVariation: root.pointCount >0 && root.point.pressed  ? 0.3: .0
+        colorVariation: root.pointCount >0 && root.pressed ? 0.3: .0
 
         Behavior on color{
             enabled: root.pointCount != 0
diff --git a/QtDemo/qml/QtDemo/demos/particledemo/particledemo.qml b/QtDemo/qml/QtDemo/demos/particledemo/particledemo.qml
index 7bb1989..433b7e6 100644
--- a/QtDemo/qml/QtDemo/demos/particledemo/particledemo.qml
+++ b/QtDemo/qml/QtDemo/demos/particledemo/particledemo.qml
@@ -2,18 +2,19 @@ import QtQuick 2.0
 import QtQuick.Particles 2.0
 
 Rectangle {
-    id: root
+    id: particleRoot
     color: "#000000"
     anchors.fill: parent
 
-    property real distance: parent.height*.5
+    property real distance: parent.height*.4
     property real angle: 0
     property real movement: 0
     property alias running: angleAnimation.running
+    property int pointCount: mouseArea.pointCount + multiPointTouchArea.pointCount
 
     BootScreenDemo {
-        width: 500
-        height: 500
+        width: Math.min(parent.width,parent.height)
+        height: width
         anchors.centerIn: parent
         onFinished: {
             distanceAnimation.restart()
@@ -39,13 +40,13 @@ Rectangle {
 
         NumberAnimation {
             from: 0
-            to: parent.height*.5
+            to: parent.height*.4
             duration: distanceAnimation.delay/2
             easing.type: distanceAnimation.easingType
         }
 
         NumberAnimation {
-            from: parent.height*.5
+            from: parent.height*.4
             to: 0
             duration: distanceAnimation.delay/2
             easing.type: distanceAnimation.easingType
@@ -89,7 +90,7 @@ Rectangle {
 
                 distanceAnimation.delay = 500 + Math.floor(Math.random()*1500)
                 angleAnimation.from = 180 + Math.random()*90 - 45
-                root.movement = Math.random()*2
+                particleRoot.movement = Math.random()*2
                 angleAnimation.restart()
                 distanceAnimation.restart()
             }
@@ -100,16 +101,16 @@ Rectangle {
      * Create five ParticleSysComponents for drawing particles
      * in the place of multitouch points with the given color.
      */
-    ParticleSysComponent{ id: p1; point: point1; particleColor: "#ff0000"; angle: root.angle; startAngle: 1*360/(5-multiPointTouchArea.pointCount); pointCount: multiPointTouchArea.pointCount; radius: root.distance; movement: root.movement; emitting: root.running }
-    ParticleSysComponent{ id: p2; point: point2; particleColor: "#00ff00"; angle: root.angle; startAngle: 2*360/(5-multiPointTouchArea.pointCount); pointCount: multiPointTouchArea.pointCount; radius: root.distance; movement: root.movement; emitting: root.running }
-    ParticleSysComponent{ id: p3; point: point3; particleColor: "#0000ff"; angle: root.angle; startAngle: 3*360/(5-multiPointTouchArea.pointCount); pointCount: multiPointTouchArea.pointCount; radius: root.distance; movement: root.movement; emitting: root.running }
-    ParticleSysComponent{ id: p4; point: point4; particleColor: "#ffff00"; angle: root.angle; startAngle: 4*360/(5-multiPointTouchArea.pointCount); pointCount: multiPointTouchArea.pointCount; radius: root.distance; movement: root.movement; emitting: root.running }
-    ParticleSysComponent{ id: p5; point: point5; particleColor: "#ff00ff"; angle: root.angle; startAngle: 5*360/(5-multiPointTouchArea.pointCount); pointCount: multiPointTouchArea.pointCount; radius: root.distance; movement: root.movement; emitting: root.running }
+    ParticleSysComponent{ id: p1; particleColor: "#ff0000"; startAngle: 1*360/(5-particleRoot.pointCount); }
+    ParticleSysComponent{ id: p2; particleColor: "#00ff00"; startAngle: 2*360/(5-particleRoot.pointCount); }
+    ParticleSysComponent{ id: p3; particleColor: "#0000ff"; startAngle: 3*360/(5-particleRoot.pointCount); }
+    ParticleSysComponent{ id: p4; particleColor: "#ffff00"; startAngle: 4*360/(5-particleRoot.pointCount); }
+    ParticleSysComponent{ id: p5; particleColor: "#ff00ff"; startAngle: 5*360/(5-particleRoot.pointCount); }
 
     /**
      * In this demo we only support five touch point at the same time.
+     * One from mouseArea (because of Desktop-support) and four from MultiPointTouchArea.
      */
-
     MultiPointTouchArea {
         id: multiPointTouchArea
         anchors.fill: parent
@@ -122,20 +123,50 @@ Rectangle {
             TouchPoint { id: point1 },
             TouchPoint { id: point2 },
             TouchPoint { id: point3 },
-            TouchPoint { id: point4 },
-            TouchPoint { id: point5 }
+            TouchPoint { id: point4 }
         ]
 
         onPressed: updatePointCount()
-
         onReleased: updatePointCount()
+        onTouchUpdated: {
+            p2.touchX = point1.x; p2.touchY = point1.y; p2.pressed = point1.pressed;
+            p3.touchX = point2.x; p3.touchY = point2.y; p3.pressed = point2.pressed;
+            p4.touchX = point3.x; p4.touchY = point3.y; p4.pressed = point3.pressed;
+            p5.touchX = point4.x; p5.touchY = point4.y; p5.pressed = point4.pressed;
+        }
 
         function updatePointCount(){
             var tmp = 0
-            for (var i=0; i<5; i++){
-                if (touchPoints[i].pressed) tmp++
+            for (var i=0; i<4; i++) {
+                if (touchPoints[i].pressed)
+                    tmp++
             }
             pointCount = tmp
         }
     }
+
+    /**
+     * For desktop.
+     */
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+
+        property int pointCount:0
+
+        onPressed: {
+            pointCount = 1;
+            p1.touchX = mouse.x;
+            p1.touchY = mouse.y;
+            p1.pressed = true;
+        }
+        onReleased: {
+            pointCount = 0;
+            p1.pressed = false;
+        }
+        onPositionChanged: {
+            p1.touchX = mouse.x;
+            p1.touchY = mouse.y;
+        }
+    }
 }
diff --git a/QtDemo/qml/QtDemo/demos/radio/VolumeButton.qml b/QtDemo/qml/QtDemo/demos/radio/VolumeButton.qml
index abd8dd3..2d1b409 100644
--- a/QtDemo/qml/QtDemo/demos/radio/VolumeButton.qml
+++ b/QtDemo/qml/QtDemo/demos/radio/VolumeButton.qml
@@ -44,7 +44,7 @@ Item {
 
             Image {
                 anchors {fill: parent; margins: parent.height*.3}
-                source: !root.playing ? "images/radio_btn_play.svg" : "images/radio_btn_pause.svg"
+                source: !root.playing ? "images/radio_btn_play.png" : "images/radio_btn_pause.png"
             }
 
             MouseArea {
@@ -82,7 +82,7 @@ Item {
 
             Image {
                 anchors {fill: parent; margins: parent.height*.2}
-                source: "images/radio_sound_icon.svg"
+                source: "images/radio_sound_icon.png"
                 rotation: -volumeRotation.angle
             }
         }
diff --git a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_pause.png b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_pause.png
new file mode 100644
index 0000000..5204834
--- /dev/null
+++ b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_pause.png
diff --git a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_pause.svg b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_pause.svg
deleted file mode 100644
index 017a65b..0000000
--- a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_pause.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="108px" height="118px" viewBox="0 0 108 118" enable-background="new 0 0 108 118" xml:space="preserve">
-<g>
-	<g>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.5" y1="0" x2="22.5" y2="118.0005">
-			<stop  offset="0" style="stop-color:#052E41"/>
-			<stop  offset="1" style="stop-color:#0C5577"/>
-		</linearGradient>
-		<path fill="url(#SVGID_1_)" d="M35,0H10C4.5,0,0,4.5,0,10v98c0,5.5,4.5,10,10,10h25c5.5,0,10-4.5,10-10V10C45,4.5,40.5,0,35,0
-			L35,0z"/>
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="22.5" y1="0" x2="22.5" y2="118.0005">
-			<stop  offset="0" style="stop-color:#1E1B18"/>
-			<stop  offset="0.0238" style="stop-color:#2B2825"/>
-			<stop  offset="0.1251" style="stop-color:#5C5A58"/>
-			<stop  offset="0.2313" style="stop-color:#888684"/>
-			<stop  offset="0.3404" style="stop-color:#ACABAA"/>
-			<stop  offset="0.4531" style="stop-color:#CACAC9"/>
-			<stop  offset="0.5706" style="stop-color:#E2E1E1"/>
-			<stop  offset="0.6949" style="stop-color:#F2F2F2"/>
-			<stop  offset="0.8309" style="stop-color:#FCFCFC"/>
-			<stop  offset="1" style="stop-color:#FFFFFF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_2_)" fill-opacity="0.1" d="M35,0H10C4.5,0,0,4.5,0,10v98c0,5.5,4.5,10,10,10h25c5.5,0,10-4.5,10-10V10
-			C45,4.5,40.5,0,35,0L35,0z"/>
-		<path fill="#FFFFFF" d="M41,10c0-3.309-2.691-6-6-6H10c-3.309,0-6,2.691-6,6v98c0,3.309,2.691,6,6,6h25c3.309,0,6-2.691,6-6V10z"
-			/>
-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="22.5" y1="4" x2="22.5" y2="14">
-			<stop  offset="0" style="stop-color:#AEADAC"/>
-			<stop  offset="1" style="stop-color:#E1E0DF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_3_)" d="M35,4H10c-3.309,0-6,2.691-6,6v4c0-3.309,2.691-6,6-6h25c3.309,0,6,2.691,6,6v-4
-			C41,6.691,38.309,4,35,4z"/>
-	</g>
-	<g>
-		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="85.5" y1="0" x2="85.5" y2="118.0005">
-			<stop  offset="0" style="stop-color:#052E41"/>
-			<stop  offset="1" style="stop-color:#0C5577"/>
-		</linearGradient>
-		<path fill="url(#SVGID_4_)" d="M98,0H73c-5.5,0-10,4.5-10,10v98c0,5.5,4.5,10,10,10h25c5.5,0,10-4.5,10-10V10
-			C108,4.5,103.5,0,98,0L98,0z"/>
-		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="85.5" y1="0" x2="85.5" y2="118.0005">
-			<stop  offset="0" style="stop-color:#1E1B18"/>
-			<stop  offset="0.0238" style="stop-color:#2B2825"/>
-			<stop  offset="0.1251" style="stop-color:#5C5A58"/>
-			<stop  offset="0.2313" style="stop-color:#888684"/>
-			<stop  offset="0.3404" style="stop-color:#ACABAA"/>
-			<stop  offset="0.4531" style="stop-color:#CACAC9"/>
-			<stop  offset="0.5706" style="stop-color:#E2E1E1"/>
-			<stop  offset="0.6949" style="stop-color:#F2F2F2"/>
-			<stop  offset="0.8309" style="stop-color:#FCFCFC"/>
-			<stop  offset="1" style="stop-color:#FFFFFF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_5_)" fill-opacity="0.1" d="M98,0H73c-5.5,0-10,4.5-10,10v98c0,5.5,4.5,10,10,10h25c5.5,0,10-4.5,10-10V10
-			C108,4.5,103.5,0,98,0L98,0z"/>
-		<path fill="#FFFFFF" d="M104,10c0-3.309-2.691-6-6-6H73c-3.309,0-6,2.691-6,6v98c0,3.309,2.691,6,6,6h25c3.309,0,6-2.691,6-6V10z"
-			/>
-		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="85.5" y1="4" x2="85.5" y2="14">
-			<stop  offset="0" style="stop-color:#AEADAC"/>
-			<stop  offset="1" style="stop-color:#E1E0DF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_6_)" d="M98,4H73c-3.309,0-6,2.691-6,6v4c0-3.309,2.691-6,6-6h25c3.309,0,6,2.691,6,6v-4
-			C104,6.691,101.309,4,98,4z"/>
-	</g>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_play.png b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_play.png
new file mode 100644
index 0000000..92ee858
--- /dev/null
+++ b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_play.png
diff --git a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_play.svg b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_play.svg
deleted file mode 100644
index b90afd4..0000000
--- a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_play.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="109px" height="131px" viewBox="0 0 109 131" enable-background="new 0 0 109 131" xml:space="preserve">
-<g>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="54.4956" y1="0" x2="54.4956" y2="130.0981">
-		<stop  offset="0" style="stop-color:#00293C"/>
-		<stop  offset="1" style="stop-color:#115A79"/>
-	</linearGradient>
-	<path fill="url(#SVGID_1_)" d="M8.601,0L8.601,0C3.537,0,0,4.133,0,10.049l0,110c0,5.917,3.537,10.049,8.601,10.049
-		c1.972,0,3.996-0.628,6.015-1.866l88.95-54.545c3.447-2.114,5.426-5.263,5.426-8.638s-1.979-6.523-5.426-8.638L14.616,1.866
-		C12.596,0.628,10.572,0,8.601,0L8.601,0z"/>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="54.4956" y1="0" x2="54.4956" y2="130.0981">
-		<stop  offset="0" style="stop-color:#1E1B18"/>
-		<stop  offset="0.0238" style="stop-color:#2B2825"/>
-		<stop  offset="0.1251" style="stop-color:#5C5A58"/>
-		<stop  offset="0.2313" style="stop-color:#888684"/>
-		<stop  offset="0.3404" style="stop-color:#ACABAA"/>
-		<stop  offset="0.4531" style="stop-color:#CACAC9"/>
-		<stop  offset="0.5706" style="stop-color:#E2E1E1"/>
-		<stop  offset="0.6949" style="stop-color:#F2F2F2"/>
-		<stop  offset="0.8309" style="stop-color:#FCFCFC"/>
-		<stop  offset="1" style="stop-color:#FFFFFF"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" fill-opacity="0.1" d="M8.601,0L8.601,0C3.537,0,0,4.133,0,10.049l0,110
-		c0,5.917,3.537,10.049,8.601,10.049c1.972,0,3.996-0.628,6.015-1.866l88.95-54.545c3.447-2.114,5.426-5.263,5.426-8.638
-		s-1.979-6.523-5.426-8.638L14.616,1.866C12.596,0.628,10.572,0,8.601,0L8.601,0z"/>
-	<path fill="#FFFFFF" d="M101.475,59.821L12.525,5.276C11.112,4.41,9.777,4,8.601,4C5.873,4,4,6.206,4,10.049l0,110
-		c0,3.843,1.873,6.049,4.601,6.049c1.176,0,2.512-0.41,3.924-1.276l88.949-54.545C106.164,67.401,106.164,62.696,101.475,59.821z"/>
-	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="54.4907" y1="4" x2="54.4907" y2="126.0356">
-		<stop  offset="0" style="stop-color:#AEADAC"/>
-		<stop  offset="1" style="stop-color:#E1E0DF"/>
-	</linearGradient>
-	<path fill="url(#SVGID_3_)" d="M8,10.049C8,8.65,8.366,8.084,8.451,8.016C8.462,8.012,8.512,8,8.601,8
-		c0.215,0,0.823,0.066,1.833,0.687l94.392,57.547c0.593-2.268-0.516-4.674-3.352-6.412L12.525,5.276C11.112,4.41,9.777,4,8.601,4
-		C5.873,4,4,6.206,4,10.049l0,110c0,3.549,1.607,5.678,4,5.986L8,10.049z"/>
-</g>
-<rect fill="none" width="109" height="131"/>
-</svg>
diff --git a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_stop.png b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_stop.png
new file mode 100644
index 0000000..187158a
--- /dev/null
+++ b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_stop.png
diff --git a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_stop.svg b/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_stop.svg
deleted file mode 100644
index 98567de..0000000
--- a/QtDemo/qml/QtDemo/demos/radio/images/radio_btn_stop.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="108px" height="108px" viewBox="0 0 108 108" enable-background="new 0 0 108 108" xml:space="preserve">
-<g>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="53.9995" y1="0" x2="53.9995" y2="108.0005">
-		<stop  offset="0" style="stop-color:#052E41"/>
-		<stop  offset="1" style="stop-color:#0C5577"/>
-	</linearGradient>
-	<path fill="url(#SVGID_1_)" d="M98,0H10C4.5,0,0,4.5,0,10v88c0,5.5,4.5,10,10,10h88c5.5,0,10-4.5,10-10V10C108,4.5,103.5,0,98,0
-		L98,0z"/>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="53.9995" y1="0" x2="53.9995" y2="108.0005">
-		<stop  offset="0" style="stop-color:#1E1B18"/>
-		<stop  offset="0.0238" style="stop-color:#2B2825"/>
-		<stop  offset="0.1251" style="stop-color:#5C5A58"/>
-		<stop  offset="0.2313" style="stop-color:#888684"/>
-		<stop  offset="0.3404" style="stop-color:#ACABAA"/>
-		<stop  offset="0.4531" style="stop-color:#CACAC9"/>
-		<stop  offset="0.5706" style="stop-color:#E2E1E1"/>
-		<stop  offset="0.6949" style="stop-color:#F2F2F2"/>
-		<stop  offset="0.8309" style="stop-color:#FCFCFC"/>
-		<stop  offset="1" style="stop-color:#FFFFFF"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" fill-opacity="0.1" d="M98,0H10C4.5,0,0,4.5,0,10v88c0,5.5,4.5,10,10,10h88c5.5,0,10-4.5,10-10V10
-		C108,4.5,103.5,0,98,0L98,0z"/>
-	<path fill="#FFFFFF" d="M104,10c0-3.309-2.691-6-6-6H10c-3.309,0-6,2.691-6,6v88c0,3.309,2.691,6,6,6h88c3.309,0,6-2.691,6-6V10z"
-		/>
-	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="53.9995" y1="4" x2="53.9995" y2="14">
-		<stop  offset="0" style="stop-color:#AEADAC"/>
-		<stop  offset="1" style="stop-color:#E1E0DF"/>
-	</linearGradient>
-	<path fill="url(#SVGID_3_)" d="M98,4H10c-3.309,0-6,2.691-6,6v4c0-3.309,2.691-6,6-6h88c3.309,0,6,2.691,6,6v-4
-		C104,6.691,101.309,4,98,4z"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/demos/radio/images/radio_sound_icon.png b/QtDemo/qml/QtDemo/demos/radio/images/radio_sound_icon.png
new file mode 100644
index 0000000..ac0b61e
--- /dev/null
+++ b/QtDemo/qml/QtDemo/demos/radio/images/radio_sound_icon.png
diff --git a/QtDemo/qml/QtDemo/demos/radio/images/radio_sound_icon.svg b/QtDemo/qml/QtDemo/demos/radio/images/radio_sound_icon.svg
deleted file mode 100644
index 5e0be55..0000000
--- a/QtDemo/qml/QtDemo/demos/radio/images/radio_sound_icon.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="59px" height="45px" viewBox="0 0 59 45" enable-background="new 0 0 59 45" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M0,28.645c0,1.65,1.35,3,3,3h4c1.65,0,4.042,0.858,5.316,1.907l12.368,10.186
-			c0.454,0.374,0.878,0.552,1.236,0.552c0.647,0,1.08-0.582,1.08-1.645v-41C27,0.582,26.568,0,25.92,0
-			c-0.358,0-0.783,0.178-1.236,0.552L12.316,10.737C11.042,11.786,8.65,12.645,7,12.645H3c-1.65,0-3,1.35-3,3V28.645z"/>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="13.4771" y1="0" x2="13.477" y2="31.4595">
-			<stop  offset="0" style="stop-color:#AEADAC"/>
-			<stop  offset="1" style="stop-color:#E1E0DF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_1_)" d="M2,28.645v-13c0-0.542,0.458-1,1-1h4c2.119,0,4.951-1.016,6.587-2.363L26.954,1.229
-			C26.85,0.445,26.473,0,25.92,0c-0.358,0-0.783,0.178-1.236,0.552L12.316,10.737C11.042,11.786,8.65,12.645,7,12.645H3
-			c-1.65,0-3,1.35-3,3v13c0,1.298,0.84,2.399,2,2.814V28.645z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M37.809,8.95c-0.256-0.223-0.572-0.333-0.888-0.333c-0.347,0-0.691,0.132-0.954,0.396l-2.508,2.508
-			c-0.267,0.267-0.409,0.634-0.393,1.011c0.016,0.376,0.189,0.73,0.478,0.972c2.564,2.161,4.034,5.311,4.034,8.642
-			s-1.47,6.48-4.034,8.642c-0.288,0.241-0.462,0.596-0.478,0.972c-0.017,0.378,0.126,0.745,0.393,1.011l2.508,2.508
-			c0.263,0.264,0.607,0.396,0.954,0.396c0.315,0,0.632-0.11,0.888-0.333c3.811-3.333,5.996-8.142,5.996-13.194
-			C43.805,17.093,41.619,12.284,37.809,8.95z"/>
-		<path fill="#FFFFFF" d="M49.428,0.386c-0.26-0.241-0.588-0.359-0.916-0.359c-0.346,0-0.691,0.132-0.954,0.395l-3.121,3.122
-			c-0.261,0.26-0.403,0.615-0.396,0.984c0.009,0.366,0.167,0.716,0.439,0.965c4.676,4.272,7.357,10.343,7.357,16.652
-			s-2.682,12.38-7.357,16.652c-0.272,0.249-0.431,0.599-0.439,0.965c-0.008,0.369,0.135,0.724,0.396,0.984l3.122,3.122
-			c0.263,0.263,0.607,0.395,0.953,0.395c0.328,0,0.656-0.118,0.916-0.359c6.044-5.599,9.512-13.529,9.512-21.759
-			C58.939,13.916,55.472,5.985,49.428,0.386z"/>
-	</g>
-	<g>
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="38.4355" y1="8.6172" x2="38.4355" y2="23.145">
-			<stop  offset="0" style="stop-color:#AEADAC"/>
-			<stop  offset="1" style="stop-color:#E1E0DF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_2_)" d="M35.967,11.013c0.263-0.264,0.607-0.396,0.954-0.396c0.315,0,0.632,0.11,0.888,0.333
-			c3.557,3.112,5.674,7.514,5.942,12.194c0.019-0.333,0.054-0.664,0.054-1c0-5.052-2.186-9.86-5.996-13.194
-			c-0.256-0.223-0.572-0.333-0.888-0.333c-0.347,0-0.691,0.132-0.954,0.396l-2.508,2.508c-0.267,0.267-0.409,0.634-0.393,1.011
-			c0.016,0.36,0.178,0.697,0.445,0.938L35.967,11.013z"/>
-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="35.3223" y1="23.1445" x2="35.3223" y2="32.8203">
-			<stop  offset="0" style="stop-color:#AEADAC"/>
-			<stop  offset="1" style="stop-color:#E1E0DF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_3_)" d="M33.512,32.82c0.012-0.011,0.02-0.024,0.032-0.034c2.564-2.161,4.034-5.311,4.034-8.642
-			c0-0.336-0.025-0.668-0.055-1c-0.264,2.955-1.674,5.698-3.979,7.642c-0.288,0.241-0.462,0.596-0.478,0.972
-			c-0.017,0.378,0.126,0.745,0.393,1.011L33.512,32.82z"/>
-	</g>
-	<g>
-		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="51.4902" y1="0.0264" x2="51.4902" y2="23.145">
-			<stop  offset="0" style="stop-color:#AEADAC"/>
-			<stop  offset="1" style="stop-color:#E1E0DF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_4_)" d="M44.484,5.496l3.073-3.075c0.263-0.263,0.608-0.395,0.954-0.395c0.328,0,0.656,0.118,0.916,0.359
-			c5.799,5.372,9.217,12.891,9.484,20.759c0.012-0.333,0.027-0.666,0.027-1c0-8.229-3.468-16.159-9.512-21.759
-			c-0.26-0.241-0.588-0.359-0.916-0.359c-0.346,0-0.691,0.132-0.954,0.395l-3.121,3.122c-0.261,0.26-0.403,0.615-0.396,0.984
-			c0.009,0.366,0.167,0.716,0.439,0.965C44.481,5.493,44.482,5.494,44.484,5.496z"/>
-		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="47.9395" y1="23.1445" x2="47.9395" y2="40.793">
-			<stop  offset="0" style="stop-color:#AEADAC"/>
-			<stop  offset="1" style="stop-color:#E1E0DF"/>
-		</linearGradient>
-		<path fill="url(#SVGID_5_)" d="M44.484,40.793c4.674-4.271,7.354-10.341,7.354-16.648c0-0.334-0.012-0.667-0.026-1
-			c-0.268,5.947-2.902,11.606-7.331,15.652c-0.272,0.249-0.431,0.599-0.439,0.965c-0.008,0.369,0.135,0.724,0.396,0.984
-			L44.484,40.793z"/>
-	</g>
-</g>
-<rect fill="none" width="59" height="45"/>
-</svg>
diff --git a/QtDemo/qml/QtDemo/demos/slidepuzzle/slidepuzzle.qml b/QtDemo/qml/QtDemo/demos/slidepuzzle/slidepuzzle.qml
index 949cf61..7bddc70 100644
--- a/QtDemo/qml/QtDemo/demos/slidepuzzle/slidepuzzle.qml
+++ b/QtDemo/qml/QtDemo/demos/slidepuzzle/slidepuzzle.qml
@@ -198,5 +198,4 @@ Rectangle {
         clockTimer.start();
         checkGameOver();
     }
-
 }
diff --git a/QtDemo/qml/QtDemo/engine.js b/QtDemo/qml/QtDemo/engine.js
index 17d41f8..58a52d9 100644
--- a/QtDemo/qml/QtDemo/engine.js
+++ b/QtDemo/qml/QtDemo/engine.js
@@ -1,6 +1,6 @@
 var positions = [
-            {x:-500, y:-1180, url: "demos/rssnews/rssnews.qml", device: 3, name: "Rss Reader"},
-            {x:-1550, y:-1040, url: "demos/gridrssnews/main.qml", device: 5, name: "Rss Reader"},
+            {x:-500, y:-1250, url: "demos/rssnews/rssnews.qml", device: 3, name: "Rss Reader"},
+            {x:-1550, y:-1200, url: "demos/gridrssnews/main.qml", device: 6, name: "Rss Reader"},
             {x:-1000, y:-820, url: "demos/tweetsearch/tweetsearch.qml", device: 2, name: "TweetSearch"},
 
             {x:1500, y:-1100, url: "demos/heartmonitor/main.qml", device: 4, name: "Heart Monitor"},
@@ -8,9 +8,9 @@ var positions = [
 
             {x:0, y:0, url: "demos/description/main.qml", device: 7, name: "Qt Description"},
 
-            {x:1300, y:-200, url: "demos/photosurface/photosurface.qml", device: 7, name: "Photo Surface"},
+            {x:1300, y:-200, url: "demos/photosurface/photosurface.qml", device: 5, name: "Photo Surface"},
             {x:2000, y:600, url: "demos/particledemo/particledemo.qml", device: 6, name: "Particle Paint"},
-            {x:900, y:1000, url: "demos/shaders/main.qml", device: 7, name: "Shaders"},
+            {x:900, y:1000, url: "demos/shaders/main.qml", device: 5, name: "Shaders"},
 
             {x:-1300, y:0, url: "demos/touchgallery/main.qml", device: 2, name: "Widget Gallery"},
             {x:-1900, y:200, url: "demos/radio/radio.qml", device: 4, name: "Internet Radio"},
@@ -21,13 +21,13 @@ var positions = [
         ]
 
 var imageSources = ["phone1.png","phone2.png", "phone3.png","tablet1.png", "medical_device.png", "laptop1.png", "laptop2.png", "tv.png"]
-var widths = [358, 360, 366, 758, 600, 888, 888, 800]
-var heights = [722, 706, 720, 564, 488, 512, 512, 638]
-var scales = [0.8, 0.8, 0.6, 0.9, 1.0, 0.9, 0.9, 1.0]
-var demoWidths = [322, 322, 322, 642, 482, 642, 642, 726]
-var demoHeights = [482, 482, 482, 402, 322, 402, 402, 456]
+var widths = [600, 360, 366, 758, 600, 918, 923, 800]
+var heights = [1210, 706, 720, 564, 488, 600, 600, 638]
+var scales = [0.6, 0.8, 0.6, 0.9, 1.0, 0.9, 1.0, 1.0]
+var demoWidths = [538, 322, 322, 642, 482, 688, 691, 726]
+var demoHeights = [808, 482, 482, 402, 322, 431, 432, 456]
 var maskHorizontalOffsets = [1, 1, 1, 1, 1, 1, 1, 1]
-var maskVerticalOffsets = [26, 32, 15, 24, 45, 33, 33, 56]
+var maskVerticalOffsets = [41, 32, 15, 24, 45, 59, 57, 56]
 
 var navigationList = [5,1,2,0,4,3,6,7,8,11,12,10,9,13]
 var currentDemoIndex = -1
@@ -80,8 +80,10 @@ function loadCurrentDemo(){
 
 function releaseDemos()
 {
+    print("releaseDemos!!!")
     for (var i=0; i < objects.length; i++)
         objects[i].releaseDemo();
+    print("releaseDemos!!! done")
 }
 
 function getCurrent()
diff --git a/QtDemo/qml/QtDemo/images/bird.png b/QtDemo/qml/QtDemo/images/bird.png
new file mode 100644
index 0000000..57b0b30
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/bird.png
diff --git a/QtDemo/qml/QtDemo/images/bird.svg b/QtDemo/qml/QtDemo/images/bird.svg
deleted file mode 100644
index ce529bf..0000000
--- a/QtDemo/qml/QtDemo/images/bird.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="52px" height="37px" viewBox="-0.5 0 52 37" enable-background="new -0.5 0 52 37" xml:space="preserve">
-<rect x="-0.5" fill="none" width="52" height="37"/>
-<g>
-	<path fill="#42210B" d="M51.5,17.064c-2.848-0.186-3.927-0.456-5.89-0.598c2.503-1.447,3.479-1.865,5.663-3.373
-		c-3.648-0.096-6.316-0.146-6.416-0.512C43.483,7.525,38.77,3.45,33.836,3.942c0.397-0.162,3.873-6.177-1.16-3.036
-		c-3.957,2.532-6.269,7.63-8.138,12.58c-1.468-1.426-2.772-2.548-3.939-3.173c-3.275-1.755-7.193-3.591-13.341-5.875
-		c-0.189,2.035,1.006,4.745,4.445,6.544c-0.745-0.101-2.107,0.125-3.195,0.383C8.95,13.7,10.4,15.622,14.329,16.55
-		c-1.795,0.118-2.724,0.53-3.564,1.408c0.817,1.624,2.815,3.534,6.402,3.14c-3.992,1.724-1.628,4.912,1.619,4.437
-		C13.249,31.264,4.515,30.838-0.5,26.051C12.592,43.91,41.055,36.611,45.295,19.41C46.674,18.857,48.922,17.958,51.5,17.064z"/>
-	<path fill="#754C24" d="M40.366,28.193c-0.082-0.353-0.223-0.672-0.443-0.941c-1.522-1.854-5.877-0.799-9.726,2.359
-		c-2.431,1.994-4.075,4.35-4.575,6.282C31.335,34.84,36.628,32.123,40.366,28.193z"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/btn_home.png b/QtDemo/qml/QtDemo/images/btn_home.png
new file mode 100644
index 0000000..ac16129
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/btn_home.png
diff --git a/QtDemo/qml/QtDemo/images/btn_home.svg b/QtDemo/qml/QtDemo/images/btn_home.svg
deleted file mode 100644
index c56aeec..0000000
--- a/QtDemo/qml/QtDemo/images/btn_home.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#80C342" d="M27.5,54C12.888,54,1,42.112,1,27.5S12.888,1,27.5,1S54,12.888,54,27.5S42.112,54,27.5,54z"/>
-		<path fill="#779E3F" d="M27.5,2C41.561,2,53,13.439,53,27.5S41.561,53,27.5,53S2,41.561,2,27.5S13.439,2,27.5,2 M27.5,0
-			C12.312,0,0,12.312,0,27.5S12.312,55,27.5,55C42.689,55,55,42.688,55,27.5S42.689,0,27.5,0L27.5,0z"/>
-	</g>
-	<path fill="#FFFFFF" d="M27.5,13l-17,13.592h3.752l1.229-0.982v13.908h24V25.579l1.268,1.014H44.5L27.5,13z M37.48,25.518v12H28.5
-		V28h-2v9.518h-9.02v-12h-1.885L27.5,16l11.904,9.518H37.48z"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/btn_next.png b/QtDemo/qml/QtDemo/images/btn_next.png
new file mode 100644
index 0000000..d38690a
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/btn_next.png
diff --git a/QtDemo/qml/QtDemo/images/btn_next.svg b/QtDemo/qml/QtDemo/images/btn_next.svg
deleted file mode 100644
index 18f34c1..0000000
--- a/QtDemo/qml/QtDemo/images/btn_next.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#80C342" d="M27.5,54C12.888,54,1,42.112,1,27.5S12.888,1,27.5,1S54,12.888,54,27.5S42.112,54,27.5,54z"/>
-		<path fill="#779E3F" d="M27.5,2C41.561,2,53,13.439,53,27.5S41.561,53,27.5,53S2,41.561,2,27.5S13.439,2,27.5,2 M27.5,0
-			C12.312,0,0,12.312,0,27.5S12.312,55,27.5,55S55,42.688,55,27.5S42.688,0,27.5,0L27.5,0z"/>
-	</g>
-	<polygon fill="#FFFFFF" points="37.75,28.037 21.713,15.202 21.713,12 41.75,28.037 21.713,44.075 21.713,40.873 	"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/btn_previous.png b/QtDemo/qml/QtDemo/images/btn_previous.png
new file mode 100644
index 0000000..265bc50
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/btn_previous.png
diff --git a/QtDemo/qml/QtDemo/images/btn_previous.svg b/QtDemo/qml/QtDemo/images/btn_previous.svg
deleted file mode 100644
index 925ffbc..0000000
--- a/QtDemo/qml/QtDemo/images/btn_previous.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#80C342" d="M27.5,54C12.888,54,1,42.112,1,27.5S12.888,1,27.5,1S54,12.888,54,27.5S42.112,54,27.5,54z"/>
-		<path fill="#779E3F" d="M27.5,2C41.561,2,53,13.439,53,27.5S41.561,53,27.5,53S2,41.561,2,27.5S13.439,2,27.5,2 M27.5,0
-			C12.312,0,0,12.312,0,27.5S12.312,55,27.5,55S55,42.688,55,27.5S42.688,0,27.5,0L27.5,0z"/>
-	</g>
-	<polygon fill="#FFFFFF" points="17.713,28.037 33.75,15.202 33.75,12 13.713,28.037 33.75,44.075 33.75,40.873 	"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/cloud1.png b/QtDemo/qml/QtDemo/images/cloud1.png
new file mode 100644
index 0000000..83adad6
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/cloud1.png
diff --git a/QtDemo/qml/QtDemo/images/cloud1.svg b/QtDemo/qml/QtDemo/images/cloud1.svg
deleted file mode 100644
index 781a3ca..0000000
--- a/QtDemo/qml/QtDemo/images/cloud1.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="235px" height="91px" viewBox="0 0 235 91" enable-background="new 0 0 235 91" xml:space="preserve">
-<path opacity="0.35" fill="#FFFFFF" d="M174.599,78.697c6.969-1.157,29.766-1.149,24.392-8.126
-	c-3.474-4.511-22.847-9.501-36.109-12.467c0.041-0.505,0.078-1.012,0.078-1.526c0-10.446-8.471-18.918-18.916-18.918
-	c-4.469,0-8.568,1.56-11.805,4.152c-3.592-3.701-6.061-7.559-5.265-10.736c0.835-3.336-2.825-8.62-8.235-13.163
-	C115.364,7.519,105.605,0,94.087,0c-12.72,0-23.292,9.166-25.49,21.25c-2.211-0.919-4.635-1.431-7.179-1.431
-	c-10.346,0-18.73,8.391-18.73,18.729c0,2.214,0.404,4.328,1.11,6.301c-4.348,2.096-7.727,4.773-7.862,8.291
-	c-0.232,6.068-2.759,4.633-5.947,3.245c-2.92-4.443-7.94-7.383-13.653-7.383C7.313,49.003,0,56.319,0,65.337
-	c0,7.487,5.047,13.786,11.921,15.714c0.896,0.493,2.052,0.883,3.543,1.131l35.376,2.503c0,0,16.894,5.631,22.703,5.631
-	c5.809,0,161.02,1.456,161.455-3.485C235.434,81.89,167.629,79.854,174.599,78.697z"/>
-<rect fill="none" width="235" height="91"/>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/cloud2.png b/QtDemo/qml/QtDemo/images/cloud2.png
new file mode 100644
index 0000000..e3d0d8b
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/cloud2.png
diff --git a/QtDemo/qml/QtDemo/images/cloud2.svg b/QtDemo/qml/QtDemo/images/cloud2.svg
deleted file mode 100644
index 9be206c..0000000
--- a/QtDemo/qml/QtDemo/images/cloud2.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="227px" height="96px" viewBox="0 0 227 96" enable-background="new 0 0 227 96" xml:space="preserve">
-<path opacity="0.25" fill="#FFFFFF" d="M166.206,83.538c7.015-1.16,29.959-1.152,24.551-8.144
-	c-2.293-2.964-11.469-6.135-21.277-8.805c-1.879-6.98-8.26-12.131-15.863-12.131c-1.73,0-3.397,0.271-4.963,0.763
-	c-3.016-3.54-7.511-5.795-12.537-5.795c-2.676,0-5.193,0.649-7.426,1.778c-5.99-4.889-11.562-10.833-10.418-15.387
-	c1.037-4.128-4.828-11.233-12.386-16.239C104.543,8.554,95.115,0,83.671,0C71.308,0,61.287,9.985,61.287,22.286
-	c0,0.611,0.031,1.217,0.081,1.816c-1.464-0.427-3.007-0.666-4.607-0.666c-6.256,0-11.692,3.492-14.457,8.623
-	c-4.428-3.449-9.998-5.512-16.057-5.512c-14.405,0-26.084,11.629-26.084,25.971c0,6.501,2.405,12.44,6.371,16.996
-	C0.778,76.989-4.484,85.28,6.039,87.029l60.795-2.325c0,0-8.187,10.476-2.339,10.476c5.847,0,162.065,1.459,162.503-3.492
-	S159.192,84.697,166.206,83.538z"/>
-<rect fill="none" width="227" height="96"/>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/island.png b/QtDemo/qml/QtDemo/images/island.png
new file mode 100644
index 0000000..8e99f28
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/island.png
diff --git a/QtDemo/qml/QtDemo/images/island.svg b/QtDemo/qml/QtDemo/images/island.svg
deleted file mode 100644
index fc14564..0000000
--- a/QtDemo/qml/QtDemo/images/island.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="1200px" height="822px" viewBox="0 0 1200 822" enable-background="new 0 0 1200 822" xml:space="preserve">
-<g>
-	<g>
-		<polygon fill="#603813" points="323.716,447.409 451.185,567.78 824.206,389.712 1007.076,522.688 877.493,615.045 
-			327.658,705.249 172.709,624.057 		"/>
-		<polygon fill="#754C24" points="472.987,421.734 531.998,332.309 816.934,325.087 843.577,383.078 494.782,578.522 		"/>
-		<polygon fill="#42210B" points="1200,241.881 1191.767,364.254 1093.07,494.763 1107.601,533.427 1102.76,580.68 807.275,747.433 
-			470.648,821.232 491.808,778.87 858.981,611.393 986.49,529.128 824.206,389.712 816.934,325.087 		"/>
-		<polygon fill="#8C6239" points="475.404,282.128 0.976,254.145 23.785,396.826 172.709,624.057 325.226,460.395 356.718,544.153 
-			494.782,578.522 535.963,335.829 		"/>
-		<polygon fill="#754C24" points="470.889,821.073 497.206,780.423 845.01,617.768 327.658,660.141 322.81,718.748 		"/>
-	</g>
-	<g>
-		<polygon fill="#754C24" points="44.612,168.449 0,209.576 0,241.881 44.612,241.881 		"/>
-		<polygon fill="#754C24" points="1155.388,168.449 1200,209.576 1200,241.881 1155.388,241.881 		"/>
-		<path fill="#754C24" d="M1200,242.066c0,116.177-268.632,210.342-600,210.342S0,358.243,0,242.066
-			C0,125.897,268.632,31.724,600,31.724S1200,125.897,1200,242.066z"/>
-	</g>
-	<path fill="#779E3F" d="M1200,210.342c0,116.177-268.632,210.342-600,210.342S0,326.52,0,210.342C0,94.173,268.632,0,600,0
-		S1200,94.173,1200,210.342z"/>
-</g>
-<rect fill="none" width="1200" height="822"/>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/laptop1.png b/QtDemo/qml/QtDemo/images/laptop1.png
index 8ce9b13..48317c3 100644
--- a/QtDemo/qml/QtDemo/images/laptop1.png
+++ b/QtDemo/qml/QtDemo/images/laptop1.png
diff --git a/QtDemo/qml/QtDemo/images/laptop1.svg b/QtDemo/qml/QtDemo/images/laptop1.svg
deleted file mode 100644
index 9157f7f..0000000
--- a/QtDemo/qml/QtDemo/images/laptop1.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="888px" height="513px" viewBox="0 0 888 513" enable-background="new 0 0 888 513" xml:space="preserve">
-<g>
-	<g>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="444.0005" y1="467" x2="444.0005" y2="1.0005">
-			<stop  offset="0" style="stop-color:#5D5B59"/>
-			<stop  offset="1" style="stop-color:#AEADAC"/>
-		</linearGradient>
-		<path fill="url(#SVGID_1_)" d="M769,1H119c-9.925,0-18,8.075-18,18v430c0,9.925,8.075,18,18,18h650c9.925,0,18-8.075,18-18V19
-			C787,9.075,778.925,1,769,1z M764,424H124V24h640V424z"/>
-		<path d="M769,2c9.375,0,17,7.626,17,17v430c0,9.374-7.625,17-17,17H119c-9.373,0-17-7.626-17-17V19c0-9.374,7.627-17,17-17H769
-			 M769,0H119c-10.451,0-19,8.55-19,19v430c0,10.45,8.549,19,19,19h650c10.45,0,19-8.55,19-19V19C788,8.55,779.45,0,769,0L769,0z"/>
-		<path d="M768,4H120c-8.801,0-16,7.2-16,16v428c0,8.8,7.199,16,16,16h648c8.8,0,16-7.2,16-16V20C784,11.2,776.8,4,768,4z M764,424
-			H124V24h640V424z"/>
-		<g>
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="444.0005" y1="19" x2="444.0005" y2="11">
-				<stop  offset="0" style="stop-color:#AEADAC"/>
-				<stop  offset="1" style="stop-color:#35322F"/>
-			</linearGradient>
-			<circle fill="url(#SVGID_2_)" cx="444" cy="15" r="4"/>
-			<path d="M447.113,14.998c0,1.721-1.396,3.115-3.113,3.115c-1.723,0-3.113-1.395-3.113-3.115c0-1.717,1.391-3.111,3.113-3.111
-				C445.717,11.887,447.113,13.281,447.113,14.998z"/>
-		</g>
-		<path opacity="0.1" fill="#FFFFFF" d="M120,4c-8.801,0-16,7.2-16,16v428c0,0.553,0.029,1.099,0.084,1.637L308.541,4H120z"/>
-	</g>
-	<g>
-		<polygon fill="#AEADAC" points="884,458 788,444.175 479,444.175 409,444.175 100,444.175 4,458 0,464 409,464 479,464 888,464 		
-			"/>
-		<g>
-			<path opacity="0.2" fill="#35322F" d="M888,490.009C888,502.698,689.188,513,444.011,513C198.787,513,0,502.698,0,490.009
-				C0,477.308,198.787,467,444.011,467C689.188,467,888,477.308,888,490.009z"/>
-			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="443.9995" y1="467.7637" x2="443.9995" y2="489.7637">
-				<stop  offset="0" style="stop-color:#D7D6D5"/>
-				<stop  offset="1" style="stop-color:#35322F"/>
-			</linearGradient>
-			<path fill="url(#SVGID_3_)" d="M536,467.764H352H0v13c0,7.111,28,9,42,9h804c14,0,42-1.889,42-9v-13H536z"/>
-			<path fill="#D7D6D5" d="M888,478c0,2.2-1.801,4-4,4H4c-2.2,0-4-1.8-4-4v-16c0-2.2,1.8-4,4-4h880c2.199,0,4,1.8,4,4V478z"/>
-			<g>
-				<g>
-					<g>
-						<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="677" y1="474" x2="677" y2="468">
-							<stop  offset="0" style="stop-color:#FFFFFF"/>
-							<stop  offset="1" style="stop-color:#AEADAC"/>
-						</linearGradient>
-						<path fill="url(#SVGID_4_)" d="M845,471c0,1.65-1.35,3-3,3H512c-1.65,0-3-1.35-3-3l0,0c0-1.65,1.35-3,3-3h330
-							C843.65,468,845,469.35,845,471L845,471z"/>
-					</g>
-					<g>
-						<path fill="#D7D6D5" d="M843,471c0,0.55-0.451,1-1,1H512c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h330
-							C842.549,470,843,470.45,843,471L843,471z"/>
-					</g>
-				</g>
-				<g>
-					<g>
-						<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="86" y1="476" x2="86" y2="464">
-							<stop  offset="0" style="stop-color:#FFFFFF"/>
-							<stop  offset="1" style="stop-color:#868482"/>
-						</linearGradient>
-						<path fill="url(#SVGID_5_)" d="M92,470c0,3.3-2.7,6-6,6l0,0c-3.301,0-6-2.7-6-6l0,0c0-3.3,2.699-6,6-6l0,0
-							C89.3,464,92,466.7,92,470L92,470z"/>
-					</g>
-					<g>
-						<path fill="#5D5B59" d="M89,470c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3l0,0c0-1.65,1.35-3,3-3l0,0
-							C87.65,467,89,468.35,89,470L89,470z"/>
-					</g>
-				</g>
-				<g>
-					<g>
-						<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="66" y1="476" x2="66" y2="464">
-							<stop  offset="0" style="stop-color:#FFFFFF"/>
-							<stop  offset="1" style="stop-color:#868482"/>
-						</linearGradient>
-						<path fill="url(#SVGID_6_)" d="M72,470c0,3.3-2.7,6-6,6l0,0c-3.301,0-6-2.7-6-6l0,0c0-3.3,2.699-6,6-6l0,0
-							C69.3,464,72,466.7,72,470L72,470z"/>
-					</g>
-					<g>
-						<path fill="#868482" d="M69,470c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3l0,0c0-1.65,1.35-3,3-3l0,0
-							C67.65,467,69,468.35,69,470L69,470z"/>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/laptop2.png b/QtDemo/qml/QtDemo/images/laptop2.png
index ebe2221..b17c39e 100644
--- a/QtDemo/qml/QtDemo/images/laptop2.png
+++ b/QtDemo/qml/QtDemo/images/laptop2.png
diff --git a/QtDemo/qml/QtDemo/images/laptop2.svg b/QtDemo/qml/QtDemo/images/laptop2.svg
deleted file mode 100644
index bfc0a1c..0000000
--- a/QtDemo/qml/QtDemo/images/laptop2.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="888px" height="513px" viewBox="0 0 888 513" enable-background="new 0 0 888 513" xml:space="preserve">
-<g>
-	<g>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="444.0005" y1="467" x2="444.0005" y2="1.0005">
-			<stop  offset="0" style="stop-color:#5D5B59"/>
-			<stop  offset="1" style="stop-color:#AEADAC"/>
-		</linearGradient>
-		<path fill="url(#SVGID_1_)" d="M782,1H106c-2.757,0-5,2.243-5,5v456c0,2.757,2.243,5,5,5h676c2.757,0,5-2.243,5-5V6
-			C787,3.243,784.757,1,782,1z M764,424H124V24h640V424z"/>
-		<path d="M782,2c2.205,0,4,1.795,4,4v456c0,2.205-1.795,4-4,4H106c-2.205,0-4-1.795-4-4V6c0-2.205,1.795-4,4-4H782 M782,0H106
-			c-3.301,0-6,2.7-6,6v456c0,3.3,2.699,6,6,6h676c3.3,0,6-2.7,6-6V6C788,2.7,785.3,0,782,0L782,0z"/>
-		<path d="M782,4H106c-1.1,0-2,0.9-2,2v456c0,1.1,0.9,2,2,2h676c1.1,0,2-0.9,2-2V6C784,4.9,783.1,4,782,4z M764,424H124V24h640V424z
-			"/>
-		<path fill="#1E1B18" d="M764,24v400H124V24H764 M765,23h-1H124h-1v1v400v1h1h640h1v-1V24V23L765,23z"/>
-		<g>
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="444.0005" y1="19" x2="444.0005" y2="11">
-				<stop  offset="0" style="stop-color:#AEADAC"/>
-				<stop  offset="1" style="stop-color:#35322F"/>
-			</linearGradient>
-			<circle fill="url(#SVGID_2_)" cx="444" cy="15" r="4"/>
-			<path d="M447,14.998c0,1.658-1.346,3.002-3.001,3.002C442.34,18,441,16.656,441,14.998c0-1.654,1.34-2.998,2.999-2.998
-				C445.654,12,447,13.344,447,14.998z"/>
-		</g>
-		<path opacity="0.1" fill="#FFFFFF" d="M308.541,4H106c-1.1,0-2,0.9-2,2v443.82L308.541,4z"/>
-	</g>
-	<g>
-		<polygon fill="#1E1B18" points="884,454 788,444 100,444 4,454 0,460 888,460 		"/>
-		<g>
-			<path opacity="0.2" fill="#35322F" d="M888,490.009C888,502.698,689.188,513,444.011,513C198.787,513,0,502.698,0,490.009
-				C0,477.308,198.787,467,444.011,467C689.188,467,888,477.308,888,490.009z"/>
-			<path d="M884,454H594H294H4c-2.2,0-4,1.8-4,4v10c0,10.898,34.842,23,54,23h240h300h240c19.158,0,54-12.102,54-23v-10
-				C888,455.8,886.199,454,884,454z"/>
-			<g>
-				<g>
-					<g>
-						<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="677" y1="474" x2="677" y2="468">
-							<stop  offset="0" style="stop-color:#35322F"/>
-							<stop  offset="1" style="stop-color:#1E1B18"/>
-						</linearGradient>
-						<path fill="url(#SVGID_3_)" d="M845,471c0,1.65-1.35,3-3,3H512c-1.65,0-3-1.35-3-3l0,0c0-1.65,1.35-3,3-3h330
-							C843.65,468,845,469.35,845,471L845,471z"/>
-					</g>
-					<g>
-						<path d="M843,471c0,0.55-0.451,1-1,1H512c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h330C842.549,470,843,470.45,843,471
-							L843,471z"/>
-					</g>
-				</g>
-				<g>
-					<g>
-						<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="86" y1="478" x2="86" y2="466">
-							<stop  offset="0" style="stop-color:#35322F"/>
-							<stop  offset="1" style="stop-color:#1E1B18"/>
-						</linearGradient>
-						<path fill="url(#SVGID_4_)" d="M92,472c0,3.3-2.7,6-6,6l0,0c-3.301,0-6-2.7-6-6l0,0c0-3.3,2.699-6,6-6l0,0
-							C89.3,466,92,468.7,92,472L92,472z"/>
-					</g>
-					<g>
-						<path d="M89,472c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3l0,0c0-1.65,1.35-3,3-3l0,0C87.65,469,89,470.35,89,472L89,472z"/>
-					</g>
-				</g>
-				<g>
-					<g>
-						<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="66" y1="478" x2="66" y2="466">
-							<stop  offset="0" style="stop-color:#35322F"/>
-							<stop  offset="1" style="stop-color:#1E1B18"/>
-						</linearGradient>
-						<path fill="url(#SVGID_5_)" d="M72,472c0,3.3-2.7,6-6,6l0,0c-3.301,0-6-2.7-6-6l0,0c0-3.3,2.699-6,6-6l0,0
-							C69.3,466,72,468.7,72,472L72,472z"/>
-					</g>
-					<g>
-						<path d="M69,472c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3l0,0c0-1.65,1.35-3,3-3l0,0C67.65,469,69,470.35,69,472L69,472z"/>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/laptop2_s.png b/QtDemo/qml/QtDemo/images/laptop2_s.png
new file mode 100644
index 0000000..b17c39e
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/laptop2_s.png
diff --git a/QtDemo/qml/QtDemo/images/medical_device.svg b/QtDemo/qml/QtDemo/images/medical_device.svg
deleted file mode 100644
index 7af14b1..0000000
--- a/QtDemo/qml/QtDemo/images/medical_device.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="600px" height="489px" viewBox="0 0 600 489" enable-background="new 0 0 600 489" xml:space="preserve">
-<g>
-	<path opacity="0.2" fill="#35322F" d="M600,462.506C600,477.137,465.668,489,300.006,489C134.316,489,0,477.137,0,462.506
-		C0,447.867,134.316,436,300.006,436C465.668,436,600,447.867,600,462.506z"/>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="299.9917" y1="306.9492" x2="299.9917" y2="459">
-		<stop  offset="0" style="stop-color:#FFFFFF"/>
-		<stop  offset="0.8" style="stop-color:#AEADAC"/>
-		<stop  offset="1" style="stop-color:#868482"/>
-	</linearGradient>
-	<path fill="url(#SVGID_1_)" d="M599.982,306.949H539v53.476H59v-53.476H0.002c0,0-0.43,36.526,13.926,78.935
-		c12.521,36.979,22.307,47.634,47.926,60.017C84.332,456.77,123.559,459,165.227,459c34.537,0,236.123,0,269.537,0
-		c41.664,0,80.893-2.23,103.369-13.1c25.619-12.383,35.404-23.038,47.926-60.017C600.41,343.476,599.982,306.949,599.982,306.949z"
-		/>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="300.0005" y1="408.5518" x2="300.0005" y2="4.882812e-04">
-		<stop  offset="0" style="stop-color:#AEADAC"/>
-		<stop  offset="0.1652" style="stop-color:#CBCAC9"/>
-		<stop  offset="0.3435" style="stop-color:#E2E1E1"/>
-		<stop  offset="0.5336" style="stop-color:#F2F2F2"/>
-		<stop  offset="0.7414" style="stop-color:#FCFCFC"/>
-		<stop  offset="1" style="stop-color:#FFFFFF"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" d="M599.99,307.961L589.756,94.934c-0.059-25.726-11.723-49.883-32.857-68.041
-		C537.006,9.802,510.592,0,484.424,0h-368.85c-26.166,0-52.58,9.802-72.472,26.893C21.967,45.051,10.304,69.208,10.244,94.934
-		L0.01,307.961L0,308.152v0.192c0,26.132,10.237,50.766,28.826,69.364c18.59,18.6,40.215,28.843,66.336,30.843h409.676
-		c26.119-2,47.744-12.243,66.334-30.843C589.762,359.11,600,334.476,600,308.345v-0.192L599.99,307.961z M539,360.425H59v-320h480
-		V360.425z"/>
-	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="300.0005" y1="401.5186" x2="300.0005" y2="4.98">
-		<stop  offset="0" style="stop-color:#FFFFFF"/>
-		<stop  offset="1" style="stop-color:#AEADAC"/>
-	</linearGradient>
-	<path fill="url(#SVGID_3_)" d="M584.76,95.037c-0.023-24.294-11.072-47.155-31.117-64.376
-		C534.645,14.34,509.416,4.979,484.424,4.979h-368.85c-24.99,0-50.219,9.36-69.217,25.682
-		C26.312,47.882,15.265,70.743,15.242,95.037L5.002,308.169l-0.004,0.144c0,51.394,41.793,93.206,93.162,93.206h403.68
-		c51.369,0,93.162-41.812,93.162-93.206v-0.072L584.76,95.037z M539,360.425H59v-320h480V360.425z"/>
-	<path fill="#FFFFFF" d="M484.424,7.979c49.59,0,97.336,37.509,97.336,87.131l10.242,213.202c0,49.622-40.574,90.206-90.162,90.206
-		H98.16c-49.592,0-90.162-40.581-90.162-90.206L18.241,95.11c0-49.622,47.745-87.131,97.333-87.131H484.424 M484.424,1.98h-368.85
-		c-25.697,0-51.639,9.624-71.172,26.405c-20.698,17.783-32.116,41.423-32.16,66.578L2.005,308.024l-0.007,0.144v0.145
-		c0,25.602,10.029,49.735,28.24,67.954c18.211,18.218,42.334,28.251,67.922,28.251h403.68c25.586,0,49.707-10.033,67.92-28.252
-		c18.213-18.22,28.242-42.353,28.242-67.953v-0.145l-0.008-0.144L587.758,94.964c-0.043-25.155-11.461-48.795-32.16-66.578
-		C536.064,11.604,510.123,1.98,484.424,1.98L484.424,1.98z"/>
-	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="300.0005" y1="396.4746" x2="300.0005" y2="5.9263">
-		<stop  offset="0" style="stop-color:#000000"/>
-		<stop  offset="1" style="stop-color:#1E1B18"/>
-	</linearGradient>
-	<path fill="url(#SVGID_4_)" d="M581.76,93.057c0-49.612-47.746-87.131-97.336-87.131h-368.85
-		c-49.588,0-97.333,37.519-97.333,87.131L7.998,306.269c0,49.612,40.57,90.206,90.162,90.206h403.68
-		c49.588,0,90.162-40.594,90.162-90.206L581.76,93.057z M539,360.425H59v-320h480V360.425z"/>
-	<path opacity="0.1" fill="#FFFFFF" d="M115.574,5.926c-49.588,0-97.333,37.519-97.333,87.131L7.998,306.269
-		c0,31.216,16.063,58.856,40.327,75.066L224.941,5.926H115.574z"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/phone1.png b/QtDemo/qml/QtDemo/images/phone1.png
index 187ba5c..6ef93b6 100644
--- a/QtDemo/qml/QtDemo/images/phone1.png
+++ b/QtDemo/qml/QtDemo/images/phone1.png
diff --git a/QtDemo/qml/QtDemo/images/phone1.svg b/QtDemo/qml/QtDemo/images/phone1.svg
deleted file mode 100644
index 42ea960..0000000
--- a/QtDemo/qml/QtDemo/images/phone1.svg
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="358px" height="723px" viewBox="0 0 358 723" enable-background="new 0 0 358 723" xml:space="preserve">
-<g>
-	<g>
-		<path opacity="0.2" fill="#35322F" d="M358,697.506C358,711.584,277.85,723,179.005,723C80.142,723,0,711.584,0,697.506
-			C0,683.418,80.142,672,179.005,672C277.85,672,358,683.418,358,697.506z"/>
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="179.0005" y1="696" x2="179.0005" y2="1.0005">
-			<stop  offset="0" style="stop-color:#646464"/>
-			<stop  offset="1" style="stop-color:#BCBCBC"/>
-		</linearGradient>
-		<path fill="url(#SVGID_1_)" d="M329.682,21.489C313.304,8.659,292.836,1,274.931,1H83.069C65.164,1,44.696,8.659,28.318,21.489
-			C10.957,35.089,1,52.431,1,69.068V626.93C1,663.479,46.894,696,83.069,696h191.861c17.831,0,38.296-7.844,54.743-20.983
-			C347.04,661.144,357,643.617,357,626.93V69.068C357,52.431,347.043,35.089,329.682,21.489z M339,577H19V97h320V577z"/>
-		<path fill="#35322F" d="M274.931,2c17.689,0,37.927,7.58,54.134,20.276C346.183,35.686,356,52.74,356,69.068V626.93
-			c0,16.382-9.823,33.624-26.95,47.306C312.773,687.237,292.543,695,274.931,695H83.069c-17.611,0-37.843-7.763-54.119-20.765
-			C11.823,660.554,2,643.312,2,626.93V69.068c0-16.328,9.817-33.383,26.936-46.792C45.143,9.58,65.38,2,83.069,2H274.931 M274.931,0
-			H83.069C46.182,0,0,32.182,0,69.068V626.93C0,663.818,46.182,697,83.069,697h191.861C311.818,697,358,663.818,358,626.93V69.068
-			C358,32.182,311.818,0,274.931,0L274.931,0z"/>
-		<g>
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="178.9995" y1="6" x2="178.9995" y2="691.0005">
-				<stop  offset="0" style="stop-color:#FFFFFF"/>
-				<stop  offset="1" style="stop-color:#E1E0DF"/>
-			</linearGradient>
-			<path fill="url(#SVGID_2_)" d="M271.931,6H85.069C48.182,6,6,36.182,6,73.068V624.93C6,661.818,51.182,691,88.069,691h180.861
-				C305.818,691,352,661.818,352,624.93V73.068C352,36.182,308.818,6,271.931,6z M339,577H19V97h320V577z"/>
-		</g>
-		<g>
-			<path fill="#5D5B59" d="M304,50c0,4.967-4.028,9-9,9c-4.97,0-9-4.033-9-9c0-4.965,4.031-9,9-9C299.972,41,304,45.033,304,50z"/>
-			<path fill="#1E1B18" d="M302,49.998c0,3.869-3.135,7.002-7.001,7.002c-3.87,0-6.999-3.133-6.999-7.002
-				c0-3.865,3.129-6.998,6.999-6.998C298.865,43,302,46.133,302,49.998z"/>
-		</g>
-		<g>
-			<g>
-				<path fill="#AEADAC" d="M222,50c0,3.85-3.15,7-7,7h-72c-3.85,0-7-3.15-7-7l0,0c0-3.85,3.15-7,7-7h72C218.85,43,222,46.15,222,50
-					L222,50z"/>
-			</g>
-			<g>
-				<path fill="#5D5B59" d="M220,50c0,2.75-2.25,5-5,5h-72c-2.75,0-5-2.25-5-5l0,0c0-2.75,2.25-5,5-5h72C217.75,45,220,47.25,220,50
-					L220,50z"/>
-			</g>
-		</g>
-		<g opacity="0.1">
-			<polygon fill="#FFFFFF" points="6,585.2 240,86 6,86 			"/>
-		</g>
-		<path fill="#868482" d="M339,97v480H19V97H339 M341,95h-2H19h-2v2v480v2h2h320h2v-2V97V95L341,95z"/>
-	</g>
-	<g>
-		<g>
-			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="220.9062" y1="658" x2="220.9062" y2="614">
-				<stop  offset="0" style="stop-color:#FFFFFF"/>
-				<stop  offset="1" style="stop-color:#AEADAC"/>
-			</linearGradient>
-			<path fill="url(#SVGID_3_)" d="M249,614h-70v44c0,0,25.731,0,40.909,0c42.497,0,42.902-30.001,42.902-30.001
-				C262.915,620.3,256.7,614,249,614L249,614z"/>
-			<path fill="#868482" d="M249,616h-70v40h40.909c16.601,0,28.926-4.842,35.643-14.002c5.065-6.908,5.259-13.961,5.26-14.031
-				c0.043-3.18-1.166-6.183-3.403-8.45S252.185,616,249,616L249,616z"/>
-			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="219.9062" y1="618" x2="219.9062" y2="654">
-				<stop  offset="0" style="stop-color:#E1E0DF"/>
-				<stop  offset="1" style="stop-color:#AEADAC"/>
-			</linearGradient>
-			<path fill="url(#SVGID_4_)" d="M249,618h-68v36h38.909c15.938,0,27.705-4.56,34.03-13.185c4.629-6.313,4.871-12.832,4.873-12.897
-				c0.035-2.62-0.969-5.112-2.828-6.997C254.126,619.037,251.646,618,249,618L249,618z"/>
-			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="218.9072" y1="620" x2="218.9072" y2="652">
-				<stop  offset="0" style="stop-color:#FFFFFF"/>
-				<stop  offset="1" style="stop-color:#E1E0DF"/>
-			</linearGradient>
-			<path fill="url(#SVGID_5_)" d="M256.813,627.847c0.027-2.044-0.772-4.021-2.253-5.521C253.081,620.826,251.106,620,249,620h-68
-				v32h38.909c15.274,0,26.484-4.276,32.417-12.367C256.527,633.902,256.812,627.907,256.813,627.847z"/>
-		</g>
-		<g>
-			
-				<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="1326.7188" y1="658.001" x2="1326.7188" y2="614.001" gradientTransform="matrix(-1 0 0 1 1463.8125 0)">
-				<stop  offset="0" style="stop-color:#FFFFFF"/>
-				<stop  offset="1" style="stop-color:#AEADAC"/>
-			</linearGradient>
-			<path fill="url(#SVGID_6_)" d="M109,614c-7.7,0-13.915,6.3-13.812,13.999c0,0,0.405,30.001,42.902,30.001
-				c15.178,0,40.909,0,40.909,0v-44H109L109,614z"/>
-			<path fill="#868482" d="M109,616c-3.185,0-6.171,1.249-8.408,3.517s-3.446,5.271-3.403,8.45c0.001,0.07,0.194,7.123,5.26,14.031
-				c6.717,9.16,19.042,14.002,35.643,14.002H179v-40H109L109,616z"/>
-			
-				<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="1325.7188" y1="617.999" x2="1325.7188" y2="653.999" gradientTransform="matrix(-1 0 0 1 1463.8125 0)">
-				<stop  offset="0" style="stop-color:#E1E0DF"/>
-				<stop  offset="1" style="stop-color:#AEADAC"/>
-			</linearGradient>
-			<path fill="url(#SVGID_7_)" d="M109,618c-2.646,0-5.126,1.037-6.984,2.921c-1.859,1.885-2.863,4.377-2.828,6.997
-				c0.002,0.065,0.244,6.584,4.873,12.897c6.325,8.625,18.093,13.185,34.03,13.185H177v-36H109L109,618z"/>
-			
-				<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="1324.7207" y1="619.999" x2="1324.7207" y2="651.999" gradientTransform="matrix(-1 0 0 1 1463.8125 0)">
-				<stop  offset="0" style="stop-color:#FFFFFF"/>
-				<stop  offset="1" style="stop-color:#E1E0DF"/>
-			</linearGradient>
-			<path fill="url(#SVGID_8_)" d="M101.187,627.847c-0.027-2.044,0.772-4.021,2.253-5.521c1.479-1.499,3.454-2.325,5.561-2.325h68
-				v32h-38.909c-15.274,0-26.484-4.276-32.417-12.367C101.473,633.902,101.188,627.907,101.187,627.847z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/phone2.svg b/QtDemo/qml/QtDemo/images/phone2.svg
deleted file mode 100644
index f7d841c..0000000
--- a/QtDemo/qml/QtDemo/images/phone2.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="361px" height="707px" viewBox="0 0 361 707" enable-background="new 0 0 361 707" xml:space="preserve">
-<g>
-	<path d="M355.972,0H4.028C1.812,0,0,1.812,0,4.028v672.943C0,679.188,1.812,681,4.028,681h351.943c2.216,0,4.028-1.812,4.028-4.028
-		V4.028C360,1.812,358.188,0,355.972,0z M340,562H20V82h320V562z"/>
-	<path opacity="0.2" fill="#35322F" d="M361,681.506C361,695.585,280.178,707,180.504,707C80.813,707,0,695.585,0,681.506
-		C0,667.418,80.813,656,180.504,656C280.178,656,361,667.418,361,681.506z"/>
-	<path d="M332.029,9H27.971C17.51,9,9,17.51,9,27.971v625.059C9,663.49,17.51,672,27.971,672h304.059
-		C342.49,672,351,663.49,351,653.029V27.971C351,17.51,342.49,9,332.029,9z M340,562H20V82h320V562z"/>
-	<path fill="#35322F" d="M332.029,10C341.938,10,350,18.062,350,27.971v625.059c0,9.909-8.062,17.971-17.971,17.971H27.971
-		C18.062,671,10,662.938,10,653.029V27.971C10,18.062,18.062,10,27.971,10H332.029 M332.029,8H27.971C16.986,8,8,16.987,8,27.971
-		v625.059C8,664.013,16.986,673,27.971,673h304.059c10.984,0,19.971-8.987,19.971-19.971V27.971C352,16.987,343.014,8,332.029,8
-		L332.029,8z"/>
-	<g>
-		<g>
-			<g>
-				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="181" y1="51" x2="181" y2="37">
-					<stop  offset="0" style="stop-color:#35322F"/>
-					<stop  offset="1" style="stop-color:#000000"/>
-				</linearGradient>
-				<path fill="url(#SVGID_1_)" d="M224,44c0,3.85-3.15,7-7,7h-72c-3.85,0-7-3.15-7-7l0,0c0-3.85,3.15-7,7-7h72
-					C220.85,37,224,40.15,224,44L224,44z"/>
-			</g>
-			<g>
-				<path fill="#1E1B18" d="M222,44c0,2.75-2.25,5-5,5h-72c-2.75,0-5-2.25-5-5l0,0c0-2.75,2.25-5,5-5h72C219.75,39,222,41.25,222,44
-					L222,44z"/>
-			</g>
-		</g>
-		<g>
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="304" y1="53" x2="304" y2="35">
-				<stop  offset="0" style="stop-color:#35322F"/>
-				<stop  offset="1" style="stop-color:#000000"/>
-			</linearGradient>
-			<path fill="url(#SVGID_2_)" d="M313,44c0,4.967-4.028,9-9,9c-4.97,0-9-4.033-9-9c0-4.965,4.031-9,9-9
-				C308.972,35,313,39.033,313,44z"/>
-			<path d="M311,43.998c0,3.869-3.135,7.002-7.001,7.002c-3.87,0-6.999-3.133-6.999-7.002c0-3.865,3.129-6.998,6.999-6.998
-				C307.865,37,311,40.133,311,43.998z"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<path fill="#AEADAC" d="M307.656,607.176c-0.875,0.874-0.875,2.306,0,3.182l0,0c0.875,0.874,2.307,0.874,3.182,0l6.997-6.996
-				c0.874-0.875,0.874-2.308,0-3.182l0,0c-0.875-0.877-2.308-0.877-3.183,0L307.656,607.176z"/>
-		</g>
-		<path fill="#AEADAC" d="M322,586.986c-4.97,0-9,4.03-9,9.001c0,4.97,4.03,9,9,9c4.971,0,9-4.03,9-9
-			C331,591.017,326.971,586.986,322,586.986z M322,600.987c-2.76,0-5-2.241-5-5c0-2.761,2.24-5.001,5-5.001s5,2.24,5,5.001
-			C327,598.746,324.76,600.987,322,600.987z"/>
-	</g>
-	<g>
-		<g>
-			<path fill="#AEADAC" d="M42.732,610.965c-0.64,0-1.279-0.244-1.768-0.732l-11.5-11.502l10.959-10.959
-				c0.977-0.977,2.559-0.977,3.535,0s0.977,2.559,0,3.535l-7.424,7.424l7.965,7.967c0.977,0.977,0.977,2.56,0,3.535
-				C44.012,610.721,43.372,610.965,42.732,610.965z"/>
-		</g>
-		<g>
-			<path fill="#AEADAC" d="M56.633,601.227H35.824c-1.381,0-2.5-1.119-2.5-2.5s1.119-2.5,2.5-2.5h20.809c1.381,0,2.5,1.119,2.5,2.5
-				S58.014,601.227,56.633,601.227z"/>
-		</g>
-	</g>
-	<path fill="#AEADAC" d="M196,597.995L181,586l-15,11.995h4.395v11.402h21.176v-11.402H196z M174.807,605.87v-8.742l6.193-4.952
-		l6.16,4.926v8.769H174.807z"/>
-	<path opacity="0.1" fill="#FFFFFF" d="M261.088,8H27.971C16.986,8,8,16.987,8,27.971v534.646L261.088,8z"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/phone3.svg b/QtDemo/qml/QtDemo/images/phone3.svg
deleted file mode 100644
index 65c91c2..0000000
--- a/QtDemo/qml/QtDemo/images/phone3.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="366px" height="721px" viewBox="0 0 366 721" enable-background="new 0 0 366 721" xml:space="preserve">
-<g>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="183.0005" y1="692" x2="183.0005" y2="1.0005">
-		<stop  offset="0" style="stop-color:#1E1B18"/>
-		<stop  offset="1" style="stop-color:#35322F"/>
-	</linearGradient>
-	<path fill="url(#SVGID_1_)" d="M330,1H36C16.701,1,1,16.701,1,36v621c0,19.299,15.701,35,35,35h294c19.299,0,35-15.701,35-35V36
-		C365,16.701,349.299,1,330,1z M343,586H23V106h320V586z"/>
-	<path d="M330,2c18.747,0,34,15.252,34,34v621c0,18.748-15.253,34-34,34H36c-18.747,0-34-15.252-34-34V36C2,17.252,17.253,2,36,2
-		H330 M330,0H36C16.2,0,0,16.2,0,36v621c0,19.8,16.2,36,36,36h294c19.8,0,36-16.2,36-36V36C366,16.2,349.8,0,330,0L330,0z"/>
-	<path opacity="0.2" fill="#35322F" d="M366,695.006C366,709.361,284.058,721,183.004,721C81.933,721,0,709.361,0,695.006
-		C0,680.643,81.933,669,183.004,669C284.058,669,366,680.643,366,695.006z"/>
-	<path d="M328,6H38C20.399,6,6,20.4,6,38v617c0,17.6,14.399,32,32,32h290c17.601,0,32-14.4,32-32V38C360,20.4,345.601,6,328,6z
-		 M343,586H23V106h320V586z"/>
-	<g>
-		<g>
-			<g>
-				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="185" y1="62" x2="185" y2="48">
-					<stop  offset="0" style="stop-color:#35322F"/>
-					<stop  offset="1" style="stop-color:#000000"/>
-				</linearGradient>
-				<path fill="url(#SVGID_2_)" d="M228,55c0,3.85-3.15,7-7,7h-72c-3.85,0-7-3.15-7-7l0,0c0-3.85,3.15-7,7-7h72
-					C224.85,48,228,51.15,228,55L228,55z"/>
-			</g>
-			<g>
-				<path fill="#1E1B18" d="M226,55c0,2.75-2.25,5-5,5h-72c-2.75,0-5-2.25-5-5l0,0c0-2.75,2.25-5,5-5h72C223.75,50,226,52.25,226,55
-					L226,55z"/>
-			</g>
-		</g>
-		<g>
-			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="308" y1="64" x2="308" y2="46">
-				<stop  offset="0" style="stop-color:#35322F"/>
-				<stop  offset="1" style="stop-color:#000000"/>
-			</linearGradient>
-			<path fill="url(#SVGID_3_)" d="M317,55c0,4.967-4.028,9-9,9c-4.97,0-9-4.033-9-9c0-4.965,4.031-9,9-9
-				C312.972,46,317,50.033,317,55z"/>
-			<path d="M315,54.998c0,3.869-3.135,7.002-7.001,7.002c-3.87,0-6.999-3.133-6.999-7.002c0-3.865,3.129-6.998,6.999-6.998
-				C311.865,48,315,51.133,315,54.998z"/>
-		</g>
-	</g>
-	<path opacity="0.1" fill="#FFFFFF" d="M276.644,6H38C20.4,6,6,20.4,6,38v565.181L276.644,6z"/>
-	<g>
-		<path d="M171,666c-8.271,0-15-6.729-15-15v-24c0-8.271,6.729-15,15-15h24c8.271,0,15,6.729,15,15v24c0,8.271-6.729,15-15,15H171z"
-			/>
-		<path fill="#35322F" d="M195,613c7.72,0,14,6.28,14,14v24c0,7.72-6.28,14-14,14h-24c-7.72,0-14-6.28-14-14v-24
-			c0-7.72,6.28-14,14-14H195 M195,611h-24c-8.8,0-16,7.2-16,16v24c0,8.8,7.2,16,16,16h24c8.8,0,16-7.2,16-16v-24
-			C211,618.2,203.8,611,195,611L195,611z"/>
-	</g>
-	<path fill="#1E1B18" d="M343,106v480H23V106H343 M345,104h-2H23h-2v2v480v2h2h320h2v-2V106V104L345,104z"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/stones.png b/QtDemo/qml/QtDemo/images/stones.png
new file mode 100644
index 0000000..61e500b
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/stones.png
diff --git a/QtDemo/qml/QtDemo/images/stones.svg b/QtDemo/qml/QtDemo/images/stones.svg
deleted file mode 100644
index 1d527c3..0000000
--- a/QtDemo/qml/QtDemo/images/stones.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="88px" height="61px" viewBox="-0.5 0 88 61" enable-background="new -0.5 0 88 61" xml:space="preserve">
-<rect x="-0.5" fill="none" width="88" height="61"/>
-<g>
-	<path opacity="0.2" fill="#35322F" d="M66.86,43.84c0.278-0.52,0.431-1.055,0.431-1.603c0-4.758-11.003-8.614-24.574-8.614
-		c-13.569,0-24.573,3.856-24.573,8.614c0,2.202,2.359,4.21,6.236,5.732c-8.387,0.432-14.833,2.956-14.833,6.017
-		c0,3.363,7.777,6.088,17.368,6.088c6.549,0,12.248-1.271,15.207-3.148c4.351,2.42,12.039,4.03,20.804,4.03
-		c13.571,0,24.574-3.855,24.574-8.614C87.5,48.054,78.561,44.5,66.86,43.84z"/>
-	<g>
-		<ellipse fill="#AEADAC" cx="33.767" cy="19.205" rx="24.44" ry="19.207"/>
-		<path fill="#868482" d="M34.534,0.016C40.33,1.723,48.16,5.788,48.16,15.256c0,15.356-10.756,21.021-16.387,23.087
-			c0.658,0.042,1.321,0.069,1.993,0.069c13.498,0,24.44-8.599,24.44-19.207C58.207,8.802,47.676,0.334,34.534,0.016z"/>
-	</g>
-	<g>
-		<path fill="#D7D6D5" d="M77.593,37.76c0,8.125-10.942,14.712-24.439,14.712s-24.44-6.587-24.44-14.712
-			c0-8.122,10.943-14.709,24.44-14.709S77.593,29.638,77.593,37.76z"/>
-		<path fill="#AEADAC" d="M55.212,52.416c12.533-0.63,22.381-6.949,22.381-14.656c0-8.122-10.942-14.709-24.439-14.709
-			c-0.11,0-0.22,0.004-0.329,0.005c6.889,1.293,19.063,4.604,19.063,13.066C71.888,46.571,62.195,50.775,55.212,52.416z"/>
-	</g>
-	<g>
-		<ellipse fill="#D7D6D5" cx="16.841" cy="43.685" rx="17.341" ry="10.438"/>
-		<path fill="#AEADAC" d="M17.425,33.265c4.108,0.933,9.629,3.144,9.629,8.273c0,8.335-7.611,11.415-11.61,12.541
-			c0.462,0.022,0.926,0.043,1.398,0.043c9.576,0,17.341-4.673,17.341-10.438C34.183,38.038,26.729,33.451,17.425,33.265z"/>
-	</g>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/tablet1.svg b/QtDemo/qml/QtDemo/images/tablet1.svg
deleted file mode 100644
index a55c13a..0000000
--- a/QtDemo/qml/QtDemo/images/tablet1.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="758px" height="565px" viewBox="0 0 758 565" enable-background="new 0 0 758 565" xml:space="preserve">
-<g>
-	<path opacity="0.2" fill="#35322F" d="M758,512.012C758,541.274,588.294,565,379.008,565C169.686,565,0,541.274,0,512.012
-		C0,482.733,169.686,459,379.008,459C588.294,459,758,482.733,758,512.012z"/>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="379.0005" y1="517" x2="379.0005" y2="1.0005">
-		<stop  offset="0" style="stop-color:#5D5B59"/>
-		<stop  offset="1" style="stop-color:#AEADAC"/>
-	</linearGradient>
-	<path fill="url(#SVGID_1_)" d="M720,1H38C17.598,1,1,17.598,1,38v442c0,20.402,16.598,37,37,37h682c20.402,0,37-16.598,37-37V38
-		C757,17.598,740.402,1,720,1z M699,459H59V59h640V459z"/>
-	<path d="M720,2c19.851,0,36,16.149,36,36v442c0,19.851-16.149,36-36,36H38c-19.851,0-36-16.149-36-36V38C2,18.149,18.149,2,38,2
-		H720 M720,0H38C17.1,0,0,17.1,0,38v442c0,20.9,17.1,38,38,38h682c20.9,0,38-17.1,38-38V38C758,17.1,740.9,0,720,0L720,0z"/>
-	<path d="M719,7H39C21.4,7,7,21.4,7,39v440c0,17.6,14.4,32,32,32h680c17.6,0,32-14.4,32-32V39C751,21.4,736.6,7,719,7z M699,459H59
-		V59h640V459z"/>
-	<g>
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="379.0005" y1="39" x2="379.0005" y2="27">
-			<stop  offset="0" style="stop-color:#35322F"/>
-			<stop  offset="1" style="stop-color:#000000"/>
-		</linearGradient>
-		<path fill="url(#SVGID_2_)" d="M385,33c0,3.311-2.687,6-6,6c-3.312,0-6-2.689-6-6s2.688-6,6-6C382.313,27,385,29.689,385,33z"/>
-		<path d="M383.668,32.998c0,2.58-2.092,4.67-4.669,4.67c-2.581,0-4.667-2.09-4.667-4.67c0-2.576,2.086-4.666,4.667-4.666
-			C381.576,28.332,383.668,30.422,383.668,32.998z"/>
-	</g>
-	<path opacity="0.1" fill="#FFFFFF" d="M39,7C21.4,7,7,21.4,7,39v440c0,13.032,7.9,24.303,19.145,29.279L255.71,7H39z"/>
-	<path fill="#1E1B18" d="M699,59v400H59V59H699 M701,57h-2H59h-2v2v400v2h2h640h2v-2V59V57L701,57z"/>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/tree1.png b/QtDemo/qml/QtDemo/images/tree1.png
new file mode 100644
index 0000000..7a24e41
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/tree1.png
diff --git a/QtDemo/qml/QtDemo/images/tree1.svg b/QtDemo/qml/QtDemo/images/tree1.svg
deleted file mode 100644
index 51bed3f..0000000
--- a/QtDemo/qml/QtDemo/images/tree1.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="55px" height="115px" viewBox="0 0 55 115" enable-background="new 0 0 55 115" xml:space="preserve">
-<g>
-	<ellipse opacity="0.2" fill="#35322F" cx="34.64" cy="107.938" rx="20.145" ry="7.062"/>
-	<rect x="20.122" y="70.044" fill="#42210B" width="8.66" height="37.441"/>
-	<path fill="#517A0A" d="M48.902,55.016c0,13.504-10.945,24.452-24.451,24.452C10.947,79.468,0,68.521,0,55.016S10.947,0,24.452,0
-		C37.957,0,48.902,41.512,48.902,55.016z"/>
-	<path fill="#779E3F" d="M24.452,79.468C10.947,79.468,0,68.521,0,55.016S10.947,0,24.452,0
-		C24.452,21.65,24.452,59.091,24.452,79.468z"/>
-</g>
-<rect fill="none" width="55" height="115"/>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/tree2.png b/QtDemo/qml/QtDemo/images/tree2.png
new file mode 100644
index 0000000..cdfd87d
--- /dev/null
+++ b/QtDemo/qml/QtDemo/images/tree2.png
diff --git a/QtDemo/qml/QtDemo/images/tree2.svg b/QtDemo/qml/QtDemo/images/tree2.svg
deleted file mode 100644
index fbaa2c8..0000000
--- a/QtDemo/qml/QtDemo/images/tree2.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="55px" height="84px" viewBox="0 0 55 84" enable-background="new 0 0 55 84" xml:space="preserve">
-<g>
-	<ellipse opacity="0.2" fill="#35322F" cx="34.646" cy="76.938" rx="20.148" ry="7.062"/>
-	<rect x="20.126" y="39.487" fill="#42210B" width="8.661" height="37.449"/>
-	<circle fill="#517A0A" cx="24.457" cy="24.457" r="24.457"/>
-	<path fill="#779E3F" d="M24.457,48.913C10.95,48.913,0,37.964,0,24.457C0,10.95,10.95,0,24.457,0
-		C24.457,21.654,24.457,28.533,24.457,48.913z"/>
-</g>
-<rect fill="none" width="55" height="84"/>
-</svg>
diff --git a/QtDemo/qml/QtDemo/images/tv.svg b/QtDemo/qml/QtDemo/images/tv.svg
deleted file mode 100644
index ded1e0e..0000000
--- a/QtDemo/qml/QtDemo/images/tv.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="708px" height="565px" viewBox="0 0 708 565" enable-background="new 0 0 708 565" xml:space="preserve">
-<g>
-	<path opacity="0.2" fill="#35322F" d="M708,535.009C708,551.569,549.488,565,354.008,565C158.492,565,0,551.569,0,535.009
-		C0,518.437,158.492,505,354.008,505C549.488,505,708,518.437,708,535.009z"/>
-	<g>
-		<path fill="#35322F" d="M550,533.005c0,9.169-87.764,16.605-195.996,16.605C245.753,549.61,158,542.174,158,533.005
-			c0-9.176,87.753-20.615,196.004-20.615C462.236,512.39,550,523.829,550,533.005z"/>
-		<rect x="158" y="528.921" fill="#35322F" width="2.488" height="4.162"/>
-		<rect x="548" y="528.921" fill="#35322F" width="2" height="4.162"/>
-		<path d="M550,529.005c0,9.169-87.764,16.605-195.996,16.605C245.753,545.61,158,538.174,158,529.005
-			c0-9.176,87.753-20.615,196.004-20.615C462.236,508.39,550,519.829,550,529.005z"/>
-		<rect x="321" y="485" fill="#1E1B18" width="64" height="41"/>
-	</g>
-	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="354.0005" y1="487" x2="354.0005" y2="1.0005">
-		<stop  offset="0" style="stop-color:#5D5B59"/>
-		<stop  offset="1" style="stop-color:#868482"/>
-	</linearGradient>
-	<path fill="url(#SVGID_1_)" d="M702,1H6C3.243,1,1,3.243,1,6v476c0,2.757,2.243,5,5,5h696c2.757,0,5-2.243,5-5V6
-		C707,3.243,704.757,1,702,1z M674,434H34V34h640V434z"/>
-	<path d="M702,2c2.205,0,4,1.795,4,4v476c0,2.205-1.795,4-4,4H6c-2.205,0-4-1.795-4-4V6c0-2.205,1.795-4,4-4H702 M702,0H6
-		C2.7,0,0,2.7,0,6v476c0,3.3,2.7,6,6,6h696c3.3,0,6-2.7,6-6V6C708,2.7,705.3,0,702,0L702,0z"/>
-	<path d="M702,4H6C4.9,4,4,4.9,4,6v476c0,1.1,0.9,2,2,2h696c1.1,0,2-0.9,2-2V6C704,4.9,703.1,4,702,4z M674,434H34V34h640V434z"/>
-	<path fill="#1E1B18" d="M674,34v400H34V34H674 M675,33h-1H34h-1v1v400v1h1h640h1v-1V34V33L675,33z"/>
-	<g>
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="354.0005" y1="459" x2="354.0005" y2="451">
-			<stop  offset="0" style="stop-color:#5D5B59"/>
-			<stop  offset="1" style="stop-color:#1E1B18"/>
-		</linearGradient>
-		<circle fill="url(#SVGID_2_)" cx="354" cy="455" r="4"/>
-		<path fill="#1E1B18" d="M357,454.998c0,1.658-1.346,3.002-3.001,3.002c-1.659,0-2.999-1.344-2.999-3.002
-			c0-1.654,1.34-2.998,2.999-2.998C355.654,452,357,453.344,357,454.998z"/>
-	</g>
-	<path opacity="0.1" fill="#FFFFFF" d="M6,4C4.9,4,4,4.9,4,6v476c0,1.1,0.9,2,2,2h60.761L288.538,4H6z"/>
-	<g>
-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="354.0005" y1="465" x2="354.0005" y2="461">
-			<stop  offset="0" style="stop-color:#5D5B59"/>
-			<stop  offset="1" style="stop-color:#000000"/>
-		</linearGradient>
-		<circle fill="url(#SVGID_3_)" cx="354" cy="463" r="2"/>
-		<circle fill="#14AAFF" cx="354" cy="462.999" r="1"/>
-	</g>
-</g>
-</svg>
diff --git a/QtDemo/qml/QtDemo/main.qml b/QtDemo/qml/QtDemo/main.qml
index 7117bac..4cba6df 100644
--- a/QtDemo/qml/QtDemo/main.qml
+++ b/QtDemo/qml/QtDemo/main.qml
@@ -58,12 +58,12 @@ Rectangle{
         GradientStop { position: 1.0; color: "#f3fbff" }
     }
 
-    Cloud { id: cloud1; sourceImage: "images/cloud1.svg"}
-    Cloud { id: cloud2; sourceImage: "images/cloud1.svg"}
-    Cloud { id: cloud3; sourceImage: "images/cloud1.svg"}
-    Cloud { id: cloud4; sourceImage: "images/cloud2.svg"}
-    Cloud { id: cloud5; sourceImage: "images/cloud2.svg"}
-    Cloud { id: cloud6; sourceImage: "images/cloud2.svg"}
+    Cloud { id: cloud1; sourceImage: "images/cloud1.png"}
+    Cloud { id: cloud2; sourceImage: "images/cloud1.png"}
+    Cloud { id: cloud3; sourceImage: "images/cloud1.png"}
+    Cloud { id: cloud4; sourceImage: "images/cloud2.png"}
+    Cloud { id: cloud5; sourceImage: "images/cloud2.png"}
+    Cloud { id: cloud6; sourceImage: "images/cloud2.png"}
 
     Item{
         id: pinchProxy
@@ -127,8 +127,6 @@ Rectangle{
             if (!running) {
                 if (navigationState === 1)
                     Engine.loadCurrentDemo();
-                else
-                    Engine.releaseDemos();
             }
         }
     }
author	Lasse Räihä <lasse.raiha@digia.com>	2013-05-27 15:26:06 +0300
committer	Kimmo Ollila <kimmo.ollila@digia.com>	2013-05-27 15:29:13 +0300
commit	ab54713923cfb3bcddca8deb146def8e62979492 (patch)
tree	5aa936d2fec9acf64c577ada461a398ef53ad19c
parent	54ba10ff1b8c89c3790e3ab5089bec9b24fb05e0 (diff)