summaryrefslogtreecommitdiffstats
path: root/demos/declarative/contacts
diff options
context:
space:
mode:
Diffstat (limited to 'demos/declarative/contacts')
-rw-r--r--demos/declarative/contacts/Button.qml4
-rw-r--r--demos/declarative/contacts/ContactField.qml2
-rw-r--r--demos/declarative/contacts/FieldText.qml5
-rw-r--r--demos/declarative/contacts/RemoveButton.qml4
-rw-r--r--demos/declarative/contacts/contacts.qml8
5 files changed, 13 insertions, 10 deletions
diff --git a/demos/declarative/contacts/Button.qml b/demos/declarative/contacts/Button.qml
index 5623b26..09af769 100644
--- a/demos/declarative/contacts/Button.qml
+++ b/demos/declarative/contacts/Button.qml
@@ -35,6 +35,7 @@ Item {
fromState: "*"
toState: "pressed"
ColorAnimation {
+ property: "color"
duration: 200
}
},
@@ -42,13 +43,14 @@ Item {
fromState: "pressed"
toState: "*"
ColorAnimation {
+ property: "color"
duration: 1000
}
}
]
}
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
diff --git a/demos/declarative/contacts/ContactField.qml b/demos/declarative/contacts/ContactField.qml
index 60a4cc5..765dcbd 100644
--- a/demos/declarative/contacts/ContactField.qml
+++ b/demos/declarative/contacts/ContactField.qml
@@ -49,7 +49,7 @@ Item {
fromState: ""
toState: "*"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "width,rightMargin"
duration: 200
}
diff --git a/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml
index ae84d44..561e3c3 100644
--- a/demos/declarative/contacts/FieldText.qml
+++ b/demos/declarative/contacts/FieldText.qml
@@ -74,7 +74,7 @@ Rect {
text: fieldText.label
opacity: textEdit.text == '' ? 1 : 0
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
@@ -139,11 +139,12 @@ Rect {
fromState: ""
toState: "*"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,leftMargin,rightMargin"
duration: 200
}
ColorAnimation {
+ property: "color"
duration: 150
}
}
diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml
index c1cc816..549c97a 100644
--- a/demos/declarative/contacts/RemoveButton.qml
+++ b/demos/declarative/contacts/RemoveButton.qml
@@ -77,7 +77,7 @@ Rect {
opacity: 0
}
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
@@ -112,7 +112,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml
index fd49041..e773221 100644
--- a/demos/declarative/contacts/contacts.qml
+++ b/demos/declarative/contacts/contacts.qml
@@ -117,7 +117,7 @@ Rect {
]
transitions: [
Transition {
- NumericAnimation {
+ NumberAnimation {
duration: 500
properties: "yPosition,height,opacity"
}
@@ -215,7 +215,7 @@ Rect {
color: 'white'
opacity: contacts.mode == 'list' ? 1 : 0
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
@@ -281,7 +281,7 @@ Rect {
Transition {
fromState: "*"
toState: "*"
- NumericAnimation {
+ NumberAnimation {
property: "bottomMargin"
duration: 250
}
@@ -310,7 +310,7 @@ Rect {
Transition {
fromState: "*"
toState: "*"
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 500
}