diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2012-12-18 15:56:50 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2012-12-18 15:56:50 +0100 |
commit | 2c4c3377fc9f4b74d9335f462070c3a0123ef539 (patch) | |
tree | ba9e18f64610b4f40903d2c01ccb6f3120ee9072 | |
parent | a9624b72bf411435393bcc7af240e5526b01c00f (diff) |
more tweaks
-rw-r--r-- | ExamplesSlide.qml | 2 | ||||
-rw-r--r-- | SlideDeck.qml | 27 | ||||
-rw-r--r-- | WidgetsSlide.qml | 21 |
3 files changed, 24 insertions, 26 deletions
diff --git a/ExamplesSlide.qml b/ExamplesSlide.qml index 9e098dc..bb3192e 100644 --- a/ExamplesSlide.qml +++ b/ExamplesSlide.qml @@ -45,7 +45,7 @@ Slide { id: slide - title: "Qt Quick" + title: "Qt Quick 2" Row { anchors.fill: parent diff --git a/SlideDeck.qml b/SlideDeck.qml index dc027cb..2204b4b 100644 --- a/SlideDeck.qml +++ b/SlideDeck.qml @@ -82,8 +82,9 @@ OpacityTransitionPresentation { writeInText: "The following is a quick tour of what is new in Qt 5. -It is an application written with Qt Quick, based on the modules shipped with Qt 5 and using the QML Presentation System from Qt labs. The source code is available from: -https://git.gitorious.org/qt-labs/qt5-launch-demo.git +It is an application written with Qt Quick, based on Qt 5. The source code is available from: +https://qt.gitorious.org/qt-labs/qt5-launch-demo + We hope you will enjoy Qt 5 as much as we have enjoyed creating it." @@ -107,35 +108,31 @@ We hope you will enjoy Qt 5 as much as we have enjoyed creating it." Slide { - title: "Qt 5 - Features" writeInText: "OpenGL based scene graph for Qt Quick 2.0 - providing velvet animations, particles and impressive graphical effects Multimedia - Audio, Video and Camera support on all major platforms -WebKit - Full HTML 5 support from the worlds most popular web engine, including WebKit2 process separation" +WebKit - Full HTML 5 support from the worlds most popular web engine" } Slide { - title: "Qt 5 - Features" - writeInText: "Modularization of the Qt libraries - sanitizing our codebase and simplifying deployment + writeInText: "C++ language features - template based connect(), C++11 support -Qt Platform Abstraction - Unifying the Qt codebase across platforms, minimizing the porting effort for new platforms +Connectivity and Networking - DNS lookup, improved IPv6 support -Wayland support - Wayland 1.0 compatible Qt backend and compositor framework" +JSON Support - Fast parser and writer, binary format support" } Slide { - title: "Qt 5 - Features" - writeInText: "C++ language features - template based connect(), C++11 support, move constructors and more - -Connectivity and Networking - DNS lookup, improved IPv6 support + writeInText: "Modularization of the Qt libraries - sanitizing our codebase and simplifying deployment -JSON Support - Fast parser and writer, binary format support +Qt Platform Abstraction - Unifying the Qt codebase across platforms, minimizing the porting effort for new platforms -Unicode - Updated to latest Unicode specification, UTF-8 source files" +Wayland support - Wayland 1.0 compatible Qt backend and compositor framework" } + WidgetsSlide { } @@ -214,7 +211,7 @@ Unicode - Updated to latest Unicode specification, UTF-8 source files" " Qt Project", " Qt by Digia", "", - "This demo: https://git.gitorious.org/qt-labs/qt5-launch-demo.git" + "This demo: https://qt.gitorious.org/qt-labs/qt5-launch-demo" ]; Image { diff --git a/WidgetsSlide.qml b/WidgetsSlide.qml index ac1be91..e2ef9b6 100644 --- a/WidgetsSlide.qml +++ b/WidgetsSlide.qml @@ -44,11 +44,12 @@ import Qt.labs.presentation 1.0 Slide { id: slide - title: "Qt Widgets" - writeInText: "The Qt Widget module is fully supported, part of Qt Essentials." + writeInText: "The Qt Widgets are working better than ever with accessibility and retina display support!" - property int slamTime: 600; - property int waitTime: 0; + property int slamTime: 800; + property int waitTime: 500; + + y: parent.height * 0.15 SequentialAnimation { id: widgetAnimation @@ -59,7 +60,7 @@ Slide { stylesWindow.opacity = 0; } } - PauseAnimation { duration: 2000 } + PauseAnimation { duration: 3000 } ParallelAnimation { NumberAnimation { target: boxesImage; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.OutBack } NumberAnimation { target: boxesImage; property: "rotation"; from: 20; to: 10; duration: slide.slamTime; easing.type: Easing.OutBack } @@ -92,14 +93,14 @@ Slide { Row { x: slide.width * 0.05 - y: slide.height * 0.55; + y: slide.height * 0.58; width: parent.width Image { id: boxesImage; source: "images/widgets_boxes.png" fillMode: Image.PreserveAspectFit width: slide.width * .2 - antialiasing: true + antialiasing: true opacity: 0; y: -slide.height * 0.2 rotation: 10 @@ -120,7 +121,7 @@ Slide { width: slide.width * .2 x: slide.width * -0.05 y: -slide.height * 0.2 - antialiasing: true + antialiasing: true opacity: 0 } @@ -132,7 +133,7 @@ Slide { x: slide.width * 1 y: -slide.height * 0.1 - antialiasing: true + antialiasing: true opacity: 0 Image { @@ -143,7 +144,7 @@ Slide { x: parent.width * 0.3 y: parent.width * 0.1 rotation: -20 - antialiasing: true + antialiasing: true } } } |