moved files

scripts/system/create/EditEntityList.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

scripts/system/create/EditTools.qml

@@ -37,7 +37,7 @@ StackView {
     }
 
     function pushSource(path) {
-        var item = Qt.createComponent(Qt.resolvedUrl("../../" + path));
+        var item = Qt.createComponent(Qt.resolvedUrl(path));
         editRoot.push(item, itemProperties,
                       StackView.Immediate);
         editRoot.currentItem.sendToScript.connect(editRoot.sendToScript);

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

scripts/system/create/NewMaterialDialog.qml

@@ -15,7 +15,7 @@ import QtQuick.Dialogs 1.2 as OriginalDialogs
 
 import stylesUit 1.0
 import controlsUit 1.0
-import "../dialogs"
+import "qrc:////qml//hifi//dialogs"
 
 Rectangle {
     id: newMaterialDialog

scripts/system/create/NewModelDialog.qml

@@ -14,7 +14,7 @@ import QtQuick.Dialogs 1.2 as OriginalDialogs
 
 import stylesUit 1.0
 import controlsUit 1.0
-import "../dialogs"
+import "qrc:////qml//hifi//dialogs"
 
 Rectangle {
     id: newModelDialog

scripts/system/edit.js

@@ -43,9 +43,8 @@ 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.resourcesPath() + "qml/hifi/tablet/EditTools.qml",
+    Script.resolvePath("create/EditTools.qml"),
     'Create Tools',
     'com.highfidelity.create.createToolsWindow',
     function () {
@@ -812,7 +811,7 @@ var toolBar = (function () {
         tablet.screenChanged.connect(function (type, url) {
             var isGoingToHomescreenOnDesktop = (!shouldUseEditTabletApp() &&
                 (url === 'hifi/tablet/TabletHome.qml' || url === ''));
-            if (isActive && (type !== "QML" || url !== "hifi/tablet/Edit.qml") && !isGoingToHomescreenOnDesktop) {
+            if (isActive && (type !== "QML" || url !== Script.resolvePath("create/Edit.qml")) && !isGoingToHomescreenOnDesktop) {
                 that.setActive(false);
             }
         });
@@ -841,10 +840,10 @@ var toolBar = (function () {
                 if (shouldUseEditTabletApp()) {
                     // tablet version of new-model dialog
                     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-                    tablet.pushOntoStack("hifi/tablet/New" + entityType + "Dialog.qml");
+                    tablet.pushOntoStack(Script.resolvePath("create/New" + entityType + "Dialog.qml"));
                 } else {
                     closeExistingDialogWindow();
-                    var qmlPath = Script.resourcesPath() + "qml/hifi/tablet/New" + entityType + "Window.qml";
+                    var qmlPath = Script.resourcesPath() + Script.resolvePath("create/New" + entityType + "Window.qml");
                     var DIALOG_WINDOW_SIZE = { x: 500, y: 300 };
                     dialogWindow = Desktop.createWindow(qmlPath, {
                         title: "New " + entityType + " Entity",
@@ -965,7 +964,7 @@ var toolBar = (function () {
             Controller.disableMapping(CONTROLLER_MAPPING_NAME);
         } else {
             if (shouldUseEditTabletApp()) {
-                tablet.loadQMLSource("hifi/tablet/Edit.qml", true);
+                tablet.loadQMLSource(Script.resolvePath("create/Edit.qml"), true);
             } else {
                 // make other apps inactive while in desktop mode
                 tablet.gotoHomeScreen();

scripts/system/libraries/entityList.js

@@ -37,7 +37,7 @@ EntityListTool = function(shouldUseEditTabletApp) {
     var ENTITY_LIST_WIDTH = 495;
     var MAX_DEFAULT_CREATE_TOOLS_HEIGHT = 778;
     var entityListWindow = new CreateWindow(
-        Script.resolvePath("EditEntityList.qml"),
+        Script.resolvePath("../create/EditEntityList.qml"),
         'Entity List',
         'com.highfidelity.create.entityListWindow',
         function () {