summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-06-18 16:30:24 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-06-19 12:18:45 +0300
commit52f7c8b3c40e0d73200436530e8d91a1c07d61f1 (patch)
tree1620feefda191e66f31d519c0759f7c7254596fd
parent79fcd4fefc090c79c4fa088d4d0ba24b60c1b4e7 (diff)
Add the loading error page
to make it clearer when the connectivity is a problem. Change-Id: I828d75baf31d5333a3cb727a0baa8447e56f30d4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--basicsuite/webengine/ErrorPage.qml71
-rw-r--r--basicsuite/webengine/main.qml23
2 files changed, 94 insertions, 0 deletions
diff --git a/basicsuite/webengine/ErrorPage.qml b/basicsuite/webengine/ErrorPage.qml
new file mode 100644
index 0000000..daa25d0
--- /dev/null
+++ b/basicsuite/webengine/ErrorPage.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $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
+
+Rectangle {
+ id: errorPage
+ property alias mainMessage: errorMessage.text;
+ property bool displayingError: false;
+ anchors.fill: parent
+ color: "lightgray"
+ visible: displayingError
+
+ Rectangle {
+ color: "white"
+ anchors.centerIn: parent
+ height: parent.height / 3
+ width: Math.max(parent.width / 2, errorMessage.width + 20)
+
+ border {
+ color: "dimgray"
+ width: 0.5
+ }
+
+ radius: 20
+ Text {
+ id: errorMessage
+ color: "dimgray"
+ font.pixelSize: 20
+ anchors.centerIn: parent
+ }
+ }
+
+}
diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml
index dcf40d7..30365ce 100644
--- a/basicsuite/webengine/main.qml
+++ b/basicsuite/webengine/main.qml
@@ -58,15 +58,38 @@ Rectangle {
property url defaultUrl: Qt.resolvedUrl("content/index.html")
function load(url) { mainWebView.url = url }
+ ErrorPage {
+ id: errorPage
+ anchors.fill: parent
+ displayingError: false
+ }
+
WebEngineView {
id: mainWebView
anchors.fill: parent
url: defaultUrl
+ visible: !errorPage.displayingError
onLoadingChanged: {
if (!loading) {
addressBar.cursorPosition = 0
toolBar.state = "address"
}
+ var loadError = loadRequest.errorDomain
+ if (loadError == WebEngineView.NoErrorDomain) {
+ errorPage.displayingError = false
+ return;
+ }
+ errorPage.displayingError = true
+ if (loadError == WebEngineView.InternalErrorDomain)
+ errorPage.mainMessage = "Internal error"
+ else if (loadError == WebEngineView.ConnectionErrorDomain)
+ errorPage.mainMessage = "Unable to connect to the Internet"
+ else if (loadError == WebEngineView.CertificateErrorDomain)
+ errorPage.mainMessage = "Certificate error"
+ else if (loadError == WebEngineView.DnsErrorDomain)
+ errorPage.mainMessage = "Unable to resolve the server's DNS address"
+ else // HTTP and FTP
+ errorPage.mainMessage = "Protocol error"
}
}