diff options
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 /basicsuite/webengine/main.qml | |
parent | 0d56278af6eace6747bd7c91215f6e5daef8b84e (diff) |
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>
Diffstat (limited to 'basicsuite/webengine/main.qml')
-rw-r--r-- | basicsuite/webengine/main.qml | 22 |
1 files changed, 4 insertions, 18 deletions
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) } } |