fix: Add Close Button to Animation Editor & Conditionally Show Save Button Across Windows

Intersect.Editor/Forms/Editors/EditorForm.cs

@@ -1,3 +1,4 @@
+using DarkUI.Controls;
 using Intersect.Editor.Core;
 using Intersect.Editor.Networking;
 using Intersect.Enums;
@@ -12,6 +13,9 @@ public partial class EditorForm : Form
 
     private bool mClosing = false;
 
+    protected DarkButton? _btnSave;
+    protected DarkButton? _btnCancel;
+
     protected EditorForm()
     {
         Icon = Program.Icon;
@@ -83,4 +87,18 @@ private void InitializeComponent()
 
     }
 
+    protected void UpdateEditorButtons(bool isItemSelected)
+    {
+        if (_btnSave != null)
+        {
+            _btnSave.Visible = isItemSelected;
+            _btnSave.Enabled = isItemSelected;
+        }
+
+        if (_btnCancel != null)
+        {
+            _btnCancel.Visible = isItemSelected;
+            _btnCancel.Enabled = isItemSelected;
+        }
+    }
 }

Intersect.Editor/Forms/Editors/Quest/frmQuest.cs

@@ -1,4 +1,4 @@
-using DarkUI.Forms;
+using DarkUI.Forms;
 using Intersect.Editor.Core;
 using Intersect.Editor.Forms.Editors.Events;
 using Intersect.Editor.General;
@@ -31,8 +31,12 @@ public FrmQuest()
         Icon = Program.Icon;
 
         InitLocalization();
+        _btnSave = btnSave;
+        _btnCancel = btnCancel;
 
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
+
+        UpdateEditor();
     }
     private void AssignEditorItem(Guid id)
     {
@@ -121,6 +125,11 @@ protected override void GameObjectUpdatedDelegate(GameObjectType type)
         }
     }
 
+    private void FrmQuest_FormClosed(object sender, FormClosedEventArgs e)
+    {
+        btnCancel_Click(null, null);
+    }
+
     private void btnCancel_Click(object sender, EventArgs e)
     {
         foreach (var item in mChanged)
@@ -277,7 +286,10 @@ private void UpdateEditor()
         {
             pnlContainer.Hide();
         }
-
+
+        var hasItem = mEditorItem != null;
+
+        UpdateEditorButtons(hasItem);
         UpdateToolStripItems();
     }
 

Intersect.Editor/Forms/Editors/frmAnimation.cs

@@ -527,7 +527,7 @@ private void tmrUpperAnimation_Tick(object sender, EventArgs e)
 
     private void frmAnimation_FormClosed(object sender, FormClosedEventArgs e)
     {
-        Globals.CurrentEditor = -1;
+        btnCancel_Click(null, null);
     }
 
     private void scrlLowerFrame_Scroll(object sender, ScrollValueEventArgs e)

Intersect.Editor/Forms/Editors/frmClass.cs

@@ -1280,6 +1280,11 @@ private void UpdateExpGridValues(int start, int end = -1)
         }
     }
 
+    private void FrmClass_FormClosed(object sender, FormClosedEventArgs e)
+    {
+        btnCancel_Click(null, null);
+    }
+
     private void btnCloseExpGrid_Click(object sender, EventArgs e)
     {
         grpExpGrid.Hide();

Intersect.Editor/Forms/Editors/frmCraftingTables.cs

@@ -1,4 +1,4 @@
-using DarkUI.Forms;
+using DarkUI.Forms;
 using Intersect.Editor.Core;
 using Intersect.Editor.General;
 using Intersect.Editor.Localization;
@@ -7,6 +7,7 @@
 using Intersect.Framework.Core.GameObjects.Crafting;
 using Intersect.GameObjects;
 using Intersect.Models;
+using System.Diagnostics;
 
 namespace Intersect.Editor.Forms.Editors;
 
@@ -27,6 +28,8 @@ public FrmCraftingTables()
         ApplyHooks();
         InitializeComponent();
         Icon = Program.Icon;
+        _btnSave = btnSave;
+        _btnCancel = btnCancel;
 
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
     }
@@ -72,6 +75,8 @@ private void UpdateEditor()
             pnlContainer.Hide();
         }
 
+        var hasItem = mEditorItem != null;
+        UpdateEditorButtons(hasItem);
         UpdateToolStripItems();
     }
 
@@ -81,6 +86,12 @@ private void txtName_TextChanged(object sender, EventArgs e)
         lstGameObjects.UpdateText(txtName.Text);
     }
 
+
+    private void FrmCraftingTables_FormClosed(object sender, FormClosedEventArgs e)
+    {
+        btnCancel_Click(null, null);
+    }
+
     private void btnCancel_Click(object sender, EventArgs e)
     {
         foreach (var item in mChanged)
@@ -188,6 +199,7 @@ private void form_KeyDown(object sender, KeyEventArgs e)
 
     private void frmCrafting_Load(object sender, EventArgs e)
     {
+        UpdateEditor();
         cmbCrafts.Items.Clear();
         cmbCrafts.Items.AddRange(CraftingRecipeDescriptor.Names);
 

Intersect.Editor/Forms/Editors/frmCrafts.cs

@@ -31,7 +31,8 @@ public FrmCrafts()
         ApplyHooks();
         InitializeComponent();
         Icon = Program.Icon;
-
+        _btnSave = btnSave;
+        _btnCancel = btnCancel;
         lstGameObjects.LostFocus += itemList_FocusChanged;
         lstGameObjects.GotFocus += itemList_FocusChanged;
         cmbResult.Items.Clear();
@@ -130,6 +131,8 @@ private void UpdateEditor()
             pnlContainer.Hide();
         }
 
+        var hasItem = mEditorItem != null;
+        UpdateEditorButtons(hasItem);
         UpdateToolStripItems();
     }
 
@@ -200,6 +203,11 @@ private void btnRemove_Click(object sender, EventArgs e)
         }
     }
 
+    private void FrmCrafts_FormClosed(object sender, FormClosedEventArgs e)
+    {
+        btnCancel_Click(null, null);
+    }
+
     private void btnCancel_Click(object sender, EventArgs e)
     {
         foreach (var item in mChanged)
@@ -421,6 +429,7 @@ private void cmbIngredient_SelectedIndexChanged(object sender, EventArgs e)
     private void frmCrafting_Load(object sender, EventArgs e)
     {
         InitLocalization();
+        UpdateEditor();
     }
 
     private void InitLocalization()

Intersect.Editor/Forms/Editors/frmItem.cs

@@ -47,6 +47,8 @@ public FrmItem()
         cmbProjectile.Items.Clear();
         cmbProjectile.Items.Add(Strings.General.None);
         cmbProjectile.Items.AddRange(ProjectileDescriptor.Names);
+        _btnSave = btnSave;
+        _btnCancel = btnCancel;
 
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
     }
@@ -463,6 +465,9 @@ private void UpdateEditor()
             pnlContainer.Hide();
         }
 
+        var hasItem = mEditorItem != null;
+
+        UpdateEditorButtons(hasItem);
         UpdateToolStripItems();
     }
 
@@ -681,7 +686,7 @@ private void chk2Hand_CheckedChanged(object sender, EventArgs e)
 
     private void FrmItem_FormClosed(object sender, FormClosedEventArgs e)
     {
-        Globals.CurrentEditor = -1;
+        btnCancel_Click(null, null);
     }
 
     private void cmbFemalePaperdoll_SelectedIndexChanged(object sender, EventArgs e)