From a4f00b20910a345cb0d6feb4916faac65957c9e1 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 28 Jul 2009 13:44:39 +1000 Subject: Missed a few files in the new samegame Button and Dialog qml files were missed in the first commit --- demos/declarative/samegame/content/Button.qml | 18 ++++++++++++++++++ demos/declarative/samegame/content/Dialog.qml | 15 +++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 demos/declarative/samegame/content/Button.qml create mode 100644 demos/declarative/samegame/content/Dialog.qml diff --git a/demos/declarative/samegame/content/Button.qml b/demos/declarative/samegame/content/Button.qml new file mode 100644 index 0000000..2f38a52 --- /dev/null +++ b/demos/declarative/samegame/content/Button.qml @@ -0,0 +1,18 @@ +import Qt 4.6 + +Rect { + id: page; color: activePalette.button; width: txtItem.width+20; height: txtItem.height+4 + pen.width: 1; pen.color: activePalette.mid; radius: 10; + signal clicked + property string text: "Button" + gradient: Gradient { + GradientStop { id:topGrad; position: 0.0; + color: if(mr.pressed){activePalette.dark;}else{activePalette.light;}} + GradientStop { position: 1.0; color: activePalette.button } + } + MouseRegion { id:mr; anchors.fill: parent; onClicked: page.clicked() } + Text { + id: txtItem; text: page.text; anchors.centeredIn: page; color: activePalette.buttonText + font.size: 14; + } +} diff --git a/demos/declarative/samegame/content/Dialog.qml b/demos/declarative/samegame/content/Dialog.qml new file mode 100644 index 0000000..6d12b48 --- /dev/null +++ b/demos/declarative/samegame/content/Dialog.qml @@ -0,0 +1,15 @@ +import Qt 4.6 + +Rect { + id: page + color: "white"; pen.width: 1; width: 200; height: 60; + property string text: "Hello World!" + opacity: 0 + opacity: Behavior { + SequentialAnimation { + NumberAnimation {property: "opacity"; from: 0; duration: 1500 } + NumberAnimation {property: "opacity"; to: 0; duration: 1500 } + } + } + Text { anchors.centeredIn: parent; text: parent.text } +} -- cgit v0.12 From 440ca53b303a1adb3b8f3f14dd469db552c69166 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Tue, 28 Jul 2009 14:32:20 +1000 Subject: qguard_p.h is in private directory. --- src/corelib/kernel/qobject_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 850082b..5a05f49 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -60,7 +60,7 @@ #include "QtCore/qvector.h" #include "QtCore/qreadwritelock.h" #include "QtCore/qvariant.h" -#include "qguard_p.h" +#include "private/qguard_p.h" QT_BEGIN_NAMESPACE -- cgit v0.12