Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-15 20:59:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hook up qml button to edit.js

Browse source
This commit is contained in:
Faye Li 2017-03-17 11:22:07 -07:00
parent 10ebb6efd7
commit 6531efffbc
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/tablet/Edit.qml
View file

@ -186,6 +186,11 @@ StackView {
anchors.leftMargin: 55 anchors.leftMargin: 55
anchors.top: assetServerButton.bottom anchors.top: assetServerButton.bottom
anchors.topMargin: 20 anchors.topMargin: 20
onClicked: {
editRoot.sendToScript({
method: "newEntityButtonClicked", params: { buttonName: "importEntitiesButton" }
});
}
} }
} }
} }

16
scripts/system/edit.js
View file

@ -294,7 +294,21 @@ var toolBar = (function () {
that.toggle(); that.toggle();
}); });
addButton("openAssetBrowserButton", "assets-01.svg", function(){ addButton("importEntitiesButton", "assets-01.svg", function() {
var importURL = null;
var fullPath = Window.browse("Select Model to Import", "", "*.json");
if (fullPath) {
importURL = "file:///" + fullPath;
}
if (importURL) {
if (!isActive && (Entities.canRez() && Entities.canRezTmp())) {
toolBar.toggle();
}
importSVO(importURL);
}
});
addButton("openAssetBrowserButton", "assets-01.svg", function() {
Window.showAssetServer(); Window.showAssetServer();
}); });