diff --git a/interface/resources/icons/loader-snake-64-w.gif b/interface/resources/icons/loader-snake-64-w.gif new file mode 100644 index 0000000000..e6594ab0a2 Binary files /dev/null and b/interface/resources/icons/loader-snake-64-w.gif differ diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml index 74318a165e..ee4d05a701 100644 --- a/interface/resources/qml/TabletBrowser.qml +++ b/interface/resources/qml/TabletBrowser.qml @@ -4,6 +4,7 @@ import QtWebChannel 1.0 import QtWebEngine 1.2 import "controls" +import "controls-uit" as HifiControls import "styles" as HifiStyles import "styles-uit" import "windows" @@ -117,6 +118,8 @@ Item { onNewViewRequested: { request.openIn(webView); } + + HifiControls.WebSpinner { } } Keys.onPressed: { diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controls-uit/BaseWebView.qml index 9c22a8ff8c..670aea71aa 100644 --- a/interface/resources/qml/controls-uit/BaseWebView.qml +++ b/interface/resources/qml/controls-uit/BaseWebView.qml @@ -36,4 +36,6 @@ WebEngineView { } } } + + WebSpinner { } } diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controls-uit/WebSpinner.qml new file mode 100644 index 0000000000..6323bff1a7 --- /dev/null +++ b/interface/resources/qml/controls-uit/WebSpinner.qml @@ -0,0 +1,21 @@ +// +// WebSpinner.qml +// +// Created by David Rowe on 23 May 2017 +// Copyright 2017 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +import QtQuick 2.5 + +AnimatedImage { + source: "../../icons/loader-snake-64-w.gif" + visible: parent.loading && /^(http.*|)$/i.test(parent.url.toString()) + z: 10000 + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } +} diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml index fec91046d8..93ded724a1 100644 --- a/interface/resources/qml/controls/TabletWebScreen.qml +++ b/interface/resources/qml/controls/TabletWebScreen.qml @@ -116,6 +116,8 @@ Item { tabletRoot.openBrowserWindow(request, profile); } } + + HiFiControls.WebSpinner { } } HiFiControls.Keyboard { diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml index d939e088a8..215ac68ac0 100644 --- a/interface/resources/qml/controls/TabletWebView.qml +++ b/interface/resources/qml/controls/TabletWebView.qml @@ -238,6 +238,8 @@ Item { onNewViewRequested: { request.openIn(webview); } + + HiFiControls.WebSpinner { } } HiFiControls.Keyboard { diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml index 04ff731a25..06766fa6ef 100644 --- a/interface/resources/qml/controls/WebView.qml +++ b/interface/resources/qml/controls/WebView.qml @@ -116,6 +116,8 @@ Item { tabletRoot.openBrowserWindow(request, profile); } } + + HiFiControls.WebSpinner { } } HiFiControls.Keyboard {