diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-24 00:07:31 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-24 00:07:31 (GMT) |
commit | 3170c89da80feb841b115db28a4dcf5ddadbbded (patch) | |
tree | b1d6554646ef530d561e7b825e53136ea288a4bd /demos | |
parent | a28f9a0204fcf7ab4ecf7546fc455f5db3aa7387 (diff) | |
download | Qt-3170c89da80feb841b115db28a4dcf5ddadbbded.zip Qt-3170c89da80feb841b115db28a4dcf5ddadbbded.tar.gz Qt-3170c89da80feb841b115db28a4dcf5ddadbbded.tar.bz2 |
fromState -> from, toState -> to for Transition.
Diffstat (limited to 'demos')
-rw-r--r-- | demos/declarative/contacts/Button.qml | 8 | ||||
-rw-r--r-- | demos/declarative/contacts/ContactField.qml | 4 | ||||
-rw-r--r-- | demos/declarative/contacts/FieldText.qml | 4 | ||||
-rw-r--r-- | demos/declarative/contacts/RemoveButton.qml | 4 | ||||
-rw-r--r-- | demos/declarative/contacts/contacts.qml | 8 | ||||
-rw-r--r-- | demos/declarative/flickr/content/ScrollBar.qml | 4 | ||||
-rw-r--r-- | demos/declarative/flickr/flickr.qml | 6 | ||||
-rw-r--r-- | demos/declarative/flickr/flickr2.qml | 8 | ||||
-rw-r--r-- | demos/declarative/webbrowser/fieldtext/FieldText.qml | 4 |
9 files changed, 25 insertions, 25 deletions
diff --git a/demos/declarative/contacts/Button.qml b/demos/declarative/contacts/Button.qml index 476f170..9719231 100644 --- a/demos/declarative/contacts/Button.qml +++ b/demos/declarative/contacts/Button.qml @@ -34,16 +34,16 @@ Item { ] transitions: [ Transition { - fromState: "*" - toState: "pressed" + from: "*" + to: "pressed" ColorAnimation { property: "color" duration: 200 } }, Transition { - fromState: "pressed" - toState: "*" + from: "pressed" + to: "*" ColorAnimation { property: "color" duration: 1000 diff --git a/demos/declarative/contacts/ContactField.qml b/demos/declarative/contacts/ContactField.qml index 8fb627d..6cf7baa 100644 --- a/demos/declarative/contacts/ContactField.qml +++ b/demos/declarative/contacts/ContactField.qml @@ -48,8 +48,8 @@ Item { ] transitions: [ Transition { - fromState: "" - toState: "*" + from: "" + to: "*" reversible: true NumberAnimation { properties: "width,rightMargin" diff --git a/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml index 6793b7c..d30d4d8 100644 --- a/demos/declarative/contacts/FieldText.qml +++ b/demos/declarative/contacts/FieldText.qml @@ -138,8 +138,8 @@ Rectangle { ] transitions: [ Transition { - fromState: "" - toState: "*" + from: "" + to: "*" reversible: true NumberAnimation { properties: "opacity,leftMargin,rightMargin" diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml index 2493f65..cc858c3 100644 --- a/demos/declarative/contacts/RemoveButton.qml +++ b/demos/declarative/contacts/RemoveButton.qml @@ -111,8 +111,8 @@ Rectangle { ] transitions: [ Transition { - fromState: "*" - toState: "opened" + from: "*" + to: "opened" reversible: true NumberAnimation { properties: "opacity,x,width" diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml index 3be2b04..ebcab69 100644 --- a/demos/declarative/contacts/contacts.qml +++ b/demos/declarative/contacts/contacts.qml @@ -281,8 +281,8 @@ Rectangle { ] transitions: [ Transition { - fromState: "*" - toState: "*" + from: "*" + to: "*" NumberAnimation { property: "bottomMargin" duration: 250 @@ -310,8 +310,8 @@ Rectangle { ] transitions: [ Transition { - fromState: "*" - toState: "*" + from: "*" + to: "*" NumberAnimation { property: "opacity" duration: 500 diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/demos/declarative/flickr/content/ScrollBar.qml index 540f94f..89d51e2 100644 --- a/demos/declarative/flickr/content/ScrollBar.qml +++ b/demos/declarative/flickr/content/ScrollBar.qml @@ -28,8 +28,8 @@ Item { ] transitions: [ Transition { - fromState: "*" - toState: "*" + from: "*" + to: "*" NumberAnimation { target: Container properties: "opacity" diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index d3c1a48..d8a27d5 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -100,12 +100,12 @@ Item { transitions: [ Transition { - fromState: "*"; toState: "Details" + from: "*"; to: "Details" ParentAction { } NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } }, Transition { - fromState: "Details"; toState: "*" + from: "Details"; to: "*" SequentialAnimation { ParentAction { } NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } @@ -196,7 +196,7 @@ Item { transitions: [ Transition { - fromState: "*"; toState: "*" + from: "*"; to: "*" 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 0bdbaaf..d9b1f60 100644 --- a/demos/declarative/flickr/flickr2.qml +++ b/demos/declarative/flickr/flickr2.qml @@ -99,12 +99,12 @@ Item { transitions: [ Transition { - fromState: "*"; toState: "Details" + from: "*"; to: "Details" ParentAction { } NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } }, Transition { - fromState: "Details"; toState: "*" + from: "Details"; to: "*" SequentialAnimation { ParentAction { } NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } @@ -140,7 +140,7 @@ Item { ] transitions: [ Transition { - toState: "pathView" + to: "pathView" SequentialAnimation { PropertyAction { target: Wrapper; property: "moveToParent" } ParallelAnimation { @@ -156,7 +156,7 @@ Item { } }, Transition { - toState: "gridView" + to: "gridView" SequentialAnimation { PauseAnimation { duration: Math.floor(index/7)*100 } PropertyAction { target: Wrapper; property: "moveToParent" } diff --git a/demos/declarative/webbrowser/fieldtext/FieldText.qml b/demos/declarative/webbrowser/fieldtext/FieldText.qml index 4d59705..976785b 100644 --- a/demos/declarative/webbrowser/fieldtext/FieldText.qml +++ b/demos/declarative/webbrowser/fieldtext/FieldText.qml @@ -148,8 +148,8 @@ Item { transitions: [ Transition { - fromState: "" - toState: "*" + from: "" + to: "*" reversible: true NumberAnimation { properties: "opacity,leftMargin,rightMargin" |