Replace PageView with index.html page.

This way the start page will also be contained in the browsing history. Change-Id: Icd185a398c5dae622703a6dc9693ed4769d241ae Reviewed-by: Andras Becsi <andras.becsi@digia.com>
author: Zeno Albisser <zeno.albisser@digia.com> 2014-06-16 06:04:01 -0700
committer: Zeno Albisser <zeno.albisser@digia.com> 2014-06-16 19:09:38 +0300
commit: 79fcd4fefc090c79c4fa088d4d0ba24b60c1b4e7 (patch)
tree: f6c11d6b59ee8fa33f2b5f5e3e894bd6ec9b59bf
parent: 0d56278af6eace6747bd7c91215f6e5daef8b84e (diff)
3 files changed, 38 insertions, 165 deletions
diff --git a/basicsuite/webengine/content/index.html b/basicsuite/webengine/content/index.html
new file mode 100644
index 0000000..d1cf160
--- /dev/null
+++ b/basicsuite/webengine/content/index.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset=utf-8 />
+        <title>Qt WebEngine Demo</title>
+        <style>
+        a, a:link, a:active, a:visited {
+            text-decoration:none;
+            font-family: "Helvetica";
+            font-size: 18px;
+            color: rgb(0,0,0)
+        }
+        .bookmark {
+            margin: 28px;
+        }
+        .example {
+            display: inline-block;
+        }
+        .example_image {
+            width: 300px;
+            height: 175px;
+        }
+        </style>
+    </head>
+    <body bgcolor="#AAAAAA">
+        <div style="text-align: center; padding-top: 100px;">
+            <div class="bookmark"><a href="http://qt.digia.com">http://qt.digia.com</a></div>
+            <div class="bookmark"><a href="http://qt-project.org/doc/qt-5">http://qt-project.org/doc/qt-5</a></div>
+            <div class="bookmark"><a href="http://www.google.com">http://www.google.com</a></div>
+            <div class="example"><a href="../content/webgl/helloqt.html"><img class="example_image" src="../content/webgl/screenshot.png"></a></div>
+            <div class="example"><a href="../content/csstetrahedron/index.html"><img class="example_image" src="../content/csstetrahedron/screenshot.png"></a></div>
+        </div>
+    </body>
+</html>
diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml
index 2295ea4..dcf40d7 100644
--- a/basicsuite/webengine/main.qml
+++ b/basicsuite/webengine/main.qml
@@ -55,13 +55,13 @@ Rectangle {
     width: 1280
     height: 800
 
-    property url defaultUrl: "about:blank"
+    property url defaultUrl: Qt.resolvedUrl("content/index.html")
     function load(url) { mainWebView.url = url }
 
     WebEngineView {
         id: mainWebView
         anchors.fill: parent
-        url: Qt.resolvedUrl(defaultUrl)
+        url: defaultUrl
         onLoadingChanged: {
             if (!loading) {
                 addressBar.cursorPosition = 0
@@ -70,15 +70,6 @@ Rectangle {
         }
     }
 
-    PageView {
-        id: pageView
-        visible: true
-        opacity: 1
-        Behavior on opacity {
-            NumberAnimation { duration: 250 }
-        }
-    }
-
     MultiPointTouchArea {
         z: showToolBarButton.z
         width: parent.width
@@ -180,13 +171,9 @@ Rectangle {
                 id: homeButton
                 width: 20
                 Layout.fillHeight: true
-                iconSource: pageView.enabled ? "ui/icons/window.png" : "ui/icons/home.png"
+                iconSource: "ui/icons/home.png"
                 onClicked: {
-                    if (pageView.enabled) {
-                        pageView.hide()
-                    } else {
-                        pageView.show()
-                    }
+                    load(defaultUrl)
                 }
             }
             TextField {
@@ -211,7 +198,6 @@ Rectangle {
                 Layout.fillWidth: true
                 text: mainWebView.url
                 onAccepted: {
-                    pageView.hide()
                     mainWebView.url = engine.fromUserInput(text)
                 }
             }
diff --git a/basicsuite/webengine/ui/PageView.qml b/basicsuite/webengine/ui/PageView.qml
deleted file mode 100644
index 778fcd7..0000000
--- a/basicsuite/webengine/ui/PageView.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
-**
-** This file is part of the examples of the Qt Enterprise Embedded.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.1
-import QtQuick.Layouts 1.1
-
-Rectangle {
-    id: root
-    color: "#AAAAAA"
-    visible: true
-
-    property real fontPointSize: 13
-
-    function show() {
-        enabled = true
-        opacity = 1
-    }
-    function hide() {
-        enabled = false
-        opacity = 0
-    }
-    anchors {
-        fill: parent
-    }
-    ColumnLayout {
-        id: links
-        anchors {
-            bottom: parent.bottom
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-            margins: 50
-        }
-        Text {
-            text: "http://www.google.com"
-            font.pointSize: fontPointSize
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            Layout.fillWidth: true
-            Layout.preferredHeight: 60
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    load(Qt.resolvedUrl(parent.text))
-                    hide()
-                }
-            }
-        }
-        Text {
-            text: "http://qt.digia.com"
-            font.pointSize: fontPointSize
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            Layout.fillWidth: true
-            Layout.preferredHeight: 60
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    load(Qt.resolvedUrl(parent.text))
-                    hide()
-                }
-            }
-        }
-        Text {
-            text: "http://qt-project.org/doc/qt-5"
-            font.pointSize: fontPointSize
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            Layout.fillWidth: true
-            Layout.preferredHeight: 60
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    load(Qt.resolvedUrl(parent.text))
-                    hide()
-                }
-            }
-        }
-    RowLayout {
-        id: localContent
-        anchors {
-            margins: 50
-        }
-        Image {
-            sourceSize.width: 300
-            sourceSize.height: 175
-            source: "../content/webgl/screenshot.png"
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    load(Qt.resolvedUrl("../content/webgl/helloqt.html"))
-                    hide()
-                }
-            }
-        }
-        Image {
-            sourceSize.width: 300
-            sourceSize.height: 175
-            source: "../content/csstetrahedron/screenshot.png"
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    load(Qt.resolvedUrl("../content/csstetrahedron/index.html"))
-                    hide()
-                }
-            }
-        }
-    } // RowLayout
-    } // ColumnLayout
-}
author	Zeno Albisser <zeno.albisser@digia.com>	2014-06-16 06:04:01 -0700
committer	Zeno Albisser <zeno.albisser@digia.com>	2014-06-16 19:09:38 +0300
commit	79fcd4fefc090c79c4fa088d4d0ba24b60c1b4e7 (patch)
tree	f6c11d6b59ee8fa33f2b5f5e3e894bd6ec9b59bf
parent	0d56278af6eace6747bd7c91215f6e5daef8b84e (diff)