summaryrefslogtreecommitdiffstats
path: root/demos/declarative/flickr
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-26 01:16:57 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-26 02:04:36 (GMT)
commitffc9e62cbf7e24cd04a1202de1b3e618f9e12642 (patch)
treefaf828900c05b748e39158eb6a1fb59c44ba3763 /demos/declarative/flickr
parent662488175fb9c6a44e9641867177b5396c507891 (diff)
downloadQt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.zip
Qt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.tar.gz
Qt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.tar.bz2
Rename NumericAnimation -> NumberAnimation
Diffstat (limited to 'demos/declarative/flickr')
-rw-r--r--demos/declarative/flickr/content/ImageDetails.qml2
-rw-r--r--demos/declarative/flickr/content/Loading.qml2
-rw-r--r--demos/declarative/flickr/content/MediaLineEdit.qml2
-rw-r--r--demos/declarative/flickr/content/ScrollBar.qml2
-rw-r--r--demos/declarative/flickr/content/Star.qml2
-rw-r--r--demos/declarative/flickr/flickr.qml6
-rw-r--r--demos/declarative/flickr/flickr2.qml12
7 files changed, 14 insertions, 14 deletions
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index ccc91cb..a413726 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -135,7 +135,7 @@ Flipable {
transitions: [
Transition {
- NumericAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 }
+ NumberAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 }
}
]
}
diff --git a/demos/declarative/flickr/content/Loading.qml b/demos/declarative/flickr/content/Loading.qml
index 7488a66..0a8a51a 100644
--- a/demos/declarative/flickr/content/Loading.qml
+++ b/demos/declarative/flickr/content/Loading.qml
@@ -1,6 +1,6 @@
Image {
id: Loading; source: "pics/loading.png"; transformOrigin: "Center"
- rotation: NumericAnimation {
+ rotation: NumberAnimation {
id: "RotationAnimation"; from: 0; to: 360; running: Loading.visible == true; repeat: true; duration: 900
}
}
diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml
index 691bb5b..b9a5775 100644
--- a/demos/declarative/flickr/content/MediaLineEdit.qml
+++ b/demos/declarative/flickr/content/MediaLineEdit.qml
@@ -41,7 +41,7 @@ Item {
]
transitions: [
Transition {
- NumericAnimation { properties: "x,width"; duration: 500; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x,width"; duration: 500; easing: "easeInOutQuad" }
}
]
diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/demos/declarative/flickr/content/ScrollBar.qml
index 2c4ff54..551f0ea 100644
--- a/demos/declarative/flickr/content/ScrollBar.qml
+++ b/demos/declarative/flickr/content/ScrollBar.qml
@@ -28,7 +28,7 @@ Item {
Transition {
fromState: "*"
toState: "*"
- NumericAnimation {
+ NumberAnimation {
target: Container
properties: "opacity"
duration: 400
diff --git a/demos/declarative/flickr/content/Star.qml b/demos/declarative/flickr/content/Star.qml
index 22fc138..437450d 100644
--- a/demos/declarative/flickr/content/Star.qml
+++ b/demos/declarative/flickr/content/Star.qml
@@ -35,7 +35,7 @@ Item {
]
transitions: [
Transition {
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,scale,x,y"
easing: "easeOutBounce"
}
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 83448ee..3ce442e 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -99,13 +99,13 @@ Item {
Transition {
fromState: "*"; toState: "Details"
ParentChangeAction { }
- NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
},
Transition {
fromState: "Details"; toState: "*"
SequentialAnimation {
ParentChangeAction { }
- NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
SetPropertyAction { filter: Wrapper; properties: "z" }
}
}
@@ -194,7 +194,7 @@ Item {
transitions: [
Transition {
fromState: "*"; toState: "*"
- NumericAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" }
+ NumberAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" }
}
]
}
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index 79f7a32..807a0ca 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -100,13 +100,13 @@ Item {
Transition {
fromState: "*"; toState: "Details"
ParentChangeAction { }
- NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
},
Transition {
fromState: "Details"; toState: "*"
SequentialAnimation {
ParentChangeAction { }
- NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
SetPropertyAction { filter: Wrapper; properties: "z" }
}
}
@@ -146,14 +146,14 @@ Item {
SequentialAnimation {
SetPropertyAction { target: Wrapper; property: "moveToParent" }
ParallelAnimation {
- NumericAnimation {
+ NumberAnimation {
target: Wrapper
properties: "x,y"
to: 0
easing: "easeOutQuad"
duration: 350
}
- NumericAnimation { target: Wrapper; properties: "scale,angle"; duration: 350 }
+ NumberAnimation { target: Wrapper; properties: "scale,angle"; duration: 350 }
}
}
},
@@ -163,14 +163,14 @@ Item {
PauseAnimation { duration: Math.floor(index/7)*100 }
SetPropertyAction { target: Wrapper; property: "moveToParent" }
ParallelAnimation {
- NumericAnimation {
+ NumberAnimation {
target: Wrapper
properties: "x,y"
to: 0
easing: "easeOutQuad"
duration: 250
}
- NumericAnimation { target: Wrapper; properties: "scale,angle"; duration: 250 }
+ NumberAnimation { target: Wrapper; properties: "scale,angle"; duration: 250 }
}
}
}