From e76ea713e98a3734f0e63961e855d748096990e3 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 30 May 2013 16:52:15 +0200 Subject: Several changes to Qt 5 Android app Lots of minor stuff from collected feedback. Also added more generated files to avoid Creator overwriting them. Change-Id: I22e10ac19860d1e67f136d718557b2bc2bd04dff Reviewed-by: Eskil Abrahamsen-Blomfeldt --- experimental/qt5-intro-android/SlideDeck.qml | 38 ++++++++++++++++++---------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'experimental/qt5-intro-android/SlideDeck.qml') diff --git a/experimental/qt5-intro-android/SlideDeck.qml b/experimental/qt5-intro-android/SlideDeck.qml index 5a32831..26aa4e6 100644 --- a/experimental/qt5-intro-android/SlideDeck.qml +++ b/experimental/qt5-intro-android/SlideDeck.qml @@ -83,11 +83,17 @@ OpacityTransitionPresentation { Slide { id: introSlide - writeInText: "The following is a quick tour of what is new in Qt 5. + centeredText: "The following is a quick tour of what is new in Qt 5. -It is an application written with Qt Quick, based on Qt 5. +It is an application written with Qt Quick, based on Qt 5." -We hope you will enjoy Qt 5 as much as we have enjoyed creating it. + + (masterWidth < masterHeight ? " + +For an optimal experience, try watching it in the landscape orientation. + +" : " ") + ++ "We hope you will enjoy Qt 5 as much as we have enjoyed creating it. [tap to advance]" @@ -102,11 +108,13 @@ We hope you will enjoy Qt 5 as much as we have enjoyed creating it. Slide { centeredText: "Introducing" fontScale: 2 + timeout: 2000 } Slide { centeredText: "Qt 5" fontScale: 4; + timeout: 2000 } @@ -138,11 +146,11 @@ Wayland support - Wayland-compatible Qt backend and compositor framework" title: "Qt for Android" writeInText: " - Qt 5.1 allows you to write Android apps using Qt Quick or Qt Widgets. +Qt 5.1 allows you to write Android apps using Qt Quick or Qt Widgets. - We support QML media player functionality, as well as a set of commonly used sensors in QtSensors. +We support QML media player functionality, as well as a set of commonly used sensors in QtSensors. - With Qt Creator you can develop your apps, deploy them directly to a device, and debug them on the device. +With Qt Creator you can develop your apps, deploy them directly to a device, and debug them on the device. " } @@ -150,7 +158,7 @@ Wayland support - Wayland-compatible Qt backend and compositor framework" writeInText: "For this preliminary release, we are focusing on the developer experience, working to enable Qt developers to easily run and test their applications on Android devices. - You can easily deploy your app to an app store with Qt 5.1, but we recommend waiting until Qt 5.2 for an even smoother experience." +You can easily deploy your app to an app store with Qt 5.1, but we recommend waiting until Qt 5.2 for an even smoother experience." } @@ -162,7 +170,7 @@ Wayland support - Wayland-compatible Qt backend and compositor framework" ExamplesSlide { } FontSlide { } - CanvasSlide { } + // CanvasSlide { } ParticleSlide { } ShaderSlide { } @@ -219,14 +227,15 @@ Wayland support - Wayland-compatible Qt backend and compositor framework" title: "Links" contentFormat: Text.RichText content: [ - "Qt Project: qt-project.org", - "Qt by Digia: qt.digia.com", + "qt-project.org", + "Qt by Digia: qt.digia.com", "Follow us on Twitter", - " @QtProject", - " @QtByDigia", + " @QtProject", + " @QtByDigia", "Find us on Facebook:", - " Qt Project", - " Qt by Digia", + " Qt Project", + " Qt by Digia", ]; Image { @@ -238,6 +247,7 @@ Wayland support - Wayland-compatible Qt backend and compositor framework" anchors.right: parent.right anchors.rightMargin: parent.width * 0.15 fillMode: Image.PreserveAspectFit + visible: parent.masterWidth > parent.masterHeight } } -- cgit v1.2.3