diff --git a/.idea/.idea.AsmdefHelper/.idea/workspace.xml b/.idea/.idea.AsmdefHelper/.idea/workspace.xml index 9cffde1..afc9746 100644 --- a/.idea/.idea.AsmdefHelper/.idea/workspace.xml +++ b/.idea/.idea.AsmdefHelper/.idea/workspace.xml @@ -3,14 +3,7 @@ - - - - - - - @@ -38,16 +31,16 @@ @@ -111,7 +104,8 @@ - + + diff --git a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs index 10fd791..2cb857b 100644 --- a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs +++ b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs @@ -5,7 +5,7 @@ using UnityEditor.Compilation; namespace AsmdefHelper.DependencyGraph.Editor { public class AsmdefGraphEditorWindow : EditorWindow { - [MenuItem("Window/Open Asmdef Graph Window")] + [MenuItem("Window/Asmdef Helper/Open DependencyGraph", priority = 2000)] public static void Open() { GetWindow("AsmdefGraphWindow"); } diff --git a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs index aa3b6be..120727b 100644 --- a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs +++ b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs @@ -7,15 +7,13 @@ using UnityEngine; namespace AsmdefHelper.MultipleEdit.Editor { public class AsmdefMultiEditWindow : EditorWindow { - static IList windows = new List(); - - [MenuItem("Window/Asmdef Helper/Multiple Edit/1.Search asmdef in project")] + [MenuItem("Window/Asmdef Helper/Find all asmdef in project")] public static void Search() { var projectBrowser = GetWindow(); projectBrowser.SetSearch("t:AssemblyDefinitionAsset"); } - [MenuItem("Window/Asmdef Helper/Multiple Edit/2.Open selected asmdef inspector view")] + [MenuItem("Window/Asmdef Helper/Open selected asmdef inspector view")] public static void Open() { var asmdefs = Selection.GetFiltered(typeof(AssemblyDefinitionAsset), SelectionMode.TopLevel); if (!asmdefs.Any()) { @@ -23,39 +21,12 @@ namespace AsmdefHelper.MultipleEdit.Editor { return; } - CloseWindows(); foreach (var adf in asmdefs) { Selection.objects = new[] { adf }; var w = CreateWindow(); // LockすることでInspectorWindowの表示を固定する w.isLocked = true; - windows.Add(w); } } - - [MenuItem("Window/Asmdef Helper/Multiple Edit/3.All apply and close")] - public static void Apply() { - foreach (var w in windows) { - foreach (var editor in w.tracker.activeEditors) { - var assetImporterEditor = editor as AssetImporterEditor; - - if (assetImporterEditor != null && assetImporterEditor.HasModified()) { - assetImporterEditor.ApplyAndImport(); - } - } - - w.Close(); - } - - windows.Clear(); - } - - static void CloseWindows() { - foreach (var w in windows) { - w.Close(); - } - - windows.Clear(); - } } } diff --git a/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs b/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs index 4a82579..1d6a4e4 100644 --- a/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs +++ b/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs @@ -15,7 +15,7 @@ namespace AsmdefHelper.SyncSolution.Editor { synchronizer = SyncVS.Synchronizer; } - [MenuItem("Window/Asmdef Helper/Sync C# Solution", priority = 1000000)] + [MenuItem("Window/Asmdef Helper/Sync C# Solution", priority = 3000)] public static void Sync() { Sync(true); }