From 6aca2fcf076303758244b41c33c401bd5e50bb5f Mon Sep 17 00:00:00 2001 From: RebeccaStankus Date: Mon, 24 Jun 2019 14:01:51 -0700 Subject: [PATCH] Working on new file structure --- script-archive/light_modifier/README.md | 2 +- .../light_modifier/lightModifier.js | 4 +-- scripts/defaultScripts.js | 4 +-- .../assets/data/createAppTooltips.json | 0 scripts/system/{ => create}/edit.js | 26 +++++++++---------- .../entityList}/entityList.js | 2 +- .../entityList}/html/entityList.html | 12 ++++----- .../entityList}/html/js/entityList.js | 0 .../html/js/entityListContextMenu.js | 0 .../entityList}/html/js/listView.js | 0 .../{ => entityList/qml}/EditEntityList.qml | 2 +- .../{ => entityList/qml}/EntityList.qml | 2 +- .../html/entityProperties.html | 12 ++++----- .../html/js/createAppTooltip.js | 0 .../html/js/draggableNumber.js | 0 .../html/js/entityProperties.js | 0 .../html/js/underscore-min.js | 0 .../entitySelectionTool.js | 6 ++--- .../{ => create}/modules/createWindow.js | 0 .../modules/entityShapeVisualizer.js | 0 scripts/system/create/{ => qml}/Edit.qml | 0 .../system/create/{ => qml}/EditTabButton.qml | 0 .../system/create/{ => qml}/EditTabView.qml | 24 ++++++++--------- scripts/system/create/{ => qml}/EditTools.qml | 0 .../create/{ => qml}/EditToolsTabView.qml | 22 ++++++++-------- .../create/{ => qml}/NewEntityButton.qml | 0 .../create/{ => qml}/NewMaterialDialog.qml | 0 .../create/{ => qml}/NewMaterialWindow.qml | 0 .../create/{ => qml}/NewModelDialog.qml | 0 .../create/{ => qml}/NewModelWindow.qml | 0 .../icons}/126-material-01.svg | 0 .../icons}/20-text-01.svg | 0 .../icons}/21-cube-01.svg | 0 .../icons}/22-sphere-01.svg | 0 .../icons}/23-zone-01.svg | 0 .../icons}/24-light-01.svg | 0 .../icons}/25-web-1-01.svg | 0 .../icons}/90-particles-01.svg | 0 .../icons}/94-model-01.svg | 0 .../{create-icons => qml/icons}/image.svg | 0 scripts/system/libraries/EditEntityList.qml | 12 --------- .../libraries/{ => gridTool}/gridTool.js | 0 .../gridTool}/html/gridControls.html | 12 ++++----- .../gridTool}/html/js/colpick.js | 0 .../gridTool}/html/js/gridControls.js | 0 scripts/system/marketplaces/marketplaces.js | 2 +- 46 files changed, 66 insertions(+), 78 deletions(-) rename scripts/system/{ => create}/assets/data/createAppTooltips.json (100%) rename scripts/system/{ => create}/edit.js (99%) rename scripts/system/{libraries => create/entityList}/entityList.js (99%) rename scripts/system/{ => create/entityList}/html/entityList.html (89%) rename scripts/system/{ => create/entityList}/html/js/entityList.js (100%) rename scripts/system/{ => create/entityList}/html/js/entityListContextMenu.js (100%) rename scripts/system/{ => create/entityList}/html/js/listView.js (100%) rename scripts/system/create/{ => entityList/qml}/EditEntityList.qml (82%) rename scripts/system/create/{ => entityList/qml}/EntityList.qml (58%) rename scripts/system/{ => create/entityProperties}/html/entityProperties.html (78%) rename scripts/system/{ => create/entityProperties}/html/js/createAppTooltip.js (100%) rename scripts/system/{ => create/entityProperties}/html/js/draggableNumber.js (100%) rename scripts/system/{ => create/entityProperties}/html/js/entityProperties.js (100%) rename scripts/system/{ => create/entityProperties}/html/js/underscore-min.js (100%) rename scripts/system/{libraries => create/entitySelectionTool}/entitySelectionTool.js (99%) rename scripts/system/{ => create}/modules/createWindow.js (100%) rename scripts/system/{ => create}/modules/entityShapeVisualizer.js (100%) rename scripts/system/create/{ => qml}/Edit.qml (100%) rename scripts/system/create/{ => qml}/EditTabButton.qml (100%) rename scripts/system/create/{ => qml}/EditTabView.qml (93%) rename scripts/system/create/{ => qml}/EditTools.qml (100%) rename scripts/system/create/{ => qml}/EditToolsTabView.qml (93%) rename scripts/system/create/{ => qml}/NewEntityButton.qml (100%) rename scripts/system/create/{ => qml}/NewMaterialDialog.qml (100%) rename scripts/system/create/{ => qml}/NewMaterialWindow.qml (100%) rename scripts/system/create/{ => qml}/NewModelDialog.qml (100%) rename scripts/system/create/{ => qml}/NewModelWindow.qml (100%) rename scripts/system/create/{create-icons => qml/icons}/126-material-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/20-text-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/21-cube-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/22-sphere-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/23-zone-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/24-light-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/25-web-1-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/90-particles-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/94-model-01.svg (100%) rename scripts/system/create/{create-icons => qml/icons}/image.svg (100%) delete mode 100644 scripts/system/libraries/EditEntityList.qml rename scripts/system/libraries/{ => gridTool}/gridTool.js (100%) rename scripts/system/{ => libraries/gridTool}/html/gridControls.html (85%) rename scripts/system/{ => libraries/gridTool}/html/js/colpick.js (100%) rename scripts/system/{ => libraries/gridTool}/html/js/gridControls.js (100%) diff --git a/script-archive/light_modifier/README.md b/script-archive/light_modifier/README.md index f23bd25dda..d78fe3ef41 100644 --- a/script-archive/light_modifier/README.md +++ b/script-archive/light_modifier/README.md @@ -18,7 +18,7 @@ When you run the lightLoader.js script, several scripts will be loaded: - visiblePanel.js (the transparent panel) - closeButton.js (for closing the ui) - ../libraries/lightOverlayManager.js (shows 2d overlays for lights in the world) -- ../libraries/entitySelectionTool.js (visualizes volume of the lights) +- ../../scripts/system/create/entitySelectionTool/entitySelectionTool.js (visualizes volume of the lights) Current sliders are (top to bottom): red diff --git a/script-archive/light_modifier/lightModifier.js b/script-archive/light_modifier/lightModifier.js index 0c691e2b2e..1080777721 100644 --- a/script-archive/light_modifier/lightModifier.js +++ b/script-archive/light_modifier/lightModifier.js @@ -33,8 +33,8 @@ var PARENT_SCRIPT_URL = Script.resolvePath('lightParent.js?' + Math.random(0 - 1 if (SHOW_OVERLAYS === true) { - Script.include('../libraries/gridTool.js'); - Script.include('../libraries/entitySelectionTool.js?' + Math.random(0 - 100)); + Script.include('../../libraries/gridTool/gridTool.js'); + Script.include('../../scripts/system/create/entitySelectionTool/entitySelectionTool.js?' + Math.random(0 - 100)); Script.include('../libraries/lightOverlayManager.js'); var grid = Grid(); diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index e392680df9..607ee3165b 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -27,7 +27,7 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/marketplaces/marketplaces.js", "system/notifications.js", "system/commerce/wallet.js", - "system/edit.js", + "system/create/edit.js", "system/dialTone.js", "system/firstPersonHMD.js", "system/tablet-ui/tabletUI.js", @@ -36,7 +36,7 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/audioMuteOverlay.js" ]; var DEFAULT_SCRIPTS_SEPARATE = [ - "system/controllers/controllerScripts.js", + "system/controllers/controllerScripts.js" //"system/chat.js" ]; diff --git a/scripts/system/assets/data/createAppTooltips.json b/scripts/system/create/assets/data/createAppTooltips.json similarity index 100% rename from scripts/system/assets/data/createAppTooltips.json rename to scripts/system/create/assets/data/createAppTooltips.json diff --git a/scripts/system/edit.js b/scripts/system/create/edit.js similarity index 99% rename from scripts/system/edit.js rename to scripts/system/create/edit.js index cf99f3a618..4c13a70a5d 100644 --- a/scripts/system/edit.js +++ b/scripts/system/create/edit.js @@ -24,16 +24,16 @@ var EDIT_TOGGLE_BUTTON = "com.highfidelity.interface.system.editButton"; var CONTROLLER_MAPPING_NAME = "com.highfidelity.editMode"; Script.include([ - "libraries/stringHelpers.js", - "libraries/dataViewHelpers.js", - "libraries/progressDialog.js", - "libraries/entitySelectionTool.js", - "libraries/ToolTip.js", - "libraries/entityCameraTool.js", - "libraries/gridTool.js", - "libraries/entityList.js", - "libraries/utils.js", - "libraries/entityIconOverlayManager.js" + "../libraries/stringHelpers.js", + "../libraries/dataViewHelpers.js", + "../libraries/progressDialog.js", + "../libraries/ToolTip.js", + "../libraries/entityCameraTool.js", + "../libraries/utils.js", + "../libraries/entityIconOverlayManager.js", + "../libraries/gridTool/gridTool.js", + "entityList/entityList.js", + "entitySelectionTool/entitySelectionTool.js" ]); var CreateWindow = Script.require('./modules/createWindow.js'); @@ -45,7 +45,7 @@ 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"), + Script.resolvePath("./qml/EditTools.qml"), 'Create Tools', 'com.highfidelity.create.createToolsWindow', function () { @@ -174,7 +174,7 @@ var IMPORTING_SVO_OVERLAY_HEIGHT = 30; var IMPORTING_SVO_OVERLAY_MARGIN = 5; var IMPORTING_SVO_OVERLAY_LEFT_MARGIN = 34; var importingSVOImageOverlay = Overlays.addOverlay("image", { - imageURL: Script.resolvePath("assets") + "/images/hourglass.svg", + imageURL: Script.resolvePath("../assets/images/hourglass.svg"), width: 20, height: 20, alpha: 1.0, @@ -812,7 +812,7 @@ var toolBar = (function () { tablet.screenChanged.connect(function (type, url) { var isGoingToHomescreenOnDesktop = (!shouldUseEditTabletApp() && (url === 'hifi/tablet/TabletHome.qml' || url === '')); - if (isActive && (type !== "QML" || url !== Script.resolvePath("create/Edit.qml")) && !isGoingToHomescreenOnDesktop) { + if (isActive && (type !== "QML" || url !== Script.resolvePath("./qml/Edit.qml")) && !isGoingToHomescreenOnDesktop) { that.setActive(false); } }); diff --git a/scripts/system/libraries/entityList.js b/scripts/system/create/entityList/entityList.js similarity index 99% rename from scripts/system/libraries/entityList.js rename to scripts/system/create/entityList/entityList.js index 585e4e06a5..06e100f457 100644 --- a/scripts/system/libraries/entityList.js +++ b/scripts/system/create/entityList/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("../create/EditEntityList.qml"), + Script.resolvePath("./qml/EditEntityList.qml"), 'Entity List', 'com.highfidelity.create.entityListWindow', function () { diff --git a/scripts/system/html/entityList.html b/scripts/system/create/entityList/html/entityList.html similarity index 89% rename from scripts/system/html/entityList.html rename to scripts/system/create/entityList/html/entityList.html index 986e5c09b0..3e17a66df5 100644 --- a/scripts/system/html/entityList.html +++ b/scripts/system/create/entityList/html/entityList.html @@ -11,15 +11,15 @@ Entity List - + - - - + + + + + - - diff --git a/scripts/system/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js similarity index 100% rename from scripts/system/html/js/entityList.js rename to scripts/system/create/entityList/html/js/entityList.js diff --git a/scripts/system/html/js/entityListContextMenu.js b/scripts/system/create/entityList/html/js/entityListContextMenu.js similarity index 100% rename from scripts/system/html/js/entityListContextMenu.js rename to scripts/system/create/entityList/html/js/entityListContextMenu.js diff --git a/scripts/system/html/js/listView.js b/scripts/system/create/entityList/html/js/listView.js similarity index 100% rename from scripts/system/html/js/listView.js rename to scripts/system/create/entityList/html/js/listView.js diff --git a/scripts/system/create/EditEntityList.qml b/scripts/system/create/entityList/qml/EditEntityList.qml similarity index 82% rename from scripts/system/create/EditEntityList.qml rename to scripts/system/create/entityList/qml/EditEntityList.qml index 94935c7bb5..1d5beb9914 100644 --- a/scripts/system/create/EditEntityList.qml +++ b/scripts/system/create/entityList/qml/EditEntityList.qml @@ -10,7 +10,7 @@ import stylesUit 1.0 WebView { id: entityListToolWebView - url: Paths.defaultScripts + "/system/html/entityList.html" + url: Qt.resolvedUrl("../html/entityList.html") enabled: true blurOnCtrlShift: false } diff --git a/scripts/system/create/EntityList.qml b/scripts/system/create/entityList/qml/EntityList.qml similarity index 58% rename from scripts/system/create/EntityList.qml rename to scripts/system/create/entityList/qml/EntityList.qml index 2f8a8863be..a70fc6d15d 100644 --- a/scripts/system/create/EntityList.qml +++ b/scripts/system/create/entityList/qml/EntityList.qml @@ -1,6 +1,6 @@ WebView { id: entityListToolWebView - url: Paths.defaultScripts + "/system/html/entityList.html" + url: QT.resolvedURL("../html/entityList.html") enabled: true blurOnCtrlShift: false } diff --git a/scripts/system/html/entityProperties.html b/scripts/system/create/entityProperties/html/entityProperties.html similarity index 78% rename from scripts/system/html/entityProperties.html rename to scripts/system/create/entityProperties/html/entityProperties.html index 67f03a33a2..7d18b9898c 100644 --- a/scripts/system/html/entityProperties.html +++ b/scripts/system/create/entityProperties/html/entityProperties.html @@ -12,19 +12,19 @@ Properties - - + + - - + + + + - - diff --git a/scripts/system/html/js/createAppTooltip.js b/scripts/system/create/entityProperties/html/js/createAppTooltip.js similarity index 100% rename from scripts/system/html/js/createAppTooltip.js rename to scripts/system/create/entityProperties/html/js/createAppTooltip.js diff --git a/scripts/system/html/js/draggableNumber.js b/scripts/system/create/entityProperties/html/js/draggableNumber.js similarity index 100% rename from scripts/system/html/js/draggableNumber.js rename to scripts/system/create/entityProperties/html/js/draggableNumber.js diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js similarity index 100% rename from scripts/system/html/js/entityProperties.js rename to scripts/system/create/entityProperties/html/js/entityProperties.js diff --git a/scripts/system/html/js/underscore-min.js b/scripts/system/create/entityProperties/html/js/underscore-min.js similarity index 100% rename from scripts/system/html/js/underscore-min.js rename to scripts/system/create/entityProperties/html/js/underscore-min.js diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/create/entitySelectionTool/entitySelectionTool.js similarity index 99% rename from scripts/system/libraries/entitySelectionTool.js rename to scripts/system/create/entitySelectionTool/entitySelectionTool.js index 3fdc1d6652..9c993d6d73 100644 --- a/scripts/system/libraries/entitySelectionTool.js +++ b/scripts/system/create/entitySelectionTool/entitySelectionTool.js @@ -21,9 +21,9 @@ const SPACE_WORLD = "world"; const HIGHLIGHT_LIST_NAME = "editHandleHighlightList"; Script.include([ - "./controllers.js", - "./controllerDispatcherUtils.js", - "./utils.js" + "../../libraries/controllers.js", + "../../libraries/controllerDispatcherUtils.js", + "../../libraries/utils.js" ]); diff --git a/scripts/system/modules/createWindow.js b/scripts/system/create/modules/createWindow.js similarity index 100% rename from scripts/system/modules/createWindow.js rename to scripts/system/create/modules/createWindow.js diff --git a/scripts/system/modules/entityShapeVisualizer.js b/scripts/system/create/modules/entityShapeVisualizer.js similarity index 100% rename from scripts/system/modules/entityShapeVisualizer.js rename to scripts/system/create/modules/entityShapeVisualizer.js diff --git a/scripts/system/create/Edit.qml b/scripts/system/create/qml/Edit.qml similarity index 100% rename from scripts/system/create/Edit.qml rename to scripts/system/create/qml/Edit.qml diff --git a/scripts/system/create/EditTabButton.qml b/scripts/system/create/qml/EditTabButton.qml similarity index 100% rename from scripts/system/create/EditTabButton.qml rename to scripts/system/create/qml/EditTabButton.qml diff --git a/scripts/system/create/EditTabView.qml b/scripts/system/create/qml/EditTabView.qml similarity index 93% rename from scripts/system/create/EditTabView.qml rename to scripts/system/create/qml/EditTabView.qml index 7e8789487c..ad6c11c348 100644 --- a/scripts/system/create/EditTabView.qml +++ b/scripts/system/create/qml/EditTabView.qml @@ -72,7 +72,7 @@ TabBar { NewEntityButton { - icon: "create-icons/94-model-01.svg" + icon: "icons/94-model-01.svg" text: "MODEL" onClicked: { editRoot.sendToScript({ @@ -84,7 +84,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/21-cube-01.svg" + icon: "icons/21-cube-01.svg" text: "SHAPE" onClicked: { editRoot.sendToScript({ @@ -96,7 +96,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/24-light-01.svg" + icon: "icons/24-light-01.svg" text: "LIGHT" onClicked: { editRoot.sendToScript({ @@ -108,7 +108,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/20-text-01.svg" + icon: "icons/20-text-01.svg" text: "TEXT" onClicked: { editRoot.sendToScript({ @@ -120,7 +120,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/image.svg" + icon: "icons/image.svg" text: "IMAGE" onClicked: { editRoot.sendToScript({ @@ -132,7 +132,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/25-web-1-01.svg" + icon: "icons/25-web-1-01.svg" text: "WEB" onClicked: { editRoot.sendToScript({ @@ -144,7 +144,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/23-zone-01.svg" + icon: "icons/23-zone-01.svg" text: "ZONE" onClicked: { editRoot.sendToScript({ @@ -156,7 +156,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/90-particles-01.svg" + icon: "icons/90-particles-01.svg" text: "PARTICLE" onClicked: { editRoot.sendToScript({ @@ -168,7 +168,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/126-material-01.svg" + icon: "icons/126-material-01.svg" text: "MATERIAL" onClicked: { editRoot.sendToScript({ @@ -231,7 +231,7 @@ TabBar { property Component visualItem: Component { WebView { id: entityListToolWebView - url: Paths.defaultScripts + "/system/html/entityList.html" + url: Qt.resolvedUrl("../entityList/html/entityList.html") enabled: true blurOnCtrlShift: false } @@ -247,7 +247,7 @@ TabBar { property Component visualItem: Component { WebView { id: entityPropertiesWebView - url: Paths.defaultScripts + "/system/html/entityProperties.html" + url: Paths.defaultScripts + "/entityProperties/html/entityProperties.html" enabled: true blurOnCtrlShift: false } @@ -263,7 +263,7 @@ TabBar { property Component visualItem: Component { WebView { id: gridControlsWebView - url: Paths.defaultScripts + "/system/html/gridControls.html" + url: Paths.defaultScripts + "../../libraries/gridTool/html/gridControls.html" enabled: true blurOnCtrlShift: false } diff --git a/scripts/system/create/EditTools.qml b/scripts/system/create/qml/EditTools.qml similarity index 100% rename from scripts/system/create/EditTools.qml rename to scripts/system/create/qml/EditTools.qml diff --git a/scripts/system/create/EditToolsTabView.qml b/scripts/system/create/qml/EditToolsTabView.qml similarity index 93% rename from scripts/system/create/EditToolsTabView.qml rename to scripts/system/create/qml/EditToolsTabView.qml index a333acc586..53ee9e6e1e 100644 --- a/scripts/system/create/EditToolsTabView.qml +++ b/scripts/system/create/qml/EditToolsTabView.qml @@ -78,7 +78,7 @@ TabBar { NewEntityButton { - icon: "create-icons/94-model-01.svg" + icon: "icons/94-model-01.svg" text: "MODEL" onClicked: { editRoot.sendToScript({ @@ -90,7 +90,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/21-cube-01.svg" + icon: "icons/21-cube-01.svg" text: "SHAPE" onClicked: { editRoot.sendToScript({ @@ -102,7 +102,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/24-light-01.svg" + icon: "icons/24-light-01.svg" text: "LIGHT" onClicked: { editRoot.sendToScript({ @@ -114,7 +114,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/20-text-01.svg" + icon: "icons/20-text-01.svg" text: "TEXT" onClicked: { editRoot.sendToScript({ @@ -126,7 +126,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/image.svg" + icon: "icons/image.svg" text: "IMAGE" onClicked: { editRoot.sendToScript({ @@ -138,7 +138,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/25-web-1-01.svg" + icon: "icons/25-web-1-01.svg" text: "WEB" onClicked: { editRoot.sendToScript({ @@ -150,7 +150,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/23-zone-01.svg" + icon: "icons/23-zone-01.svg" text: "ZONE" onClicked: { editRoot.sendToScript({ @@ -162,7 +162,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/90-particles-01.svg" + icon: "icons/90-particles-01.svg" text: "PARTICLE" onClicked: { editRoot.sendToScript({ @@ -174,7 +174,7 @@ TabBar { } NewEntityButton { - icon: "create-icons/126-material-01.svg" + icon: "icons/126-material-01.svg" text: "MATERIAL" onClicked: { editRoot.sendToScript({ @@ -237,7 +237,7 @@ TabBar { property Component visualItem: Component { WebView { id: entityPropertiesWebView - url: Paths.defaultScripts + "/system/html/entityProperties.html" + url: Qt.resolvedUrl("../entityProperties/html/entityProperties.html") enabled: true blurOnCtrlShift: false } @@ -253,7 +253,7 @@ TabBar { property Component visualItem: Component { WebView { id: gridControlsWebView - url: Paths.defaultScripts + "/system/html/gridControls.html" + url: Qt.resolvedURL("../gridTool/html/gridControls.html") enabled: true blurOnCtrlShift: false } diff --git a/scripts/system/create/NewEntityButton.qml b/scripts/system/create/qml/NewEntityButton.qml similarity index 100% rename from scripts/system/create/NewEntityButton.qml rename to scripts/system/create/qml/NewEntityButton.qml diff --git a/scripts/system/create/NewMaterialDialog.qml b/scripts/system/create/qml/NewMaterialDialog.qml similarity index 100% rename from scripts/system/create/NewMaterialDialog.qml rename to scripts/system/create/qml/NewMaterialDialog.qml diff --git a/scripts/system/create/NewMaterialWindow.qml b/scripts/system/create/qml/NewMaterialWindow.qml similarity index 100% rename from scripts/system/create/NewMaterialWindow.qml rename to scripts/system/create/qml/NewMaterialWindow.qml diff --git a/scripts/system/create/NewModelDialog.qml b/scripts/system/create/qml/NewModelDialog.qml similarity index 100% rename from scripts/system/create/NewModelDialog.qml rename to scripts/system/create/qml/NewModelDialog.qml diff --git a/scripts/system/create/NewModelWindow.qml b/scripts/system/create/qml/NewModelWindow.qml similarity index 100% rename from scripts/system/create/NewModelWindow.qml rename to scripts/system/create/qml/NewModelWindow.qml diff --git a/scripts/system/create/create-icons/126-material-01.svg b/scripts/system/create/qml/icons/126-material-01.svg similarity index 100% rename from scripts/system/create/create-icons/126-material-01.svg rename to scripts/system/create/qml/icons/126-material-01.svg diff --git a/scripts/system/create/create-icons/20-text-01.svg b/scripts/system/create/qml/icons/20-text-01.svg similarity index 100% rename from scripts/system/create/create-icons/20-text-01.svg rename to scripts/system/create/qml/icons/20-text-01.svg diff --git a/scripts/system/create/create-icons/21-cube-01.svg b/scripts/system/create/qml/icons/21-cube-01.svg similarity index 100% rename from scripts/system/create/create-icons/21-cube-01.svg rename to scripts/system/create/qml/icons/21-cube-01.svg diff --git a/scripts/system/create/create-icons/22-sphere-01.svg b/scripts/system/create/qml/icons/22-sphere-01.svg similarity index 100% rename from scripts/system/create/create-icons/22-sphere-01.svg rename to scripts/system/create/qml/icons/22-sphere-01.svg diff --git a/scripts/system/create/create-icons/23-zone-01.svg b/scripts/system/create/qml/icons/23-zone-01.svg similarity index 100% rename from scripts/system/create/create-icons/23-zone-01.svg rename to scripts/system/create/qml/icons/23-zone-01.svg diff --git a/scripts/system/create/create-icons/24-light-01.svg b/scripts/system/create/qml/icons/24-light-01.svg similarity index 100% rename from scripts/system/create/create-icons/24-light-01.svg rename to scripts/system/create/qml/icons/24-light-01.svg diff --git a/scripts/system/create/create-icons/25-web-1-01.svg b/scripts/system/create/qml/icons/25-web-1-01.svg similarity index 100% rename from scripts/system/create/create-icons/25-web-1-01.svg rename to scripts/system/create/qml/icons/25-web-1-01.svg diff --git a/scripts/system/create/create-icons/90-particles-01.svg b/scripts/system/create/qml/icons/90-particles-01.svg similarity index 100% rename from scripts/system/create/create-icons/90-particles-01.svg rename to scripts/system/create/qml/icons/90-particles-01.svg diff --git a/scripts/system/create/create-icons/94-model-01.svg b/scripts/system/create/qml/icons/94-model-01.svg similarity index 100% rename from scripts/system/create/create-icons/94-model-01.svg rename to scripts/system/create/qml/icons/94-model-01.svg diff --git a/scripts/system/create/create-icons/image.svg b/scripts/system/create/qml/icons/image.svg similarity index 100% rename from scripts/system/create/create-icons/image.svg rename to scripts/system/create/qml/icons/image.svg diff --git a/scripts/system/libraries/EditEntityList.qml b/scripts/system/libraries/EditEntityList.qml deleted file mode 100644 index 4fc5ff19ef..0000000000 --- a/scripts/system/libraries/EditEntityList.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.2 -import QtWebChannel 1.0 -import QtGraphicalEffects 1.0 -import "qrc:///qml/controls" as HifiControls - -HifiControls.WebView { - id: entityListToolWebView - url: Qt.resolvedUrl("../html/entityList.html") - enabled: true - blurOnCtrlShift: false -} diff --git a/scripts/system/libraries/gridTool.js b/scripts/system/libraries/gridTool/gridTool.js similarity index 100% rename from scripts/system/libraries/gridTool.js rename to scripts/system/libraries/gridTool/gridTool.js diff --git a/scripts/system/html/gridControls.html b/scripts/system/libraries/gridTool/html/gridControls.html similarity index 85% rename from scripts/system/html/gridControls.html rename to scripts/system/libraries/gridTool/html/gridControls.html index 8d6ee34bc0..d6c56033dd 100644 --- a/scripts/system/html/gridControls.html +++ b/scripts/system/libraries/gridTool/html/gridControls.html @@ -9,14 +9,14 @@ --> - - - + + + - - - + + + diff --git a/scripts/system/html/js/colpick.js b/scripts/system/libraries/gridTool/html/js/colpick.js similarity index 100% rename from scripts/system/html/js/colpick.js rename to scripts/system/libraries/gridTool/html/js/colpick.js diff --git a/scripts/system/html/js/gridControls.js b/scripts/system/libraries/gridTool/html/js/gridControls.js similarity index 100% rename from scripts/system/html/js/gridControls.js rename to scripts/system/libraries/gridTool/html/js/gridControls.js diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index 38287e3af3..5c7623066b 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -17,7 +17,7 @@ var selectionDisplay = null; // for gridTool.js to ignore (function () { // BEGIN LOCAL_SCOPE var AppUi = Script.require('appUi'); -Script.include("/~/system/libraries/gridTool.js"); +Script.include("/~/system/libraries/gridTool/gridTool.js"); Script.include("/~/system/libraries/connectionUtils.js"); Script.include("/~/system/libraries/accountUtils.js");