From 9c507a0fed6d527308956f5b98359495ae35c2ef Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 18 May 2011 17:57:15 +0200 Subject: Slight improvemnts to examples --- examples/animatedbackground/SlideDeck.qml | 19 +++++-- .../OpacityTransitionPresentation.qml | 6 +- examples/customtransition/SlideDeck.qml | 64 ++++++---------------- examples/tutorial/SlideDeck.qml | 4 +- 4 files changed, 36 insertions(+), 57 deletions(-) diff --git a/examples/animatedbackground/SlideDeck.qml b/examples/animatedbackground/SlideDeck.qml index add88ac..b8fc4c7 100644 --- a/examples/animatedbackground/SlideDeck.qml +++ b/examples/animatedbackground/SlideDeck.qml @@ -3,20 +3,31 @@ import QtQuick 2.0 import Qt.labs.presentation 1.0 Presentation { - width: 640 - height: 360 + width: 1280 + height: 720 BackgroundSwirls {} property color textColor: "white" Slide { - centeredText: "Animated Backgrounds" + centeredText: "Animated Background" fontScale: 2 } Slide { - centeredText: "Just create what ever you want in the background, like shaders or rotating boxes and then put your Slide{} elements on top.." + title: "Composition" + content: [ + "Gradient Rectangle", + "Swirls using ShaderEffectItem", + " Movement using a vertexShader", + " Colorized using a gradient rect converted to a texture", + " Controlled using QML properties and animations", + "Snow", + " Using 'Qt.labs.particles 2.0'", + " TrailsEmitter", + " ColoredParticle" + ] } } diff --git a/examples/customtransition/OpacityTransitionPresentation.qml b/examples/customtransition/OpacityTransitionPresentation.qml index 71d05a2..f0d79c6 100644 --- a/examples/customtransition/OpacityTransitionPresentation.qml +++ b/examples/customtransition/OpacityTransitionPresentation.qml @@ -5,8 +5,8 @@ Presentation { id: deck - width: 600 - height: 400 + width: 1280 + height: 720 property color textColor: "white" @@ -38,7 +38,7 @@ Presentation { 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 } + NumberAnimation { target: toSlide; property: "scale"; from: 0.7; to: 1; duration: deck.transitionTime; easing.type: Easing.InOutQuart } } ScriptAction { script: { diff --git a/examples/customtransition/SlideDeck.qml b/examples/customtransition/SlideDeck.qml index f4cb8a8..b08b9bc 100644 --- a/examples/customtransition/SlideDeck.qml +++ b/examples/customtransition/SlideDeck.qml @@ -5,65 +5,33 @@ OpacityTransitionPresentation { Slide { id: slide1 - title: "Slide number 1" - content: [ - "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", - "Duis at dui eget mi vulputate ornare eget scelerisque justo.", - "Quisque ut mi sit amet lorem sollicitudin faucibus.", - "Mauris quis tellus vitae justo tempor lobortis in in ipsum.", - "Praesent in mi eget mauris gravida hendrerit at at sapien.", - "Cras semper diam a ligula tristique fringilla." - ] - bulletSpacing: 0 + title: "Custom Transitions, 1" + centeredText: "The Presentation {} Element has a 'switchSlides(from, to)' function which will be called whenever a transition between slides should take place." } Slide { - title: "Slide number 2" - content: [ - "Duis sodales nibh a sem posuere non mollis tellus pharetra.", - "Quisque viverra massa non tortor dictum eu porta enim vulputate.", - "Ut id lacus eget sem rhoncus ultricies sed vel mi.", - "Etiam gravida ipsum vel nisi sodales fringilla.", - "Suspendisse interdum fringilla nisl, sodales feugiat neque accumsan eget.", - "Vestibulum ultrices risus consectetur odio sagittis ac pharetra dolor ornare.", - "Nunc tincidunt nisl sed ante vehicula consequat." - ] - bulletSpacing: 0 + title: "Custom Transitions, 2" + centeredText: + "Re-implement this function and add your own transition for the slides. " } Slide { - title: "Slide number 3" + title: "Custom Transitions, 3" content: [ - "Vestibulum aliquam orci non ante viverra pretium.", - "Aliquam fermentum congue eros, eget blandit eros dignissim nec.", - "Quisque faucibus turpis et orci tempus interdum.", - "Aenean at dolor arcu, eu dapibus purus.", - "Ut ut elit nec dolor lobortis imperdiet.", - "Phasellus quis dolor nibh, at aliquam nulla.", - "Suspendisse vitae enim dictum tortor tempor lobortis ac eget felis.", - "Fusce eget odio eget metus pharetra mattis nec et justo." + "In this transition we do", + " 'from' slide gets", + " opacity fades out", + " scale increases slightly", + " 'to' slide gets", + " opacity fades in", + " scale increases from small to normal", + "All with a fairly simple ParallelAnimation {}" ] - bulletSpacing: 0 } Slide { - title: "Slide number 4" - content: [ - "Pellentesque nec nulla est, et posuere augue.", - "Sed ornare nisi ac quam rhoncus mollis.", - "Cras facilisis diam id purus dapibus quis fermentum arcu ultricies." - ] - bulletSpacing: 0 - } - - Slide { - title: "Slide number 5" - content: [ - "Nulla sollicitudin posuere nisi, ut viverra lacus pellentesque id.", - "Sed imperdiet porttitor enim, eu dictum mi eleifend sit amet.", - "Nulla et sapien quis magna volutpat viverra vel eu libero." - ] - bulletSpacing: 0 + title: "Custom Transition, 4" + centeredText: "The transition works whichever way you go...\nLets go back to the beginning..." } } diff --git a/examples/tutorial/SlideDeck.qml b/examples/tutorial/SlideDeck.qml index d916f13..f592751 100644 --- a/examples/tutorial/SlideDeck.qml +++ b/examples/tutorial/SlideDeck.qml @@ -3,8 +3,8 @@ import QtQuick 2.0 Presentation { - width: 800 - height: 600 + width: 1280 + height: 720 Slide { -- cgit v1.2.3