From 810131fa9d9c5d71c14bbc8792ee6bc5dc3dfa4d Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 27 Mar 2015 15:37:32 +0000 Subject: [PATCH] Move Fungus menu items to Tools / Fungus #93 --- Assets/Fungus/Camera/Editor/CameraMenuItems.cs | 2 +- Assets/Fungus/Dialog/Editor/DialogMenuItems.cs | 14 +++++++------- .../FungusScript/Editor/FungusScriptMenuItems.cs | 2 +- .../FungusScript/Editor/FungusScriptWindow.cs | 2 +- .../Fungus/FungusScript/Editor/SequenceEditor.cs | 2 +- Assets/Fungus/FungusScript/Scripts/FungusScript.cs | 1 - Assets/Fungus/Sprite/Editor/SpriteMenuItems.cs | 8 ++++---- .../Thirdparty/Usfxr/Editor/SfxrGenerator.cs | 2 +- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Assets/Fungus/Camera/Editor/CameraMenuItems.cs b/Assets/Fungus/Camera/Editor/CameraMenuItems.cs index a28f3d7e..bdb58ab8 100644 --- a/Assets/Fungus/Camera/Editor/CameraMenuItems.cs +++ b/Assets/Fungus/Camera/Editor/CameraMenuItems.cs @@ -7,7 +7,7 @@ namespace Fungus public class CameraMenuItems { - [MenuItem("GameObject/Fungus/Camera/View")] + [MenuItem("Tools/Fungus/Create/View")] static void CreateView() { FungusScriptMenuItems.SpawnPrefab("View"); diff --git a/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs b/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs index ffd19d79..80cffc97 100644 --- a/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs +++ b/Assets/Fungus/Dialog/Editor/DialogMenuItems.cs @@ -9,43 +9,43 @@ namespace Fungus public class DialogMenuItems { - [MenuItem("GameObject/Fungus/Dialog/Character")] + [MenuItem("Tools/Fungus/Create/Character")] static void CreateCharacter() { FungusScriptMenuItems.SpawnPrefab("Character"); } - [MenuItem("GameObject/Fungus/Dialog/SayDialog")] + [MenuItem("Tools/Fungus/Create/Say Dialog")] static void CreateSayDialog() { FungusScriptMenuItems.SpawnPrefab("SayDialog"); } - [MenuItem("GameObject/Fungus/Dialog/MenuDialog")] + [MenuItem("Tools/Fungus/Create/Menu Dialog")] static void CreateMenuDialog() { FungusScriptMenuItems.SpawnPrefab("MenuDialog"); } - [MenuItem("GameObject/Fungus/Dialog/Tag")] + [MenuItem("Tools/Fungus/Create/Tag")] static void CreateTag() { FungusScriptMenuItems.SpawnPrefab("Tag"); } - [MenuItem("GameObject/Fungus/Dialog/AudioTag")] + [MenuItem("Tools/Fungus/Create/Audio Tag")] static void CreateAudioTag() { FungusScriptMenuItems.SpawnPrefab("AudioTag"); } - [MenuItem("GameObject/Fungus/Portrait/Stage")] + [MenuItem("Tools/Fungus/Create/Stage")] static void CreateStage() { FungusScriptMenuItems.SpawnPrefab("Stage"); } - [MenuItem("GameObject/Fungus/Portrait/StagePosition")] + [MenuItem("Tools/Fungus/Create/Stage Position")] static void CreateStagePosition() { FungusScriptMenuItems.SpawnPrefab("StagePosition"); diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptMenuItems.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptMenuItems.cs index 6f893b36..a8dab0ef 100644 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptMenuItems.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptMenuItems.cs @@ -8,7 +8,7 @@ namespace Fungus public class FungusScriptMenuItems { - [MenuItem("GameObject/Fungus/Fungus Script")] + [MenuItem("Tools/Fungus/Create/Fungus Script")] static void CreateFungusScript() { SpawnPrefab("FungusScript"); diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs index ae6a954f..925404aa 100755 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs @@ -30,7 +30,7 @@ namespace Fungus protected int forceRepaintCount; - [MenuItem("Window/Fungus Script")] + [MenuItem("Tools/Fungus/Show Fungus Script")] static void Init() { GetWindow(typeof(FungusScriptWindow), false, "Fungus Script"); diff --git a/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs b/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs index 8c4f7cab..9ee3e4e4 100644 --- a/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs @@ -468,7 +468,7 @@ namespace Fungus return compare; } - [MenuItem("Tools/Fungus/Export Class Info")] + [MenuItem("Tools/Fungus/Utilities/Export Class Info")] protected static void DumpFungusClassInfo() { string path = EditorUtility.SaveFilePanel("Export strings", "", diff --git a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs index bfa7842b..4f81f8ad 100644 --- a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs +++ b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs @@ -13,7 +13,6 @@ namespace Fungus * FungusScript objects may be edited visually using the Fungus Script editor window. */ [ExecuteInEditMode] - [AddComponentMenu("Fungus/Fungus Script")] public class FungusScript : MonoBehaviour { /** diff --git a/Assets/Fungus/Sprite/Editor/SpriteMenuItems.cs b/Assets/Fungus/Sprite/Editor/SpriteMenuItems.cs index 32479899..a519a232 100644 --- a/Assets/Fungus/Sprite/Editor/SpriteMenuItems.cs +++ b/Assets/Fungus/Sprite/Editor/SpriteMenuItems.cs @@ -7,25 +7,25 @@ namespace Fungus public class SpriteMenuItems { - [MenuItem("GameObject/Fungus/Sprite/ClickableSprite")] + [MenuItem("Tools/Fungus/Create/Clickable Sprite")] static void CreateClickableSprite() { FungusScriptMenuItems.SpawnPrefab("ClickableSprite"); } - [MenuItem("GameObject/Fungus/Sprite/DraggableSprite")] + [MenuItem("Tools/Fungus/Create/Draggable Sprite")] static void CreateDraggableSprite() { FungusScriptMenuItems.SpawnPrefab("DraggableSprite"); } - [MenuItem("GameObject/Fungus/Sprite/DragTargetSprite")] + [MenuItem("Tools/Fungus/Create/Drag Target Sprite")] static void CreateDragTargetSprite() { FungusScriptMenuItems.SpawnPrefab("DragTargetSprite"); } - [MenuItem("GameObject/Fungus/Sprite/ParallaxSprite")] + [MenuItem("Tools/Fungus/Create/Parallax Sprite")] static void CreateParallaxSprite() { FungusScriptMenuItems.SpawnPrefab("ParallaxSprite"); diff --git a/Assets/Fungus/Thirdparty/Usfxr/Editor/SfxrGenerator.cs b/Assets/Fungus/Thirdparty/Usfxr/Editor/SfxrGenerator.cs index cc36ba5d..5157f2a2 100644 --- a/Assets/Fungus/Thirdparty/Usfxr/Editor/SfxrGenerator.cs +++ b/Assets/Fungus/Thirdparty/Usfxr/Editor/SfxrGenerator.cs @@ -63,7 +63,7 @@ public class SfxrGenerator : EditorWindow { // ================================================================================================================ // PUBLIC INTERFACE ----------------------------------------------------------------------------------------------- - [MenuItem("Window/Generate usfxr Sound Effects")] + [MenuItem("Tools/Fungus/Utilities/Generate usfxr Sound Effects")] public static void Initialize() { var window = ScriptableObject.CreateInstance(); window.title = window.name = "Sound Effects";