Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-30 07:10:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

start on moving edit.js to tablet

Browse source
This commit is contained in:
Seth Alves 2017-02-09 14:03:01 -08:00
parent c5085681df
commit 4c3a6842a5
9 changed files with 56 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/html/createGlobalEventBridge.js
View file

@ -27,6 +27,10 @@ var EventBridge;
};
};
console.log("---");
console.log("CREATING GLOBAL EVENT BRIDGE");
console.log("---");
EventBridge = new TempEventBridge();
var webChannel = new QWebChannel(qt.webChannelTransport, function (channel) {

2
interface/resources/qml/controls-uit/BaseWebView.qml
View file

@ -15,7 +15,7 @@ import HFWebEngineProfile 1.0
WebEngineView {
id: root
profile: desktop.browserProfile
// profile: desktop.browserProfile
Component.onCompleted: {
console.log("Connecting JS messaging to Hifi Logging")

8
interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
View file

@ -84,14 +84,10 @@ Item {
topMenu.focus = true;
topMenu.forceActiveFocus();
// show current menu level on nav bar
if (topMenu.objectName === "") {
if (topMenu.objectName === "" || menuStack.length === 1) {
breadcrumbText.text = "Menu";
} else {
if (menuStack.length === 1) {
breadcrumbText.text = "Menu";
} else {
breadcrumbText.text = topMenu.objectName;
}
breadcrumbText.text = topMenu.objectName;
}
} else {
breadcrumbText.text = "Menu";

17
interface/src/ui/overlays/Web3DOverlay.cpp
View file

@ -133,12 +133,29 @@ QString Web3DOverlay::pickURL() {
void Web3DOverlay::loadSourceURL() {
// if (_javaScriptToInject == "") {
// QString javaScriptToInject;
// QFile webChannelFile(":qtwebchannel/qwebchannel.js");
// QFile createGlobalEventBridgeFile(PathUtils::resourcesPath() + "/html/createGlobalEventBridge.js");
// if (webChannelFile.open(QFile::ReadOnly | QFile::Text) &&
// createGlobalEventBridgeFile.open(QFile::ReadOnly | QFile::Text)) {
// QString webChannelStr = QTextStream(&webChannelFile).readAll();
// QString createGlobalEventBridgeStr = QTextStream(&createGlobalEventBridgeFile).readAll();
// // concatenate these js files
// _javaScriptToInject = webChannelStr + createGlobalEventBridgeStr;
// }
// }
QUrl sourceUrl(_url);
if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" ||
_url.toLower().endsWith(".htm") || _url.toLower().endsWith(".html")) {
_webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
_webSurface->load("Web3DOverlay.qml");
// _webSurface->load("Web3DOverlay.qml", [&](QQmlContext* context, QObject* obj) {
// qDebug() << "Web3DOverlay::loadSourceURL -- " << _javaScriptToInject;
// context->setContextProperty("eventBridgeJavaScriptToInject", QVariant(_javaScriptToInject));
// });
_webSurface->resume();
_webSurface->getRootItem()->setProperty("url", _url);
_webSurface->getRootItem()->setProperty("scriptURL", _scriptURL);

2
interface/src/ui/overlays/Web3DOverlay.h
View file

@ -82,6 +82,8 @@ private:
QMetaObject::Connection _emitScriptEventConnection;
QMetaObject::Connection _webEventReceivedConnection;
// QString _javaScriptToInject;
};
#endif // hifi_Web3DOverlay_h

12
libraries/script-engine/src/TabletScriptingInterface.cpp
View file

@ -215,6 +215,7 @@ void TabletProxy::gotoMenuScreen() {
void TabletProxy::loadQMLSource(const QVariant& path) {
if (_qmlTabletRoot) {
if (_state != State::QML) {
// _qmlTabletRoot->setProperty("eventBridge", QVariant::fromValue(_qmlOffscreenSurface));
QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, path));
_state = State::QML;
}
@ -370,7 +371,7 @@ QQuickItem* TabletProxy::getQmlTablet() const {
}
QQuickItem* TabletProxy::getQmlMenu() const {
if (!_qmlTabletRoot) {
if (!_qmlTabletRoot) {
return nullptr;
}
@ -391,6 +392,15 @@ QQuickItem* TabletProxy::getQmlMenu() const {
return menuList;
}
QQuickItem* TabletProxy::findChild(QString childName) const {
if (!_qmlTabletRoot) {
return nullptr;
}
return _qmlTabletRoot->findChild<QQuickItem*>(childName);
}
//
// TabletButtonProxy
//

2
libraries/script-engine/src/TabletScriptingInterface.h
View file

@ -130,6 +130,8 @@ public:
QQuickItem* getQmlMenu() const;
Q_INVOKABLE QQuickItem* findChild(QString childName) const;
signals:
/**jsdoc
* Signaled when this tablet receives an event from the html/js embedded in the tablet

27
scripts/system/edit.js
View file

@ -457,7 +457,7 @@ var toolBar = (function () {
that.toggle = function () {
that.setActive(!isActive);
activeButton.editProperties({isActive: isActive});
// activeButton.editProperties({isActive: isActive});
};
that.setActive = function (active) {
@ -1436,11 +1436,12 @@ var ServerScriptStatusMonitor = function(entityID, statusCallback) {
var PropertiesTool = function (opts) {
var that = {};
var webView = new OverlayWebWindow({
title: 'Entity Properties',
source: ENTITY_PROPERTIES_URL,
toolWindow: true
});
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
// var webView = new OverlayWebWindow({
// title: 'Entity Properties',
// source: ENTITY_PROPERTIES_URL,
// toolWindow: true
// });
var visible = false;
@ -1449,16 +1450,20 @@ var PropertiesTool = function (opts) {
var currentSelectedEntityID = null;
var statusMonitor = null;
webView.setVisible(visible);
// webView.setVisible(visible);
that.setVisible = function (newVisible) {
print("PropertiesTool.setVisible --> " + newVisible);
visible = newVisible;
webView.setVisible(visible);
// webView.setVisible(visible);
if (visible) {
tablet.loadQMLSource("Edit.qml");
}
};
function updateScriptStatus(info) {
info.type = "server_script_status";
webView.emitScriptEvent(JSON.stringify(info));
tablet.emitScriptEvent(JSON.stringify(info));
};
function resetScriptStatus() {
@ -1510,10 +1515,10 @@ var PropertiesTool = function (opts) {
selections.push(entity);
}
data.selections = selections;
webView.emitScriptEvent(JSON.stringify(data));
tablet.emitScriptEvent(JSON.stringify(data));
});
webView.webEventReceived.connect(function (data) {
tablet.webEventReceived.connect(function (data) {
try {
data = JSON.parse(data);
}

1
scripts/system/html/js/entityProperties.js
View file

@ -710,6 +710,7 @@ function loaded() {
if (window.EventBridge !== undefined) {
var properties;
console.log("HERE -- " + (typeof EventBridge) + " -- " + JSON.stringify(EventBridge));
EventBridge.scriptEventReceived.connect(function(data) {
data = JSON.parse(data);
if (data.type == "server_script_status") {