1 files changed, 51 insertions, 54 deletions
diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml
index a500bd9..495a2f3 100644
--- a/basicsuite/enterprise-charts/main.qml
+++ b/basicsuite/enterprise-charts/main.qml
@@ -2,19 +2,17 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://www.qt.io
+** For any questions to Digia, please use contact form at http://qt.io
 **
-** This file is part of the Qt Enterprise Charts Add-on.
+** This file is part of the Qt Charts module.
 **
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** Licensees holding valid commercial license for Qt may use this file in
+** accordance with the Qt License Agreement provided with the Software
+** or, alternatively, in accordance with the terms contained in a written
+** agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://www.qt.io
-** $QT_END_LICENSE$
+** contact form at http://qt.io
 **
 ****************************************************************************/
 
@@ -25,12 +23,51 @@ import QtQuick 2.0
 Rectangle {
     width: 600
     height: 400
-    property int viewNumber: 1
+    property bool sourceLoaded: false
 
-    Loader {
-        id: loader
+    ListView {
+        id: root
+        focus: true
         anchors.fill: parent
-        source: "View" + viewNumber + ".qml";
+        snapMode: ListView.SnapOneItem
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        highlightMoveDuration: 250
+        orientation: ListView.Horizontal
+        boundsBehavior: Flickable.StopAtBounds
+
+        onCurrentIndexChanged: {
+            if (infoText.opacity > 0.0) {
+                if (sourceLoaded)
+                    infoText.opacity = 0.0;
+                else if (currentIndex != 0)
+                    currentIndex = 0;
+            }
+        }
+
+        model: ListModel {
+            ListElement {component: "View1.qml"}
+            ListElement {component: "View2.qml"}
+            ListElement {component: "View3.qml"}
+            ListElement {component: "View4.qml"}
+            ListElement {component: "View5.qml"}
+            ListElement {component: "View6.qml"}
+            ListElement {component: "View7.qml"}
+            ListElement {component: "View8.qml"}
+            ListElement {component: "View9.qml"}
+            ListElement {component: "View10.qml"}
+            ListElement {component: "View11.qml"}
+            ListElement {component: "View12.qml"}
+        }
+
+        delegate: Loader {
+            width: root.width
+            height: root.height
+
+            source: component
+            asynchronous: true
+
+            onLoaded: sourceLoaded = true
+        }
     }
 
     Rectangle {
@@ -42,51 +79,11 @@ Rectangle {
         Text {
             color: "white"
             anchors.centerIn: parent
-            text: "Use left and right arrow keys or tap on the screen to navigate between chart types"
+            text: "You can navigate between views using swipe or arrow keys"
         }
 
         Behavior on opacity {
             NumberAnimation { duration: 400 }
         }
     }
-
-    MouseArea {
-        focus: true
-        anchors.fill: parent
-        onClicked: {
-            if (infoText.opacity > 0) {
-                infoText.opacity = 0.0;
-            } else {
-                nextView();
-            }
-        }
-        Keys.onPressed: {
-            if (infoText.opacity > 0) {
-                infoText.opacity = 0.0;
-            } else {
-                if (event.key == Qt.Key_Left) {
-                    previousView();
-                } else {
-                    // tapping on the screen advances to the next view
-                    nextView();
-                }
-            }
-        }
-    }
-
-    function nextView() {
-        var i = viewNumber + 1;
-        if (i > 15)
-            viewNumber = 1;
-        else
-            viewNumber = i;
-    }
-
-    function previousView() {
-        var i = viewNumber - 1;
-        if (i <= 0)
-            viewNumber = 15;
-        else
-            viewNumber = i;
-    }
 }