diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-14 17:51:22 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-14 17:51:22 +0200 |
| commit | 4b66cdf14b8c8ed302f601ccfdf512bef3ccf83c (patch) | |
| tree | 2f2614bee63a1f9fc293839f9e33bffba5ca5d3c | |
| parent | 8498d8076364cd3cf3952bf64d83f1a1cd2491f5 (diff) | |
renamed to Qt.labs.presentation
| -rw-r--r-- | Qt/labs/presentation/Presentation.qml (renamed from Prezo/Presentation.qml) | 0 | ||||
| -rw-r--r-- | Qt/labs/presentation/Slide.qml (renamed from Prezo/Slide.qml) | 1 | ||||
| -rw-r--r-- | Qt/labs/presentation/qmldir (renamed from Prezo/qmldir) | 0 | ||||
| -rw-r--r-- | examples/animatedbackground/SlideDeck.qml | 3 | ||||
| -rw-r--r-- | examples/customtransition/OpacityTransitionPresentation.qml | 5 | ||||
| -rw-r--r-- | examples/customtransition/SlideDeck.qml | 2 | ||||
| -rw-r--r-- | examples/helloprezo/SlideDeck.qml (renamed from examples/helloprezo/HelloPrezo.qml) | 2 |
7 files changed, 8 insertions, 5 deletions
diff --git a/Prezo/Presentation.qml b/Qt/labs/presentation/Presentation.qml index b985880..b985880 100644 --- a/Prezo/Presentation.qml +++ b/Qt/labs/presentation/Presentation.qml diff --git a/Prezo/Slide.qml b/Qt/labs/presentation/Slide.qml index 1988d85..0c2dd9e 100644 --- a/Prezo/Slide.qml +++ b/Qt/labs/presentation/Slide.qml @@ -36,6 +36,7 @@ Item { font.bold: true; color: slideTextColor horizontalAlignment: Text.Center + z: 1 } Text { diff --git a/Prezo/qmldir b/Qt/labs/presentation/qmldir index 050905d..050905d 100644 --- a/Prezo/qmldir +++ b/Qt/labs/presentation/qmldir diff --git a/examples/animatedbackground/SlideDeck.qml b/examples/animatedbackground/SlideDeck.qml index 7f99f72..add88ac 100644 --- a/examples/animatedbackground/SlideDeck.qml +++ b/examples/animatedbackground/SlideDeck.qml @@ -1,7 +1,6 @@ import QtQuick 2.0 -import Prezo 1.0 -import Qt.labs.particles 2.0 +import Qt.labs.presentation 1.0 Presentation { width: 640 diff --git a/examples/customtransition/OpacityTransitionPresentation.qml b/examples/customtransition/OpacityTransitionPresentation.qml index 40032d4..71d05a2 100644 --- a/examples/customtransition/OpacityTransitionPresentation.qml +++ b/examples/customtransition/OpacityTransitionPresentation.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import Prezo 1.0 +import Qt.labs.presentation 1.0 Presentation { @@ -36,13 +36,16 @@ Presentation { ParallelAnimation { NumberAnimation { target: fromSlide; property: "opacity"; from: 1; to: 0; duration: deck.transitionTime; easing.type: Easing.OutQuart } + NumberAnimation { target: fromSlide; property: "scale"; from: 1; to: 1.1; duration: deck.transitionTime; easing.type: Easing.InOutQuart } NumberAnimation { target: toSlide; property: "opacity"; from: 0; to: 1; duration: deck.transitionTime; easing.type: Easing.InQuart } + NumberAnimation { target: toSlide; property: "scale"; from: 0.9; to: 1; duration: deck.transitionTime; easing.type: Easing.InOutQuart } } ScriptAction { script: { deck.inTransition = false fromSlide.visible = false fromSlide.opacity = 0 + fromSlide.scale = 1 toSlide.opacity = 1 } } diff --git a/examples/customtransition/SlideDeck.qml b/examples/customtransition/SlideDeck.qml index 20783cb..f4cb8a8 100644 --- a/examples/customtransition/SlideDeck.qml +++ b/examples/customtransition/SlideDeck.qml @@ -1,4 +1,4 @@ -import Prezo 1.0 +import Qt.labs.presentation 1.0 import QtQuick 2.0 OpacityTransitionPresentation diff --git a/examples/helloprezo/HelloPrezo.qml b/examples/helloprezo/SlideDeck.qml index ebd2036..748fa14 100644 --- a/examples/helloprezo/HelloPrezo.qml +++ b/examples/helloprezo/SlideDeck.qml @@ -1,4 +1,4 @@ -import Prezo 1.0 +import Qt.labs.presentation 1.0 import QtQuick 2.0 Presentation |