From 3b53e34c95acb9a9515ac21a9f30d458552d6562 Mon Sep 17 00:00:00 2001
From: RebeccaStankus <Rebecca@highfidelity.io>
Date: Tue, 18 Jun 2019 10:39:45 -0700
Subject: [PATCH] fixing paths

---
 scripts/system/create/EditTabView.qml      |  4 ++--
 scripts/system/create/EditToolsTabView.qml | 18 +++++++++---------
 scripts/system/create/NewEntityButton.qml  | 12 ++----------
 scripts/system/edit.js                     |  3 ++-
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/scripts/system/create/EditTabView.qml b/scripts/system/create/EditTabView.qml
index 87db317b17..213f2f560b 100644
--- a/scripts/system/create/EditTabView.qml
+++ b/scripts/system/create/EditTabView.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtWebChannel 1.0
-import "../../controls"
-import "../toolbars"
+import "qrc:////qml//controls"
+import "qrc:////qml//hifi//toolbars"
 import QtGraphicalEffects 1.0
 import controlsUit 1.0 as HifiControls
 import stylesUit 1.0
diff --git a/scripts/system/create/EditToolsTabView.qml b/scripts/system/create/EditToolsTabView.qml
index 8195d3ceb2..cb1aee363b 100644
--- a/scripts/system/create/EditToolsTabView.qml
+++ b/scripts/system/create/EditToolsTabView.qml
@@ -78,7 +78,7 @@ TabBar {
 
 
                         NewEntityButton {
-                            icon: "build/interface/Release/scripts/system/create/create-icons/94-model-01.svg"
+                            icon: "create-icons/94-model-01.svg"
                             text: "MODEL"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -90,7 +90,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "build/interface/Release/scripts/system/create/create-icons/21-cube-01.svg"
+                            icon: "create-icons/21-cube-01.svg"
                             text: "SHAPE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -102,7 +102,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "build/interface/Release/scripts/system/create/create-icons/24-light-01.svg"
+                            icon: "create-icons/24-light-01.svg"
                             text: "LIGHT"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -114,7 +114,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "build/interface/Release/scripts/system/create/create-icons/20-text-01.svg"
+                            icon: "create-icons/20-text-01.svg"
                             text: "TEXT"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -126,7 +126,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "build/interface/Release/scripts/system/create/create-icons/image.svg"
+                            icon: "create-icons/image.svg"
                             text: "IMAGE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -138,7 +138,7 @@ TabBar {
                         }
 
                         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"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -150,7 +150,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "build/interface/Release/scripts/system/create/create-icons/23-zone-01.svg"
+                            icon: "create-icons/23-zone-01.svg"
                             text: "ZONE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -162,7 +162,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "build/interface/Release/scripts/system/create/create-icons/90-particles-01.svg"
+                            icon: "create-icons/90-particles-01.svg"
                             text: "PARTICLE"
                             onClicked: {
                                 editRoot.sendToScript({
@@ -174,7 +174,7 @@ TabBar {
                         }
 
                         NewEntityButton {
-                            icon: "build/interface/Release/scripts/system/create/create-icons/126-material-01.svg"
+                            icon: "create-icons/126-material-01.svg"
                             text: "MATERIAL"
                             onClicked: {
                                 editRoot.sendToScript({
diff --git a/scripts/system/create/NewEntityButton.qml b/scripts/system/create/NewEntityButton.qml
index 1952ef7ee8..9c210ac95a 100644
--- a/scripts/system/create/NewEntityButton.qml
+++ b/scripts/system/create/NewEntityButton.qml
@@ -6,7 +6,7 @@ Item {
     id: newEntityButton
     property var uuid;
     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 activeIcon: newEntityButton.icon
     property bool isActive: false
@@ -47,14 +47,6 @@ Item {
         anchors.topMargin: 0
     }
 
-    function urlHelper(src) {
-        if (src.match(/\bhttp/)) {
-            return src;
-        } else {
-            return "../../../" + src;
-        }
-    }
-
     Rectangle {
         id: buttonOutline
         color: "#00000000"
@@ -96,7 +88,7 @@ Item {
         anchors.bottomMargin: 5
         anchors.horizontalCenter: parent.horizontalCenter
         fillMode: Image.Stretch
-        source: newEntityButton.urlHelper(newEntityButton.icon)
+        source: newEntityButton.icon
     }
 
     ColorOverlay {
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index ba8ab315cf..cf99f3a618 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -43,6 +43,7 @@ var CREATE_TOOLS_WIDTH = 490;
 var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942;
 
 var DEFAULT_IMAGE = "https://hifi-content.s3.amazonaws.com/DomainContent/production/no-image.jpg";
+
 var createToolsWindow = new CreateWindow(
     Script.resolvePath("create/EditTools.qml"),
     'Create Tools',
@@ -843,7 +844,7 @@ var toolBar = (function () {
                     tablet.pushOntoStack(Script.resolvePath("create/New" + entityType + "Dialog.qml"));
                 } else {
                     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 };
                     dialogWindow = Desktop.createWindow(qmlPath, {
                         title: "New " + entityType + " Entity",