diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml index 382acc237c..89ab333a0d 100644 --- a/interface/resources/qml/Browser.qml +++ b/interface/resources/qml/Browser.qml @@ -14,7 +14,8 @@ Window { destroyOnInvisible: true width: 800 height: 600 - + property alias webView: webview + Component.onCompleted: { visible = true addressBar.text = webview.url @@ -28,6 +29,7 @@ Window { } Item { + id:item anchors.fill: parent Rectangle { anchors.left: parent.left @@ -125,12 +127,10 @@ Window { console.log("New icon: " + icon) } - profile: WebEngineProfile { - id: webviewProfile - storageName: "qmlUserBrowser" - } - + profile: desktop.browserProfile + } + } // item Keys.onPressed: { diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml index 6ff66d6192..18080cd448 100644 --- a/interface/resources/qml/controls/WebView.qml +++ b/interface/resources/qml/controls/WebView.qml @@ -53,9 +53,12 @@ WebEngineView { } } - profile: WebEngineProfile { - id: webviewProfile - httpUserAgent: "Mozilla/5.0 (HighFidelityInterface)" - storageName: "qmlWebEngine" + onNewViewRequested:{ + var component = Qt.createComponent("../Browser.qml"); + var newWindow = component.createObject(desktop); + request.openIn(newWindow.webView) } + + + profile: desktop.browserProfile } diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index 5951101194..5227d3cb2e 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -9,7 +9,7 @@ Desktop { id: desktop Component.onCompleted: { - WebEngine.settings.javascriptCanOpenWindows = false; + WebEngine.settings.javascriptCanOpenWindows = true; WebEngine.settings.javascriptCanAccessClipboard = false; WebEngine.settings.spatialNavigationEnabled = true; WebEngine.settings.localContentCanAccessRemoteUrls = true; @@ -19,6 +19,12 @@ Desktop { property alias toolWindow: toolWindow ToolWindow { id: toolWindow } + property var browserProfile: WebEngineProfile { + id: webviewProfile + httpUserAgent: "Chrome/48.0 (HighFidelityInterface)" + storageName: "qmlWebEngine" + } + Action { text: "Open Browser" shortcut: "Ctrl+B"