diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-01 04:41:06 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-01 04:41:06 (GMT) |
commit | d40df4790d6c8f6b6572c46c91ec058c86b44942 (patch) | |
tree | c430b0639ae6642d341258160c9d90f057c6bd9c /examples | |
parent | e93e5076e11a7a9cfdd4b9cb1a2d4dbf1f579177 (diff) | |
download | Qt-d40df4790d6c8f6b6572c46c91ec058c86b44942.zip Qt-d40df4790d6c8f6b6572c46c91ec058c86b44942.tar.gz Qt-d40df4790d6c8f6b6572c46c91ec058c86b44942.tar.bz2 |
Doc work.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/declarative/slideswitch/Switch.qml | 1 | ||||
-rw-r--r-- | examples/declarative/tutorials/helloworld/t1/tutorial1.qml (renamed from examples/declarative/tutorials/t1/tutorial1.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/helloworld/t2/Cell.qml (renamed from examples/declarative/tutorials/t3/Cell.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/helloworld/t2/tutorial2.qml | 27 | ||||
-rw-r--r-- | examples/declarative/tutorials/helloworld/t3/Cell.qml (renamed from examples/declarative/tutorials/t2/Cell.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/helloworld/t3/tutorial3.qml (renamed from examples/declarative/tutorials/t3/tutorial3.qml) | 39 | ||||
-rw-r--r-- | examples/declarative/tutorials/t2/tutorial2.qml | 41 |
7 files changed, 37 insertions, 71 deletions
diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml index 5862646..3ae7a0f 100644 --- a/examples/declarative/slideswitch/Switch.qml +++ b/examples/declarative/slideswitch/Switch.qml @@ -14,7 +14,6 @@ Item { Switch.state = "On"; } function dorelease() { - print(Knob.x); if(Knob.x == 1) { if(Switch.state == "Off") return; diff --git a/examples/declarative/tutorials/t1/tutorial1.qml b/examples/declarative/tutorials/helloworld/t1/tutorial1.qml index ec29f4f..ec29f4f 100644 --- a/examples/declarative/tutorials/t1/tutorial1.qml +++ b/examples/declarative/tutorials/helloworld/t1/tutorial1.qml diff --git a/examples/declarative/tutorials/t3/Cell.qml b/examples/declarative/tutorials/helloworld/t2/Cell.qml index bd5bbe7..bd5bbe7 100644 --- a/examples/declarative/tutorials/t3/Cell.qml +++ b/examples/declarative/tutorials/helloworld/t2/Cell.qml diff --git a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml new file mode 100644 index 0000000..4630435 --- /dev/null +++ b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml @@ -0,0 +1,27 @@ +Rect { + id: Page + width: 480 + height: 200 + color: "white" + Text { + id: HelloText + text: "Hello world!" + font.size: 24 + font.bold: true + y: 30 + anchors.horizontalCenter: Page.horizontalCenter + } + GridLayout { + id: ColorPicker + x: 0 + anchors.bottom: Page.bottom + width: 120; height: 50 + rows: 2; columns: 3 + Cell { color: "#ff0000" } + Cell { color: "#00ff00" } + Cell { color: "#0000ff" } + Cell { color: "#ffff00" } + Cell { color: "#00ffff" } + Cell { color: "#ff00ff" } + } +} diff --git a/examples/declarative/tutorials/t2/Cell.qml b/examples/declarative/tutorials/helloworld/t3/Cell.qml index bd5bbe7..bd5bbe7 100644 --- a/examples/declarative/tutorials/t2/Cell.qml +++ b/examples/declarative/tutorials/helloworld/t3/Cell.qml diff --git a/examples/declarative/tutorials/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml index 8e2b697..3ca7a2f 100644 --- a/examples/declarative/tutorials/t3/tutorial3.qml +++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml @@ -37,42 +37,23 @@ Rect { duration: 500 easing: "easeOutBounce" } - ColorAnimation { - duration: 500 - } + ColorAnimation { duration: 500 } } } ] } - MouseRegion { - id: MouseRegion - anchors.fill: HelloText - } + MouseRegion { id: MouseRegion; anchors.fill: HelloText } GridLayout { id: ColorPicker x: 0 anchors.bottom: Page.bottom - width: 120 - height: 50 - columns: 3 - rows: 2 - Cell { - color: "#ff0000" - } - Cell { - color: "#00ff00" - } - Cell { - color: "#0000ff" - } - Cell { - color: "#ffff00" - } - Cell { - color: "#00ffff" - } - Cell { - color: "#ff00ff" - } + width: 120; height: 50 + rows: 2; columns: 3 + Cell { color: "#ff0000" } + Cell { color: "#00ff00" } + Cell { color: "#0000ff" } + Cell { color: "#ffff00" } + Cell { color: "#00ffff" } + Cell { color: "#ff00ff" } } } diff --git a/examples/declarative/tutorials/t2/tutorial2.qml b/examples/declarative/tutorials/t2/tutorial2.qml deleted file mode 100644 index 08ea9eb..0000000 --- a/examples/declarative/tutorials/t2/tutorial2.qml +++ /dev/null @@ -1,41 +0,0 @@ -Rect { - id: Page - width: 480 - height: 200 - color: "white" - Text { - id: HelloText - text: "Hello world!" - font.size: 24 - font.bold: true - y: 30 - anchors.horizontalCenter: Page.horizontalCenter - } - GridLayout { - id: ColorPicker - x: 0 - anchors.bottom: Page.bottom - width: 120 - height: 50 - columns: 3 - rows: 2 - Cell { - color: "#ff0000" - } - Cell { - color: "#00ff00" - } - Cell { - color: "#0000ff" - } - Cell { - color: "#ffff00" - } - Cell { - color: "#00ffff" - } - Cell { - color: "#ff00ff" - } - } -} |