From e802d0ec12921dc6b813fcd9e4610e4add6331b0 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Mon, 11 Mar 2024 22:35:03 -0400 Subject: [PATCH 1/9] Add "Copy ID" Add "Copy ID" on entity list menu and contextual menu. --- .../system/create/entityList/html/js/entityList.js | 14 +++++++++++++- .../entityList/html/js/entityListContextMenu.js | 6 ++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js index 99e2851d96..2e43be159e 100644 --- a/scripts/system/create/entityList/html/js/entityList.js +++ b/scripts/system/create/entityList/html/js/entityList.js @@ -1,6 +1,6 @@ // entityList.js // -// Created by Ryan Huffman on 19 Nov 2014 +// Created by Ryan Huffman on November 19th, 2014 // Copyright 2014 High Fidelity, Inc. // Copyright 2020 Vircadia contributors. // Copyright 2024 Overte e.V. @@ -328,6 +328,7 @@ function loaded() { elToolsMenu = document.getElementById("tools"); elMenuBackgroundOverlay = document.getElementById("menuBackgroundOverlay"); elHmdCopy = document.getElementById("hmdcopy"); + elHmdCopyID = document.getElementById("hmdcopyid"); elHmdCut = document.getElementById("hmdcut"); elHmdPaste = document.getElementById("hmdpaste"); elHmdDuplicate = document.getElementById("hmdduplicate"); @@ -424,6 +425,10 @@ function loaded() { EventBridge.emitWebEvent(JSON.stringify({ type: "copy" })); closeAllEntityListMenu(); }; + elHmdCopyID.onclick = function() { + EventBridge.emitWebEvent(JSON.stringify({ type: "copyID" })); + closeAllEntityListMenu(); + }; elHmdCut.onclick = function() { EventBridge.emitWebEvent(JSON.stringify({ type: "cut" })); closeAllEntityListMenu(); @@ -822,6 +827,9 @@ function loaded() { case "Copy": EventBridge.emitWebEvent(JSON.stringify({ type: "copy" })); break; + case "Copy ID": + EventBridge.emitWebEvent(JSON.stringify({ type: "copyID" })); + break; case "Paste": EventBridge.emitWebEvent(JSON.stringify({ type: "paste" })); break; @@ -862,6 +870,10 @@ function loaded() { enabledContextMenuItems.push("Rename"); enabledContextMenuItems.push("Delete"); } + + if (selectedEntities.length === 1) { + enabledContextMenuItems.push("Copy ID"); + } entityListContextMenu.open(clickEvent, entityID, enabledContextMenuItems); } diff --git a/scripts/system/create/entityList/html/js/entityListContextMenu.js b/scripts/system/create/entityList/html/js/entityListContextMenu.js index d71719f252..f4b07f21b8 100644 --- a/scripts/system/create/entityList/html/js/entityListContextMenu.js +++ b/scripts/system/create/entityList/html/js/entityListContextMenu.js @@ -1,9 +1,10 @@ // // entityListContextMenu.js // -// exampleContextMenus.js was originally created by David Rowe on 22 Aug 2018. -// Modified to entityListContextMenu.js by Thijs Wenker on 10 Oct 2018 +// exampleContextMenus.js was originally created by David Rowe on August 22nd, 2018. +// Modified to entityListContextMenu.js by Thijs Wenker on October 10th, 2018 // Copyright 2018 High Fidelity, Inc. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -137,6 +138,7 @@ EntityListContextMenu.prototype = { this._addListItem("Cut"); this._addListItem("Copy"); + this._addListItem("Copy ID"); this._addListItem("Paste"); this._addListSeparator(); this._addListItem("Rename"); From 2f3aefc9262bef67b23e64725e32a8bae3ee93d2 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Mon, 11 Mar 2024 22:36:01 -0400 Subject: [PATCH 2/9] Add "Copy ID" --- scripts/system/create/entityList/html/entityList.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/system/create/entityList/html/entityList.html b/scripts/system/create/entityList/html/entityList.html index 38ea66832b..1884431d65 100644 --- a/scripts/system/create/entityList/html/entityList.html +++ b/scripts/system/create/entityList/html/entityList.html @@ -122,6 +122,12 @@
Ctrl-C
+ From e29549e711be26fb7077a205da0560b8dbd407d8 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:36:03 -0400 Subject: [PATCH 8/9] Copy ID(s) on multiple selection Copy ID(s) on multiple selection --- scripts/system/create/entityList/entityList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/create/entityList/entityList.js b/scripts/system/create/entityList/entityList.js index 4332a15565..b8cb3bba33 100644 --- a/scripts/system/create/entityList/entityList.js +++ b/scripts/system/create/entityList/entityList.js @@ -352,7 +352,7 @@ var EntityListTool = function(shouldUseEditTabletApp, selectionManager) { } else if (data.type === "copy") { that.selectionManager.copySelectedEntities(); } else if (data.type === "copyID") { - that.selectionManager.copyIdFromSelectedEntity(); + that.selectionManager.copyIdsFromSelectedEntities(); } else if (data.type === "paste") { that.selectionManager.pasteEntities(); } else if (data.type === "duplicate") { From 7c8044d27b8800cf1145bb8903842d17b58c8e62 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:36:45 -0400 Subject: [PATCH 9/9] Copy ID(s) on multiple selection Copy ID(s) on multiple selection --- .../create/entitySelectionTool/entitySelectionTool.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/system/create/entitySelectionTool/entitySelectionTool.js b/scripts/system/create/entitySelectionTool/entitySelectionTool.js index 9c377fc9e6..b3559b3a67 100644 --- a/scripts/system/create/entitySelectionTool/entitySelectionTool.js +++ b/scripts/system/create/entitySelectionTool/entitySelectionTool.js @@ -496,12 +496,15 @@ SelectionManager = (function() { that.createApp.deleteSelectedEntities(); }; - that.copyIdFromSelectedEntity = function() { - if (that.selections.length !== 1) { + that.copyIdsFromSelectedEntities = function() { + if (that.selections.length === 0) { audioFeedback.rejection(); - } else { + } else if (that.selections.length === 1) { Window.copyToClipboard(that.selections[0]); audioFeedback.confirmation(); + } else { + Window.copyToClipboard(JSON.stringify(that.selections)); + audioFeedback.confirmation(); } };