Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-25 21:09:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixing paths

Browse source
This commit is contained in:
RebeccaStankus 2019-06-18 10:39:45 -07:00
parent cd508a5475
commit 3b53e34c95
4 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/create/EditTabView.qml
View file

@ -1,8 +1,8 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import QtWebChannel 1.0 import QtWebChannel 1.0
import "../../controls" import "qrc:////qml//controls"
import "../toolbars" import "qrc:////qml//hifi//toolbars"
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import controlsUit 1.0 as HifiControls import controlsUit 1.0 as HifiControls
import stylesUit 1.0 import stylesUit 1.0

18
scripts/system/create/EditToolsTabView.qml
View file

@ -78,7 +78,7 @@ TabBar {
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/94-model-01.svg" icon: "create-icons/94-model-01.svg"
text: "MODEL" text: "MODEL"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({
@ -90,7 +90,7 @@ TabBar {
} }
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/21-cube-01.svg" icon: "create-icons/21-cube-01.svg"
text: "SHAPE" text: "SHAPE"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({
@ -102,7 +102,7 @@ TabBar {
} }
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/24-light-01.svg" icon: "create-icons/24-light-01.svg"
text: "LIGHT" text: "LIGHT"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({
@ -114,7 +114,7 @@ TabBar {
} }
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/20-text-01.svg" icon: "create-icons/20-text-01.svg"
text: "TEXT" text: "TEXT"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({
@ -126,7 +126,7 @@ TabBar {
} }
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/image.svg" icon: "create-icons/image.svg"
text: "IMAGE" text: "IMAGE"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({
@ -138,7 +138,7 @@ TabBar {
} }
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/25-web-1-01.svg" icon: "create-icons/25-web-1-01.svg"
text: "WEB" text: "WEB"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({
@ -150,7 +150,7 @@ TabBar {
} }
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/23-zone-01.svg" icon: "create-icons/23-zone-01.svg"
text: "ZONE" text: "ZONE"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({
@ -162,7 +162,7 @@ TabBar {
} }
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/90-particles-01.svg" icon: "create-icons/90-particles-01.svg"
text: "PARTICLE" text: "PARTICLE"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({
@ -174,7 +174,7 @@ TabBar {
} }
NewEntityButton { NewEntityButton {
icon: "build/interface/Release/scripts/system/create/create-icons/126-material-01.svg" icon: "create-icons/126-material-01.svg"
text: "MATERIAL" text: "MATERIAL"
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({

12
scripts/system/create/NewEntityButton.qml
View file

@ -6,7 +6,7 @@ Item {
id: newEntityButton id: newEntityButton
property var uuid; property var uuid;
property string text: "ENTITY" property string text: "ENTITY"
property string icon: "icons/edit-icon.svg" property string icon: Path.resources + "icons/edit-icon.svg"
property string activeText: newEntityButton.text property string activeText: newEntityButton.text
property string activeIcon: newEntityButton.icon property string activeIcon: newEntityButton.icon
property bool isActive: false property bool isActive: false
@ -47,14 +47,6 @@ Item {
anchors.topMargin: 0 anchors.topMargin: 0
} }
function urlHelper(src) {
if (src.match(/\bhttp/)) {
return src;
} else {
return "../../../" + src;
}
}
Rectangle { Rectangle {
id: buttonOutline id: buttonOutline
color: "#00000000" color: "#00000000"
@ -96,7 +88,7 @@ Item {
anchors.bottomMargin: 5 anchors.bottomMargin: 5
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
fillMode: Image.Stretch fillMode: Image.Stretch
source: newEntityButton.urlHelper(newEntityButton.icon) source: newEntityButton.icon
} }
ColorOverlay { ColorOverlay {

3
scripts/system/edit.js
View file

@ -43,6 +43,7 @@ var CREATE_TOOLS_WIDTH = 490;
var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942; var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942;
var DEFAULT_IMAGE = "https://hifi-content.s3.amazonaws.com/DomainContent/production/no-image.jpg"; var DEFAULT_IMAGE = "https://hifi-content.s3.amazonaws.com/DomainContent/production/no-image.jpg";
var createToolsWindow = new CreateWindow( var createToolsWindow = new CreateWindow(
Script.resolvePath("create/EditTools.qml"), Script.resolvePath("create/EditTools.qml"),
'Create Tools', 'Create Tools',
@ -843,7 +844,7 @@ var toolBar = (function () {
tablet.pushOntoStack(Script.resolvePath("create/New" + entityType + "Dialog.qml")); tablet.pushOntoStack(Script.resolvePath("create/New" + entityType + "Dialog.qml"));
} else { } else {
closeExistingDialogWindow(); closeExistingDialogWindow();
var qmlPath = Script.resourcesPath() + Script.resolvePath("create/New" + entityType + "Window.qml"); var qmlPath = Script.resolvePath("create/New" + entityType + "Window.qml");
var DIALOG_WINDOW_SIZE = { x: 500, y: 300 }; var DIALOG_WINDOW_SIZE = { x: 500, y: 300 };
dialogWindow = Desktop.createWindow(qmlPath, { dialogWindow = Desktop.createWindow(qmlPath, {
title: "New " + entityType + " Entity", title: "New " + entityType + " Entity",