Add entity list menu option

This commit is contained in:
Ryan Huffman 2015-01-20 12:37:39 -08:00
parent 0d9dbaccf7
commit 8202c84c79

View file

@ -44,10 +44,16 @@ var entityListTool = EntityListTool();
var hasShownPropertiesTool = false; var hasShownPropertiesTool = false;
var entityListVisible = false;
selectionManager.addEventListener(function() { selectionManager.addEventListener(function() {
selectionDisplay.updateHandles(); selectionDisplay.updateHandles();
if (selectionManager.hasSelection() && !hasShownPropertiesTool) { if (selectionManager.hasSelection() && !hasShownPropertiesTool) {
// Open properties and model list, but force selection of model list tab
propertiesTool.setVisible(false);
entityListTool.setVisible(false);
propertiesTool.setVisible(true); propertiesTool.setVisible(true);
entityListTool.setVisible(true);
hasShownPropertiesTool = true; hasShownPropertiesTool = true;
} }
}); });
@ -232,7 +238,6 @@ var toolBar = (function () {
cameraManager.disable(); cameraManager.disable();
} else { } else {
hasShownPropertiesTool = false; hasShownPropertiesTool = false;
entityListTool.setVisible(true);
cameraManager.enable(); cameraManager.enable();
gridTool.setVisible(true); gridTool.setVisible(true);
grid.setEnabled(true); grid.setEnabled(true);
@ -703,6 +708,8 @@ function setupModelMenus() {
Menu.addMenuItem({ menuName: "File", menuItemName: "Export Models", shortcutKey: "CTRL+META+E", afterItem: "Models" }); Menu.addMenuItem({ menuName: "File", menuItemName: "Export Models", shortcutKey: "CTRL+META+E", afterItem: "Models" });
Menu.addMenuItem({ menuName: "File", menuItemName: "Import Models", shortcutKey: "CTRL+META+I", afterItem: "Export Models" }); Menu.addMenuItem({ menuName: "File", menuItemName: "Import Models", shortcutKey: "CTRL+META+I", afterItem: "Export Models" });
Menu.addMenuItem({ menuName: "Tools", menuItemName: "Entity List...", shortcutKey: "CTRL+META+L", afterItem: "Tool Window" });
Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_INSPECT_TOOL_ENABLED, Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_INSPECT_TOOL_ENABLED,
isCheckable: true, isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) == "true" }); isCheckable: true, isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) == "true" });
@ -727,6 +734,8 @@ function cleanupModelMenus() {
Menu.removeMenuItem("File", "Export Models"); Menu.removeMenuItem("File", "Export Models");
Menu.removeMenuItem("File", "Import Models"); Menu.removeMenuItem("File", "Import Models");
Menu.removeMenuItem("Tools", "Entity List...");
Menu.removeMenuItem("View", MENU_INSPECT_TOOL_ENABLED); Menu.removeMenuItem("View", MENU_INSPECT_TOOL_ENABLED);
Menu.removeMenuItem("View", MENU_EASE_ON_FOCUS); Menu.removeMenuItem("View", MENU_EASE_ON_FOCUS);
} }
@ -797,6 +806,10 @@ function handeMenuEvent(menuItem) {
} }
} else if (menuItem == "Import Models") { } else if (menuItem == "Import Models") {
modelImporter.doImport(); modelImporter.doImport();
} else if (menuItem == "Entity List...") {
if (isActive) {
entityListTool.toggleVisible();
}
} }
tooltip.show(false); tooltip.show(false);
} }