Skip to content

Commit 12c0220

Browse files
jcs090218jcs090218
committed
fix(Editor): Place menu item under tools
1 parent 562a109 commit 12c0220

File tree

3 files changed

+37
-19
lines changed

3 files changed

+37
-19
lines changed

‎Assets/JCSUnity/Editor/JCSUnity_About.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ public class JCSUnity_About : EditorWindow
2020
{
2121
/* Variables*/
2222

23+
private const string MI_BaseName = JCSUnity_EditorWindow.MI_BaseName;
24+
25+
public const int MI_BasePriority = JCSUnity_EditorWindow.MI_BasePriority;
26+
2327
/* all the .ini file located here. */
2428
public static Dictionary<string, string> EDITOR_INI = new Dictionary<string, string>();
2529

@@ -88,7 +92,7 @@ public static void ReadINIFile()
8892
/// <summary>
8993
/// About JCSUnity.
9094
/// </summary>
91-
[MenuItem("JCSUnity/About", false, 100)]
95+
[MenuItem(MI_BaseName + "/About", false, MI_BasePriority + 100)]
9296
public static void AboutJCSUnity()
9397
{
9498
var window = CreateInstance<JCSUnity_About>();

‎Assets/JCSUnity/Editor/JCSUnity_EditorWindow.cs‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ public class JCSUnity_EditorWindow : EditorWindow
2121
{
2222
/* Variables*/
2323

24+
public const string MI_BaseName = "Tools/JCSUnity";
25+
26+
public const int MI_BasePriority = -24;
27+
2428
public static JCSUnity_EditorWindow instance = null;
2529

2630
public static string NAME
@@ -42,8 +46,8 @@ public static string NAME
4246
private bool mFO_Input = false;
4347
private bool mFO_Tool = false;
4448

45-
public string PROJECT_NAME = "";
46-
public const string PROJECT_NAME_LASTING = "_Assets";
49+
public string PROJECT_NAME = "_Project";
50+
public const string PROJECT_NAME_SUFFIX = "";
4751
public string[] ProjectSubFolders = {
4852
"Animations",
4953
"Editor",
@@ -297,7 +301,7 @@ private void Part_Tool()
297301
/// <summary>
298302
/// Main editor window initialize function.
299303
/// </summary>
300-
[MenuItem("JCSUnity/Window", false, 1)]
304+
[MenuItem(MI_BaseName + "/Window", false, MI_BasePriority + 1)]
301305
private static void JCSUnityEditor()
302306
{
303307
JCSUnity_EditorWindow window = GetWindow<JCSUnity_EditorWindow>(false, NAME, true);
@@ -307,7 +311,7 @@ private static void JCSUnityEditor()
307311
/// <summary>
308312
/// Serialize the current scene into 2D style.
309313
/// </summary>
310-
[MenuItem("JCSUnity/Scene/Convert to 2D scene", false, 2)]
314+
[MenuItem(MI_BaseName + "/Scene/Convert to 2D scene", false, MI_BasePriority + 2)]
311315
private static void ConvertTo2D()
312316
{
313317
// create settings
@@ -334,7 +338,7 @@ private static void ConvertTo2D()
334338
/// <summary>
335339
/// Serialize the current scene into 3D style.
336340
/// </summary>
337-
[MenuItem("JCSUnity/Scene/Convert to 3D scene", false, 2)]
341+
[MenuItem(MI_BaseName + "/Scene/Convert to 3D scene", false, MI_BasePriority + 2)]
338342
private static void ConvertTo3D()
339343
{
340344
// create settings
@@ -356,7 +360,7 @@ private static void ConvertTo3D()
356360
/// <summary>
357361
/// Create managers for 3d game combine with JCSUnity.
358362
/// </summary>
359-
[MenuItem("JCSUnity/Basic/Create Managers", false, 10)]
363+
[MenuItem(MI_BaseName + "/Basic/Create Managers", false, MI_BasePriority + 10)]
360364
private static GameObject CreateManagers()
361365
{
362366
const string manager_path = "JCS_Managers";
@@ -370,7 +374,7 @@ private static GameObject CreateManagers()
370374
/// <summary>
371375
/// Create settings for 3d game combine with JCSUnity.
372376
/// </summary>
373-
[MenuItem("JCSUnity/Basic/Create Settings", false, 10)]
377+
[MenuItem(MI_BaseName + "/Basic/Create Settings", false, MI_BasePriority + 10)]
374378
private static GameObject CreateSettings()
375379
{
376380
const string setting_path = "JCS_Settings";
@@ -384,7 +388,7 @@ private static GameObject CreateSettings()
384388
/// <summary>
385389
/// BGM player for game.
386390
/// </summary>
387-
[MenuItem("JCSUnity/Basic/Create BGM Player", false, 11)]
391+
[MenuItem(MI_BaseName + "/Basic/Create BGM Player", false, MI_BasePriority + 11)]
388392
private static void CreateBGMPlayer()
389393
{
390394
const string player_path = "Sound/JCS_BGMPlayer";
@@ -396,7 +400,7 @@ private static void CreateBGMPlayer()
396400
/// <summary>
397401
/// Debug tool using in JCSUnity.
398402
/// </summary>
399-
[MenuItem("JCSUnity/Basic/Create Debug Tools", false, 12)]
403+
[MenuItem(MI_BaseName + "/Basic/Create Debug Tools", false, MI_BasePriority + 12)]
400404
private static void CreateDebugTools()
401405
{
402406
const string tools_path = "Tools/JCS_Tools";
@@ -408,19 +412,19 @@ private static void CreateDebugTools()
408412
/// <summary>
409413
/// Create settings for 3d game combine with JCSUnity.
410414
/// </summary>
411-
[MenuItem("JCSUnity/Input/Update", false, 15)]
415+
[MenuItem(MI_BaseName + "/Input/Update", false, MI_BasePriority + 15)]
412416
private static void UpdateInputManager()
413417
{
414418
JCS_InputController.SetupInputManager();
415419
}
416420

417-
[MenuItem("JCSUnity/Input/Clear", false, 15)]
421+
[MenuItem(MI_BaseName + "/Input/Clear", false, MI_BasePriority + 15)]
418422
private static void ClearInputManager()
419423
{
420424
JCS_InputController.ClearInputManagerSettings();
421425
}
422426

423-
[MenuItem("JCSUnity/Input/Revert", false, 15)]
427+
[MenuItem(MI_BaseName + "/Input/Revert", false, MI_BasePriority + 15)]
424428
private static void RevertDefaultInputManager()
425429
{
426430
JCS_InputController.DefaultInputManagerSettings();
@@ -448,11 +452,11 @@ private static GameObject CreateJCSCanvas()
448452
/// <summary>
449453
/// Create a new project.
450454
/// </summary>
451-
[MenuItem("JCSUnity/Tool/Create project assets folder", false, 20)]
455+
[MenuItem(MI_BaseName + "/Tool/Create project assets folder", false, MI_BasePriority + 20)]
452456
private static void CreateProjectAssetsFolder()
453457
{
454458
string parentFolder = "Assets";
455-
string newFolderName = instance.PROJECT_NAME + PROJECT_NAME_LASTING;
459+
string newFolderName = instance.PROJECT_NAME + PROJECT_NAME_SUFFIX;
456460

457461
string assetsPath = Application.dataPath + "/";
458462
string newProjectPath = assetsPath + newFolderName + "/";
@@ -473,7 +477,7 @@ private static void CreateProjectAssetsFolder()
473477
/// <summary>
474478
/// Update JCSUnity
475479
/// </summary>
476-
[MenuItem("JCSUnity/Check for Update", false, 75)]
480+
[MenuItem(MI_BaseName + "/Check for Update", false, MI_BasePriority + 75)]
477481
private static void UpdateJCSUnity()
478482
{
479483
// TODO(jenchieh): check framework need to update or not?

‎Assets/JCSUnity/Editor/JCSUnity_Hotkeys.cs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,19 @@ namespace JCSUnity
2121
/// </summary>
2222
public class JCSUnity_Hotkeys
2323
{
24+
/* Variables*/
25+
26+
private const string MI_BaseName = JCSUnity_EditorWindow.MI_BaseName + "/Hotkeys";
27+
28+
public const int MI_BasePriority = JCSUnity_EditorWindow.MI_BasePriority;
29+
2430
private static EditorWindow _mouseOverWindow;
2531

26-
[MenuItem("JCSUnity/Hotkeys/Select Inspector under mouse cursor (use hotkey) #&q", false, 50)]
32+
/* Setter & Getter */
33+
34+
/* Functions */
35+
36+
[MenuItem(MI_BaseName + "/Select Inspector under mouse cursor (use hotkey) #&q", false, MI_BasePriority + 50)]
2737
private static void SelectLockableInspector()
2838
{
2939
if (EditorWindow.mouseOverWindow.GetType().Name == "InspectorWindow")
@@ -36,7 +46,7 @@ private static void SelectLockableInspector()
3646
}
3747
}
3848

39-
[MenuItem("JCSUnity/Hotkeys/Toggle Lock &q", false, 50)]
49+
[MenuItem(MI_BaseName + "/Toggle Lock &q", false, MI_BasePriority + 50)]
4050
private static void ToggleInspectorLock()
4151
{
4252
if (_mouseOverWindow == null)
@@ -60,7 +70,7 @@ private static void ToggleInspectorLock()
6070
}
6171
}
6272

63-
[MenuItem("JCSUnity/Hotkeys/Clear Console #&c", false, 50)]
73+
[MenuItem(MI_BaseName + "/Clear Console #&c", false, MI_BasePriority + 50)]
6474
private static void ClearConsole()
6575
{
6676
Type type = Assembly.GetAssembly(typeof(Editor)).GetType("UnityEditorInternal.LogEntries");

0 commit comments

Comments
 (0)