From 5a49ac9a2219bfd11bc752747f70efb893632be9 Mon Sep 17 00:00:00 2001 From: RebeccaStankus Date: Mon, 17 Jun 2019 12:17:05 -0700 Subject: [PATCH] moved files --- .../tablet => scripts/system/create}/Edit.qml | 0 .../system/create}/EditEntityList.qml | 4 ++-- .../system/create}/EditTabButton.qml | 0 .../system/create}/EditTabView.qml | 0 .../system/create}/EditTools.qml | 2 +- .../system/create}/EditToolsTabView.qml | 22 +++++++++---------- .../system/create}/EntityList.qml | 0 .../system/create}/NewEntityButton.qml | 0 .../system/create}/NewMaterialDialog.qml | 2 +- .../system/create}/NewMaterialWindow.qml | 0 .../system/create}/NewModelDialog.qml | 2 +- .../system/create}/NewModelWindow.qml | 0 .../create}/create-icons/126-material-01.svg | 0 .../create}/create-icons/20-text-01.svg | 0 .../create}/create-icons/21-cube-01.svg | 0 .../create}/create-icons/22-sphere-01.svg | 0 .../create}/create-icons/23-zone-01.svg | 0 .../create}/create-icons/24-light-01.svg | 0 .../create}/create-icons/25-web-1-01.svg | 0 .../create}/create-icons/90-particles-01.svg | 0 .../create}/create-icons/94-model-01.svg | 0 .../system/create}/create-icons/image.svg | 0 scripts/system/edit.js | 11 +++++----- scripts/system/libraries/entityList.js | 2 +- 24 files changed, 22 insertions(+), 23 deletions(-) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/Edit.qml (100%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/EditEntityList.qml (82%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/EditTabButton.qml (100%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/EditTabView.qml (100%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/EditTools.qml (95%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/EditToolsTabView.qml (91%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/EntityList.qml (100%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/NewEntityButton.qml (100%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/NewMaterialDialog.qml (99%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/NewMaterialWindow.qml (100%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/NewModelDialog.qml (99%) rename {interface/resources/qml/hifi/tablet => scripts/system/create}/NewModelWindow.qml (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/126-material-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/20-text-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/21-cube-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/22-sphere-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/23-zone-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/24-light-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/25-web-1-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/90-particles-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/94-model-01.svg (100%) rename {interface/resources/icons => scripts/system/create}/create-icons/image.svg (100%) diff --git a/interface/resources/qml/hifi/tablet/Edit.qml b/scripts/system/create/Edit.qml similarity index 100% rename from interface/resources/qml/hifi/tablet/Edit.qml rename to scripts/system/create/Edit.qml diff --git a/interface/resources/qml/hifi/tablet/EditEntityList.qml b/scripts/system/create/EditEntityList.qml similarity index 82% rename from interface/resources/qml/hifi/tablet/EditEntityList.qml rename to scripts/system/create/EditEntityList.qml index 2afaa8cd82..062d8366c0 100644 --- a/interface/resources/qml/hifi/tablet/EditEntityList.qml +++ b/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 diff --git a/interface/resources/qml/hifi/tablet/EditTabButton.qml b/scripts/system/create/EditTabButton.qml similarity index 100% rename from interface/resources/qml/hifi/tablet/EditTabButton.qml rename to scripts/system/create/EditTabButton.qml diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/scripts/system/create/EditTabView.qml similarity index 100% rename from interface/resources/qml/hifi/tablet/EditTabView.qml rename to scripts/system/create/EditTabView.qml diff --git a/interface/resources/qml/hifi/tablet/EditTools.qml b/scripts/system/create/EditTools.qml similarity index 95% rename from interface/resources/qml/hifi/tablet/EditTools.qml rename to scripts/system/create/EditTools.qml index 976e98cd50..468935b287 100644 --- a/interface/resources/qml/hifi/tablet/EditTools.qml +++ b/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); diff --git a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml b/scripts/system/create/EditToolsTabView.qml similarity index 91% rename from interface/resources/qml/hifi/tablet/EditToolsTabView.qml rename to scripts/system/create/EditToolsTabView.qml index 1f062815b6..8195d3ceb2 100644 --- a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml +++ b/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({ diff --git a/interface/resources/qml/hifi/tablet/EntityList.qml b/scripts/system/create/EntityList.qml similarity index 100% rename from interface/resources/qml/hifi/tablet/EntityList.qml rename to scripts/system/create/EntityList.qml diff --git a/interface/resources/qml/hifi/tablet/NewEntityButton.qml b/scripts/system/create/NewEntityButton.qml similarity index 100% rename from interface/resources/qml/hifi/tablet/NewEntityButton.qml rename to scripts/system/create/NewEntityButton.qml diff --git a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml b/scripts/system/create/NewMaterialDialog.qml similarity index 99% rename from interface/resources/qml/hifi/tablet/NewMaterialDialog.qml rename to scripts/system/create/NewMaterialDialog.qml index dde372648b..84dceb71f7 100644 --- a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml +++ b/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 diff --git a/interface/resources/qml/hifi/tablet/NewMaterialWindow.qml b/scripts/system/create/NewMaterialWindow.qml similarity index 100% rename from interface/resources/qml/hifi/tablet/NewMaterialWindow.qml rename to scripts/system/create/NewMaterialWindow.qml diff --git a/interface/resources/qml/hifi/tablet/NewModelDialog.qml b/scripts/system/create/NewModelDialog.qml similarity index 99% rename from interface/resources/qml/hifi/tablet/NewModelDialog.qml rename to scripts/system/create/NewModelDialog.qml index 9540979479..0e5868bdb6 100644 --- a/interface/resources/qml/hifi/tablet/NewModelDialog.qml +++ b/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 diff --git a/interface/resources/qml/hifi/tablet/NewModelWindow.qml b/scripts/system/create/NewModelWindow.qml similarity index 100% rename from interface/resources/qml/hifi/tablet/NewModelWindow.qml rename to scripts/system/create/NewModelWindow.qml diff --git a/interface/resources/icons/create-icons/126-material-01.svg b/scripts/system/create/create-icons/126-material-01.svg similarity index 100% rename from interface/resources/icons/create-icons/126-material-01.svg rename to scripts/system/create/create-icons/126-material-01.svg diff --git a/interface/resources/icons/create-icons/20-text-01.svg b/scripts/system/create/create-icons/20-text-01.svg similarity index 100% rename from interface/resources/icons/create-icons/20-text-01.svg rename to scripts/system/create/create-icons/20-text-01.svg diff --git a/interface/resources/icons/create-icons/21-cube-01.svg b/scripts/system/create/create-icons/21-cube-01.svg similarity index 100% rename from interface/resources/icons/create-icons/21-cube-01.svg rename to scripts/system/create/create-icons/21-cube-01.svg diff --git a/interface/resources/icons/create-icons/22-sphere-01.svg b/scripts/system/create/create-icons/22-sphere-01.svg similarity index 100% rename from interface/resources/icons/create-icons/22-sphere-01.svg rename to scripts/system/create/create-icons/22-sphere-01.svg diff --git a/interface/resources/icons/create-icons/23-zone-01.svg b/scripts/system/create/create-icons/23-zone-01.svg similarity index 100% rename from interface/resources/icons/create-icons/23-zone-01.svg rename to scripts/system/create/create-icons/23-zone-01.svg diff --git a/interface/resources/icons/create-icons/24-light-01.svg b/scripts/system/create/create-icons/24-light-01.svg similarity index 100% rename from interface/resources/icons/create-icons/24-light-01.svg rename to scripts/system/create/create-icons/24-light-01.svg diff --git a/interface/resources/icons/create-icons/25-web-1-01.svg b/scripts/system/create/create-icons/25-web-1-01.svg similarity index 100% rename from interface/resources/icons/create-icons/25-web-1-01.svg rename to scripts/system/create/create-icons/25-web-1-01.svg diff --git a/interface/resources/icons/create-icons/90-particles-01.svg b/scripts/system/create/create-icons/90-particles-01.svg similarity index 100% rename from interface/resources/icons/create-icons/90-particles-01.svg rename to scripts/system/create/create-icons/90-particles-01.svg diff --git a/interface/resources/icons/create-icons/94-model-01.svg b/scripts/system/create/create-icons/94-model-01.svg similarity index 100% rename from interface/resources/icons/create-icons/94-model-01.svg rename to scripts/system/create/create-icons/94-model-01.svg diff --git a/interface/resources/icons/create-icons/image.svg b/scripts/system/create/create-icons/image.svg similarity index 100% rename from interface/resources/icons/create-icons/image.svg rename to scripts/system/create/create-icons/image.svg diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 371a8d48ca..ba8ab315cf 100644 --- a/scripts/system/edit.js +++ b/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(); diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js index 6498c92f17..585e4e06a5 100644 --- a/scripts/system/libraries/entityList.js +++ b/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 () {