Doc: Started work to tidy up existing QML docs.

Reviewed-by: Trust Me

17 files changed, 397 insertions, 0 deletions

diff --git a/doc/src/snippets/declarative/qml-intro/anchors1.qml b/doc/src/snippets/declarative/qml-intro/anchors1.qml
new file mode 100644
index 0000000..320d0e7
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/anchors1.qml
@@ -0,0 +1,14 @@
+import Qt 4.7
+
+Rectangle {
+    id: myWin
+    width: 500
+    height: 400
+
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        width: 150; height: 150
+        anchors.bottom: myWin.bottom
+    }
+}
diff --git a/doc/src/snippets/declarative/qml-intro/anchors2.qml b/doc/src/snippets/declarative/qml-intro/anchors2.qml
new file mode 100644
index 0000000..bb9ed75
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/anchors2.qml
@@ -0,0 +1,16 @@
+import Qt 4.7
+
+Rectangle {
+    id: myWin
+    width: 500
+    height: 400
+
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        width: 150; height: 150
+        anchors.bottom: myWin.bottom
+        anchors.horizontalCenter: myWin.horizontalCenter
+        anchors.bottomMargin: 10
+    }
+}
diff --git a/doc/src/snippets/declarative/qml-intro/anchors3.qml b/doc/src/snippets/declarative/qml-intro/anchors3.qml
new file mode 100644
index 0000000..99d2ceb
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/anchors3.qml
@@ -0,0 +1,25 @@
+import Qt 4.7
+
+Rectangle {
+    id: myWin
+    width: 500
+    height: 400
+
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        width: 150; height: 150
+        anchors.bottom: myWin.bottom
+        anchors.horizontalCenter: myWin.horizontalCenter
+        anchors.bottomMargin: 10
+    }
+
+//! [adding some text]
+    Text {
+        text: "<h2>The Qt Logo</h2>"
+        anchors.bottom: image1.top
+        anchors.horizontalCenter: myWin.horizontalCenter
+        anchors.bottomMargin: 15
+    }
+//! [adding some text]
+}
diff --git a/doc/src/snippets/declarative/qml-intro/basic-syntax.qml b/doc/src/snippets/declarative/qml-intro/basic-syntax.qml
new file mode 100644
index 0000000..b241500
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/basic-syntax.qml
@@ -0,0 +1,8 @@
+// Note: this file is not intended to be run.
+
+//! [basic syntax]
+SomeElement {
+    id: myObject
+    ... some other things here ...
+}
+//! [basic syntax]
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world1.qml b/doc/src/snippets/declarative/qml-intro/hello-world1.qml
new file mode 100644
index 0000000..244175c
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/hello-world1.qml
@@ -0,0 +1,11 @@
+import Qt 4.7
+
+Rectangle {
+    id: myRectangle
+    width: 500
+    height: 400
+
+    Text { text: "Hello World!" }
+
+    color: "lightgray"
+}
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world2.qml b/doc/src/snippets/declarative/qml-intro/hello-world2.qml
new file mode 100644
index 0000000..73b2f8c
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/hello-world2.qml
@@ -0,0 +1,16 @@
+import Qt 4.7
+
+Rectangle {
+    id: myRectangle
+    width: 500
+    height: 400
+
+//! [updated text]
+    Text {
+        text: "<h2>Hello World</h2>"; color: "darkgreen"
+        x: 100; y:100
+    }
+//! [updated text]
+
+    color: "lightgray"
+}
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world3.qml b/doc/src/snippets/declarative/qml-intro/hello-world3.qml
new file mode 100644
index 0000000..112f775
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/hello-world3.qml
@@ -0,0 +1,17 @@
+import Qt 4.7
+
+Rectangle {
+    id: myRectangle
+    width: 500
+    height: 400
+
+//! [updated text]
+    Text {
+        text: "<h1>Hello world again</h1>"
+        color: "#002288"
+        x: 100; y: 100
+    }
+//! [updated text]
+
+    color: "lightgray"
+}
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world4.qml b/doc/src/snippets/declarative/qml-intro/hello-world4.qml
new file mode 100644
index 0000000..c97334e
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/hello-world4.qml
@@ -0,0 +1,21 @@
+import Qt 4.7
+
+Rectangle {
+    id: myRectangle
+    width: 500
+    height: 400
+
+    Text {
+        text: "<h1>Hello world again</h1>"
+        color: "#002288"
+        x: 100; y: 100
+    }
+
+//! [added an image]
+    Image {
+        source: "images/qt-logo.png"
+    }
+//! [added an image]
+
+    color: "lightgray"
+}
diff --git a/doc/src/snippets/declarative/qml-intro/hello-world5.qml b/doc/src/snippets/declarative/qml-intro/hello-world5.qml
new file mode 100644
index 0000000..74a612a
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/hello-world5.qml
@@ -0,0 +1,23 @@
+import Qt 4.7
+
+Rectangle {
+    id: myRectangle
+    width: 500
+    height: 400
+
+    Text {
+        text: "<h1>Hello world again</h1>"
+        color: "#002288"
+        x: 100; y: 100
+    }
+
+//! [positioning the image]
+    Image {
+        source: "images/qt-logo.png"
+        x: 100; y: 150
+        width: 150; height: 150
+    }
+//! [positioning the image]
+
+    color: "lightgray"
+}
diff --git a/doc/src/snippets/declarative/qml-intro/number-animation1.qml b/doc/src/snippets/declarative/qml-intro/number-animation1.qml
new file mode 100644
index 0000000..d80a8dc
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/number-animation1.qml
@@ -0,0 +1,22 @@
+import Qt 4.7
+
+Rectangle {
+    id: mainRec
+    width:  600
+    height: 400
+
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        x: 200; y: 100
+        width: 100; height: 100
+
+        // Animate a rotation
+        transformOrigin: Item.Center
+        NumberAnimation on rotation {
+            from: 0; to: 360
+            duration: 2000
+            loops: Animation.Infinite
+        }
+    }
+}
diff --git a/doc/src/snippets/declarative/qml-intro/number-animation2.qml b/doc/src/snippets/declarative/qml-intro/number-animation2.qml
new file mode 100644
index 0000000..beb3114
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/number-animation2.qml
@@ -0,0 +1,24 @@
+import Qt 4.7
+
+Rectangle {
+    id: mainRec
+    width:  600
+    height: 400
+
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        x: 200; y: 100
+        width: 100; height: 100
+
+        // Animate a rotation
+        transform: Rotation {
+            origin.x: 50; origin.y: 50; axis {x:0; y:1; z:0} angle:0
+            NumberAnimation on angle  {
+                from: 0; to: 360;
+                duration: 3000;
+                loops: Animation.Infinite
+            }
+        }
+    }
+}
diff --git a/doc/src/snippets/declarative/qml-intro/rectangle.qml b/doc/src/snippets/declarative/qml-intro/rectangle.qml
new file mode 100644
index 0000000..7235e9b
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/rectangle.qml
@@ -0,0 +1,8 @@
+import Qt 4.7
+
+// This is a comment. And below myRectangle is defined.
+Rectangle {
+    id: myRectangle
+    width: 500
+    height: 400
+}
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml
new file mode 100644
index 0000000..125f99f
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation1.qml
@@ -0,0 +1,23 @@
+import Qt 4.7
+
+Rectangle {
+    id: mainRec
+    width:  600
+    height: 400
+    z: 0
+
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        x: 20; y: 20 ; z: 1
+        width: 100; height: 100
+    }
+
+    Image {
+        id: image2
+        source: "images/qt-logo.png"
+        width: 100; height: 100
+        x: (mainRec.width - 100)/2; y: (mainRec.height - 100)/2
+        z: 2
+    }
+}
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
new file mode 100644
index 0000000..08c598b
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation2.qml
@@ -0,0 +1,33 @@
+import Qt 4.7
+
+Rectangle {
+    id: mainRec
+    width:  600
+    height: 400
+    z: 0
+
+//! [adding a sequential animation]
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        width: 100; height: 100
+
+        SequentialAnimation on x {
+            loops: Animation.Infinite
+            NumberAnimation {
+                from: 20; to: 450; easing.type: "InOutQuad";
+                duration: 2000
+            }
+            PauseAnimation { duration: 500 }
+        }
+    }
+//! [adding a sequential animation]
+
+    Image {
+        id: image2
+        source: "images/qt-logo.png"
+        width: 100; height: 100
+        x: (mainRec.width - 100)/2; y: (mainRec.height - 100)/2
+        z: 2
+    }
+}
diff --git a/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml b/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
new file mode 100644
index 0000000..5e7b400
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/sequential-animation3.qml
@@ -0,0 +1,46 @@
+Rectangle {
+    id: mainRec
+    width:  600
+    height: 400
+    z: 0
+
+    Image {
+        id: image2
+        source: "images/qt-logo.png"
+        width: 100; height: 100
+        x: (mainRec.width - 100)/2; y: (mainRec.height - 100)/2
+        z: 2
+    }
+
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        x: 20; y: 20 ; z: 1
+        width: 100; height: 100
+
+        SequentialAnimation on x {
+            loops: Animation.Infinite
+            NumberAnimation {
+                from: 20; to: 450
+                easing.type: "InOutQuad"; duration: 2000
+            }
+            PauseAnimation { duration: 500 }
+        }
+
+        SequentialAnimation on y {
+            loops: Animation.Infinite
+            NumberAnimation {
+                from: 20; to: 250
+                easing.type: "InOutQuad"; duration: 2000
+            }
+            PauseAnimation { duration: 500 }
+        }
+
+        SequentialAnimation on scale {
+            loops: Animation.Infinite
+            NumberAnimation { from: 1; to: 0.5; duration: 1000 }
+            NumberAnimation { from: 0.5; to: 1; duration: 1000 }
+            PauseAnimation { duration: 500 }
+        }
+    }
+}
diff --git a/doc/src/snippets/declarative/qml-intro/states1.qml b/doc/src/snippets/declarative/qml-intro/states1.qml
new file mode 100644
index 0000000..fcd3f53
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/states1.qml
@@ -0,0 +1,52 @@
+import Qt 4.7
+
+Rectangle {
+    id: mainRectangle
+    width:  600
+    height: 400
+    color: "black"
+
+    Rectangle {
+        id: sky
+        width: 600
+        height: 200
+        y: 0
+        color: "lightblue"
+    }
+
+    Rectangle {
+        id: ground
+        width: 600; height: 200
+        y: 200
+        color: "green"
+    }
+
+    MouseArea {
+        id: mousearea
+        anchors.fill: mainRectangle
+    }
+
+    states: [ State {
+            name: "night"
+            when: mousearea.pressed == true
+            PropertyChanges { target: sky; color: "darkblue" }
+            PropertyChanges { target: ground; color: "black" }
+        },
+        State {
+            name: "daylight"
+            when: mousearea.pressed == false
+            PropertyChanges { target: sky; color: "lightblue" }
+            PropertyChanges { target: ground; color: "green" }
+        }
+    ]
+
+    transitions: [ Transition {
+            from: "daylight"; to: "night"
+            ColorAnimation { duration: 1000 }
+        },
+        Transition {
+            from: "night"; to: "daylight"
+            ColorAnimation { duration: 500 }
+        }
+    ]
+}
diff --git a/doc/src/snippets/declarative/qml-intro/transformations1.qml b/doc/src/snippets/declarative/qml-intro/transformations1.qml
new file mode 100644
index 0000000..1504729
--- /dev/null
+++ b/doc/src/snippets/declarative/qml-intro/transformations1.qml
@@ -0,0 +1,38 @@
+import Qt 4.7
+
+Rectangle {
+    id: myWin
+    width: 500
+    height: 400
+
+    Image {
+        id: image1
+        source: "images/qt-logo.png"
+        width: 150; height: 150
+        anchors.bottom: myWin.bottom
+        anchors.horizontalCenter: myWin.horizontalCenter
+        anchors.bottomMargin: 10
+
+        transform: Rotation {
+            origin.x: 75; origin.y: 75
+            axis{ x: 0; y: 0; z:1 }  angle: -90
+        }
+
+    }
+
+    Text {
+        text: "<h2>The Qt Logo -- taking it easy</h2>"
+        anchors.bottom: image1.top
+        anchors.horizontalCenter: myWin.horizontalCenter
+        anchors.bottomMargin: 15
+
+        transform: [
+            Scale { xScale: 1.5; yScale: 1.2 } ,
+
+            Rotation {
+                origin.x: 75; origin.y: 75
+                axis{ x: 0; y: 0; z:1 }  angle: -45
+            }
+        ]
+    }
+}