mirror of
https://github.com/overte-org/overte.git
synced 2025-07-26 07:26:37 +02:00
make editVoxels.js and editModels.js play nice together with the delete menu item
This commit is contained in:
parent
8b51cd0d8a
commit
cad5e12aad
2 changed files with 36 additions and 11 deletions
|
@ -766,18 +766,30 @@ function mouseReleaseEvent(event) {
|
||||||
glowedModelID.isKnownID = false;
|
glowedModelID.isKnownID = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// In order for editVoxels and editModels to play nice together, they each check to see if a "delete" menu item already
|
||||||
|
// exists. If it doesn't they add it. If it does they don't. They also only delete the menu item if they were the one that
|
||||||
|
// added it.
|
||||||
|
var modelMenuAddedDelete = false;
|
||||||
function setupModelMenus() {
|
function setupModelMenus() {
|
||||||
|
print("setupModelMenus()");
|
||||||
// add our menuitems
|
// add our menuitems
|
||||||
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Models", isSeparator: true, beforeItem: "Physics" });
|
if (!Menu.menuItemExists("Edit","Delete")) {
|
||||||
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Delete", shortcutKeyEvent: { text: "backspace" }, afterItem: "Models" });
|
print("no delete... adding ours");
|
||||||
|
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Models", isSeparator: true, beforeItem: "Physics" });
|
||||||
|
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Delete",
|
||||||
|
shortcutKeyEvent: { text: "backspace" }, afterItem: "Models" });
|
||||||
|
modelMenuAddedDelete = true;
|
||||||
|
} else {
|
||||||
|
print("delete exists... don't add ours");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function cleanupModelMenus() {
|
function cleanupModelMenus() {
|
||||||
// delete our menuitems
|
if (modelMenuAddedDelete) {
|
||||||
Menu.removeSeparator("Edit", "Models");
|
// delete our menuitems
|
||||||
Menu.removeMenuItem("Edit", "Delete");
|
Menu.removeSeparator("Edit", "Models");
|
||||||
|
Menu.removeMenuItem("Edit", "Delete");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function scriptEnding() {
|
function scriptEnding() {
|
||||||
|
|
|
@ -1117,7 +1117,12 @@ function keyReleaseEvent(event) {
|
||||||
trackKeyReleaseEvent(event); // used by preview support
|
trackKeyReleaseEvent(event); // used by preview support
|
||||||
}
|
}
|
||||||
|
|
||||||
function setupMenus() {
|
|
||||||
|
// In order for editVoxels and editModels to play nice together, they each check to see if a "delete" menu item already
|
||||||
|
// exists. If it doesn't they add it. If it does they don't. They also only delete the menu item if they were the one that
|
||||||
|
// added it.
|
||||||
|
var voxelMenuAddedDelete = false;
|
||||||
|
function setupVoxelMenus() {
|
||||||
// hook up menus
|
// hook up menus
|
||||||
Menu.menuItemEvent.connect(menuItemEvent);
|
Menu.menuItemEvent.connect(menuItemEvent);
|
||||||
|
|
||||||
|
@ -1127,7 +1132,13 @@ function setupMenus() {
|
||||||
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Copy", shortcutKey: "CTRL+C", afterItem: "Cut" });
|
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Copy", shortcutKey: "CTRL+C", afterItem: "Cut" });
|
||||||
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Paste", shortcutKey: "CTRL+V", afterItem: "Copy" });
|
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Paste", shortcutKey: "CTRL+V", afterItem: "Copy" });
|
||||||
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Nudge", shortcutKey: "CTRL+N", afterItem: "Paste" });
|
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Nudge", shortcutKey: "CTRL+N", afterItem: "Paste" });
|
||||||
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Delete", shortcutKeyEvent: { text: "backspace" }, afterItem: "Nudge" });
|
|
||||||
|
|
||||||
|
if (!Menu.menuItemExists("Edit","Delete")) {
|
||||||
|
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Delete",
|
||||||
|
shortcutKeyEvent: { text: "backspace" }, afterItem: "Nudge" });
|
||||||
|
voxelMenuAddedDelete = true;
|
||||||
|
}
|
||||||
|
|
||||||
Menu.addMenuItem({ menuName: "File", menuItemName: "Voxels", isSeparator: true, beforeItem: "Settings" });
|
Menu.addMenuItem({ menuName: "File", menuItemName: "Voxels", isSeparator: true, beforeItem: "Settings" });
|
||||||
Menu.addMenuItem({ menuName: "File", menuItemName: "Export Voxels", shortcutKey: "CTRL+E", afterItem: "Voxels" });
|
Menu.addMenuItem({ menuName: "File", menuItemName: "Export Voxels", shortcutKey: "CTRL+E", afterItem: "Voxels" });
|
||||||
|
@ -1141,7 +1152,9 @@ function cleanupMenus() {
|
||||||
Menu.removeMenuItem("Edit", "Copy");
|
Menu.removeMenuItem("Edit", "Copy");
|
||||||
Menu.removeMenuItem("Edit", "Paste");
|
Menu.removeMenuItem("Edit", "Paste");
|
||||||
Menu.removeMenuItem("Edit", "Nudge");
|
Menu.removeMenuItem("Edit", "Nudge");
|
||||||
Menu.removeMenuItem("Edit", "Delete");
|
if (voxelMenuAddedDelete) {
|
||||||
|
Menu.removeMenuItem("Edit", "Delete");
|
||||||
|
}
|
||||||
Menu.removeSeparator("File", "Voxels");
|
Menu.removeSeparator("File", "Voxels");
|
||||||
Menu.removeMenuItem("File", "Export Voxels");
|
Menu.removeMenuItem("File", "Export Voxels");
|
||||||
Menu.removeMenuItem("File", "Import Voxels");
|
Menu.removeMenuItem("File", "Import Voxels");
|
||||||
|
@ -1482,4 +1495,4 @@ Script.scriptEnding.connect(scriptEnding);
|
||||||
|
|
||||||
Script.update.connect(update);
|
Script.update.connect(update);
|
||||||
|
|
||||||
setupMenus();
|
setupVoxelMenus();
|
||||||
|
|
Loading…
Reference in a new issue