diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-05-30 16:52:15 +0200 |
---|---|---|
committer | Eskil Abrahamsen-Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-05-31 11:28:23 +0300 |
commit | e76ea713e98a3734f0e63961e855d748096990e3 (patch) | |
tree | 54ee522ab564d2f4d5b042c3610710cec83bc011 /experimental/qt5-intro-android/ExamplesSlide.qml | |
parent | 792602c8aaf387556c0035fc894493a20699c7e8 (diff) |
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 <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'experimental/qt5-intro-android/ExamplesSlide.qml')
-rw-r--r-- | experimental/qt5-intro-android/ExamplesSlide.qml | 52 |
1 files changed, 42 insertions, 10 deletions
diff --git a/experimental/qt5-intro-android/ExamplesSlide.qml b/experimental/qt5-intro-android/ExamplesSlide.qml index 373c564..dd70c21 100644 --- a/experimental/qt5-intro-android/ExamplesSlide.qml +++ b/experimental/qt5-intro-android/ExamplesSlide.qml @@ -45,10 +45,14 @@ Slide { id: slide - title: "Qt Quick 2" + title: "Qt Quick 2 Interactive Demos" + shouldTimeout: false Row { - anchors.fill: parent + id: exampleRow + anchors.centerIn: parent + height: parent.height + width: item1.width + spacing * 3 + (item2.visible ? item2.width : 0) + (item3.visible ? item3.width : 0) spacing: Math.max(10, (width - 320 * 3) / 2) @@ -57,26 +61,54 @@ Slide width: 320 height: 480 clip: true - Loader { - id: load1 + MouseArea { + anchors.fill: parent + + Loader { + id: load1 + } } + } Item { id: item2 width: 320 height: 480 - visible: item1.width + parent.spacing + width <= parent.width + visible: masterWidth > masterHeight clip: true; - Loader { - id: load2 + MouseArea { + anchors.fill: parent + Loader { + id: load2 + } } } - Loader { - id: load3 - visible: item1.width + item2.width + parent.spacing * 2 + width <= parent.width + Item { + id: item3 + width: 320 + height: 480 + visible: masterWidth > masterHeight + clip: true; + MouseArea { + Loader { + id: load3 + } + anchors.fill: parent + } } + } + + Text { + id: showMore + text: "Rotate the device for more" + color: textColor + anchors.top: exampleRow.bottom + font.family: slides[currentSlide].fontFamily + font.pixelSize: slides[currentSlide].fontSize * 0.6 + visible: masterWidth < masterHeight + anchors.horizontalCenter: parent.horizontalCenter } onVisibleChanged: { |