From 9ecffd626e2b80456c07e73c6a87690a5f6a689a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 28 Apr 2016 09:01:03 +1200 Subject: [PATCH 1/4] Capitalize title of directory window from "directory" to "Directory" --- scripts/system/directory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/directory.js b/scripts/system/directory.js index cf9aa6aba7..42f35a77db 100644 --- a/scripts/system/directory.js +++ b/scripts/system/directory.js @@ -17,7 +17,7 @@ var toolIconUrl = Script.resolvePath("assets/images/tools/"); var DIRECTORY_WINDOW_URL = "https://metaverse.highfidelity.com/directory"; var directoryWindow = new OverlayWebWindow({ - title: 'directory', + title: 'Directory', source: "about:blank", width: 900, height: 700, From 16874baf5f4da43be5f1c2e4a365985e9b738616 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 28 Apr 2016 11:14:39 +1200 Subject: [PATCH 2/4] Use UI Toolkit border styles for various dialogs File > Help... File > About Interface Settings > Avatar Settings > Browse Go To button (directory.js) Examples button (examples.js) --- interface/resources/qml/InfoView.qml | 22 ++++++++--- interface/resources/qml/QmlWebWindow.qml | 39 +++++++++++++------ .../resources/qml/controls-uit/WebView.qml | 2 + .../qml/dialogs/preferences/AvatarBrowser.qml | 19 +++++++-- 4 files changed, 60 insertions(+), 22 deletions(-) diff --git a/interface/resources/qml/InfoView.qml b/interface/resources/qml/InfoView.qml index 2e93c401d4..ecf928b7f7 100644 --- a/interface/resources/qml/InfoView.qml +++ b/interface/resources/qml/InfoView.qml @@ -1,8 +1,18 @@ +// +// DefaultFrame.qml +// +// Created by Bradley Austin Davis on 27 Apr 2015 +// Copyright 2015 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 import Hifi 1.0 as Hifi -import "controls" -import "windows" as Windows +import "controls-uit" +import "windows-uit" as Windows Windows.Window { id: root @@ -12,16 +22,16 @@ Windows.Window { Hifi.InfoView { id: infoView - // Fill the client area - anchors.fill: parent - + width: pane.contentWidth + implicitHeight: pane.scrollHeight + WebView { id: webview objectName: "WebView" anchors.fill: parent url: infoView.url } - } + } Component.onCompleted: { centerWindow(root); diff --git a/interface/resources/qml/QmlWebWindow.qml b/interface/resources/qml/QmlWebWindow.qml index 70c8afd298..d58456746a 100644 --- a/interface/resources/qml/QmlWebWindow.qml +++ b/interface/resources/qml/QmlWebWindow.qml @@ -1,11 +1,21 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 +// +// DefaultFrame.qml +// +// Created by Bradley Austin Davis on 17 Dec 2015 +// Copyright 2015 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 +import QtQuick.Controls 1.4 import QtWebEngine 1.1 import QtWebChannel 1.0 -import "windows" as Windows -import "controls" as Controls -import "styles" +import "windows-uit" as Windows +import "controls-uit" as Controls +import "styles-uit" Windows.Window { id: root @@ -29,11 +39,16 @@ Windows.Window { // missing signal signal sendToScript(var message); - Controls.WebView { - id: webview - url: "about:blank" - anchors.fill: parent - focus: true - webChannel.registeredObjects: [eventBridgeWrapper] + Item { + width: pane.contentWidth + implicitHeight: pane.scrollHeight + + Controls.WebView { + id: webview + url: "about:blank" + anchors.fill: parent + focus: true + webChannel.registeredObjects: [eventBridgeWrapper] + } } -} // dialog +} diff --git a/interface/resources/qml/controls-uit/WebView.qml b/interface/resources/qml/controls-uit/WebView.qml index 5ea4b22baf..e6005d5dcf 100644 --- a/interface/resources/qml/controls-uit/WebView.qml +++ b/interface/resources/qml/controls-uit/WebView.qml @@ -15,6 +15,8 @@ WebEngineView { id: root property var newUrl; + profile.httpUserAgent: "Mozilla/5.0 Chrome (HighFidelityInterface)" + Component.onCompleted: { console.log("Connecting JS messaging to Hifi Logging") // Ensure the JS from the web-engine makes it to our logging diff --git a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml index cdeddb5886..64c46e4f18 100644 --- a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml +++ b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml @@ -1,10 +1,20 @@ +// +// WebView.qml +// +// Created by Bradley Austin Davis on 30 Aug 2015 +// Copyright 2015 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 import QtQuick.Controls 1.4 import QtWebEngine 1.1 -import "../../windows" as Windows -import "../../controls" as Controls -import "../../styles" +import "../../windows-uit" as Windows +import "../../controls-uit" as Controls +import "../../styles-uit" Windows.Window { id: root @@ -14,7 +24,8 @@ Windows.Window { modality: Qt.ApplicationModal Item { - anchors.fill: parent + width: pane.contentWidth + implicitHeight: pane.scrollHeight Controls.WebView { id: webview From e5ee98ee60ed3cf6b7eb81fabe4060c4e5503fef Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 28 Apr 2016 11:19:30 +1200 Subject: [PATCH 3/4] Fix up filenames in headers --- interface/resources/qml/InfoView.qml | 2 +- interface/resources/qml/QmlWebWindow.qml | 2 +- interface/resources/qml/dialogs/preferences/AvatarBrowser.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/InfoView.qml b/interface/resources/qml/InfoView.qml index ecf928b7f7..c5dba7e1f3 100644 --- a/interface/resources/qml/InfoView.qml +++ b/interface/resources/qml/InfoView.qml @@ -1,5 +1,5 @@ // -// DefaultFrame.qml +// InfoView.qml // // Created by Bradley Austin Davis on 27 Apr 2015 // Copyright 2015 High Fidelity, Inc. diff --git a/interface/resources/qml/QmlWebWindow.qml b/interface/resources/qml/QmlWebWindow.qml index d58456746a..ae052879db 100644 --- a/interface/resources/qml/QmlWebWindow.qml +++ b/interface/resources/qml/QmlWebWindow.qml @@ -1,5 +1,5 @@ // -// DefaultFrame.qml +// QmlWebWindow.qml // // Created by Bradley Austin Davis on 17 Dec 2015 // Copyright 2015 High Fidelity, Inc. diff --git a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml index 64c46e4f18..2fc2af1a6a 100644 --- a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml +++ b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml @@ -1,5 +1,5 @@ // -// WebView.qml +// AvatarBrowser.qml // // Created by Bradley Austin Davis on 30 Aug 2015 // Copyright 2015 High Fidelity, Inc. From 6b8109f16422a4f6d17e9fd92fea63e0f292d599 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 29 Apr 2016 12:42:10 +1200 Subject: [PATCH 4/4] Fix avatar browser top border height and remove separate "close" button --- .../resources/qml/dialogs/preferences/AvatarBrowser.qml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml index 2fc2af1a6a..e5bc9b80ef 100644 --- a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml +++ b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml @@ -29,16 +29,9 @@ Windows.Window { Controls.WebView { id: webview - anchors { top: parent.top; left: parent.left; right: parent.right; bottom: closeButton.top; margins: 8 } + anchors.fill: parent url: "https://metaverse.highfidelity.com/marketplace?category=avatars" focus: true } - - Button { - id: closeButton - anchors { bottom: parent.bottom; right: parent.right; margins: 8 } - text: "Close" - onClicked: root.destroy(); - } } }