diff --git a/Intersect.Editor/Forms/Editors/EditorForm.cs b/Intersect.Editor/Forms/Editors/EditorForm.cs index a9fd178f22..291acb4da8 100644 --- a/Intersect.Editor/Forms/Editors/EditorForm.cs +++ b/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; + } + } } diff --git a/Intersect.Editor/Forms/Editors/Events/frmEvent.Designer.cs b/Intersect.Editor/Forms/Editors/Events/frmEvent.Designer.cs index 8cd6297ed4..5fdd854235 100644 --- a/Intersect.Editor/Forms/Editors/Events/frmEvent.Designer.cs +++ b/Intersect.Editor/Forms/Editors/Events/frmEvent.Designer.cs @@ -1349,6 +1349,7 @@ private void InitializeComponent() FormBorderStyle = FormBorderStyle.FixedSingle; KeyPreview = true; Margin = new Padding(4, 3, 4, 3); + MinimizeBox = false; MaximizeBox = false; MinimumSize = new Size(967, 757); Name = "FrmEvent"; diff --git a/Intersect.Editor/Forms/Editors/Quest/frmQuest.Designer.cs b/Intersect.Editor/Forms/Editors/Quest/frmQuest.Designer.cs index 2a8e4bf01c..22204d0bb2 100644 --- a/Intersect.Editor/Forms/Editors/Quest/frmQuest.Designer.cs +++ b/Intersect.Editor/Forms/Editors/Quest/frmQuest.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms.Editors.Quest { @@ -849,7 +849,7 @@ private void InitializeComponent() this.AutoSize = true; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); this.ClientSize = new System.Drawing.Size(992, 446); - this.ControlBox = false; + this.ControlBox = true; this.Controls.Add(this.toolStrip); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); @@ -858,9 +858,11 @@ private void InitializeComponent() this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.KeyPreview = true; this.MinimizeBox = false; + MaximizeBox = false; this.Name = "FrmQuest"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Quest Editor"; + FormClosed += FrmQuest_FormClosed; this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.form_KeyDown); this.grpQuests.ResumeLayout(false); this.grpQuests.PerformLayout(); diff --git a/Intersect.Editor/Forms/Editors/Quest/frmQuest.cs b/Intersect.Editor/Forms/Editors/Quest/frmQuest.cs index 2504ca5999..df7574697e 100644 --- a/Intersect.Editor/Forms/Editors/Quest/frmQuest.cs +++ b/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(); } diff --git a/Intersect.Editor/Forms/Editors/frmAnimation.Designer.cs b/Intersect.Editor/Forms/Editors/frmAnimation.Designer.cs index 39714ecb90..e3a07b5701 100644 --- a/Intersect.Editor/Forms/Editors/frmAnimation.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmAnimation.Designer.cs @@ -1205,7 +1205,7 @@ private void InitializeComponent() AutoSize = true; BackColor = System.Drawing.Color.FromArgb(45, 45, 48); ClientSize = new Size(1249, 622); - ControlBox = false; + ControlBox = true; Controls.Add(toolStrip); Controls.Add(grpAnimations); Controls.Add(pnlContainer); @@ -1213,6 +1213,7 @@ private void InitializeComponent() KeyPreview = true; Margin = new Padding(4, 3, 4, 3); MaximizeBox = false; + MinimizeBox = false; Name = "FrmAnimation"; StartPosition = FormStartPosition.CenterScreen; Text = "Animation Editor"; diff --git a/Intersect.Editor/Forms/Editors/frmAnimation.cs b/Intersect.Editor/Forms/Editors/frmAnimation.cs index f788b2d2d8..3e7bc74529 100644 --- a/Intersect.Editor/Forms/Editors/frmAnimation.cs +++ b/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) diff --git a/Intersect.Editor/Forms/Editors/frmClass.Designer.cs b/Intersect.Editor/Forms/Editors/frmClass.Designer.cs index 941a42b693..34791118b0 100644 --- a/Intersect.Editor/Forms/Editors/frmClass.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmClass.Designer.cs @@ -2285,7 +2285,7 @@ private void InitializeComponent() this.AutoSize = true; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); this.ClientSize = new System.Drawing.Size(1184, 631); - this.ControlBox = false; + this.ControlBox = true; this.Controls.Add(this.toolStrip); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); @@ -2293,10 +2293,13 @@ private void InitializeComponent() this.Controls.Add(this.pnlContainer); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.KeyPreview = true; + MaximizeBox = false; + MinimizeBox = false; this.Margin = new System.Windows.Forms.Padding(2); this.Name = "FrmClass"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Class Editor"; + FormClosed += FrmClass_FormClosed; this.Load += new System.EventHandler(this.frmClass_Load); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.form_KeyDown); this.grpClasses.ResumeLayout(false); diff --git a/Intersect.Editor/Forms/Editors/frmClass.cs b/Intersect.Editor/Forms/Editors/frmClass.cs index c97fc8b121..609dc90c02 100644 --- a/Intersect.Editor/Forms/Editors/frmClass.cs +++ b/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(); diff --git a/Intersect.Editor/Forms/Editors/frmCommonEvent.Designer.cs b/Intersect.Editor/Forms/Editors/frmCommonEvent.Designer.cs index 5aac924dc2..6d7b1f8606 100644 --- a/Intersect.Editor/Forms/Editors/frmCommonEvent.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmCommonEvent.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms.Editors { @@ -264,6 +264,7 @@ private void InitializeComponent() this.Controls.Add(this.grpCommonEvents); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; + MinimizeBox = false; this.Name = "FrmCommonEvent"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Common Event Editor"; diff --git a/Intersect.Editor/Forms/Editors/frmCraftingTables.Designer.cs b/Intersect.Editor/Forms/Editors/frmCraftingTables.Designer.cs index acf3e22f0e..f9f9580574 100644 --- a/Intersect.Editor/Forms/Editors/frmCraftingTables.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmCraftingTables.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms.Editors { @@ -461,7 +461,7 @@ private void InitializeComponent() this.AutoSize = true; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); this.ClientSize = new System.Drawing.Size(491, 507); - this.ControlBox = false; + this.ControlBox = true; this.Controls.Add(this.toolStrip); this.Controls.Add(this.pnlContainer); this.Controls.Add(this.btnCancel); @@ -474,6 +474,7 @@ private void InitializeComponent() this.Name = "FrmCraftingTables"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Crafting Tables Editor"; + FormClosed += FrmCraftingTables_FormClosed; this.Load += new System.EventHandler(this.frmCrafting_Load); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.form_KeyDown); this.grpTables.ResumeLayout(false); diff --git a/Intersect.Editor/Forms/Editors/frmCraftingTables.cs b/Intersect.Editor/Forms/Editors/frmCraftingTables.cs index e3fd151190..2d4420c8d0 100644 --- a/Intersect.Editor/Forms/Editors/frmCraftingTables.cs +++ b/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); diff --git a/Intersect.Editor/Forms/Editors/frmCrafts.Designer.cs b/Intersect.Editor/Forms/Editors/frmCrafts.Designer.cs index f2b2c8733c..3d281a4e6b 100644 --- a/Intersect.Editor/Forms/Editors/frmCrafts.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmCrafts.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms.Editors { @@ -709,7 +709,7 @@ private void InitializeComponent() this.AutoSize = true; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); this.ClientSize = new System.Drawing.Size(799, 461); - this.ControlBox = false; + this.ControlBox = true; this.Controls.Add(this.toolStrip); this.Controls.Add(this.pnlContainer); this.Controls.Add(this.btnCancel); @@ -722,6 +722,7 @@ private void InitializeComponent() this.Name = "FrmCrafts"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Crafts Editor"; + FormClosed += FrmCrafts_FormClosed; this.Load += new System.EventHandler(this.frmCrafting_Load); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.form_KeyDown); this.grpCrafts.ResumeLayout(false); diff --git a/Intersect.Editor/Forms/Editors/frmCrafts.cs b/Intersect.Editor/Forms/Editors/frmCrafts.cs index 3574a5a7c8..79e695e290 100644 --- a/Intersect.Editor/Forms/Editors/frmCrafts.cs +++ b/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() diff --git a/Intersect.Editor/Forms/Editors/frmItem.Designer.cs b/Intersect.Editor/Forms/Editors/frmItem.Designer.cs index 7bf5b20bf6..14bd1bb7b8 100644 --- a/Intersect.Editor/Forms/Editors/frmItem.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmItem.Designer.cs @@ -2964,7 +2964,7 @@ private void InitializeComponent() AutoSize = true; BackColor = System.Drawing.Color.FromArgb(45, 45, 48); ClientSize = new Size(1241, 728); - ControlBox = false; + ControlBox = true; Controls.Add(toolStrip); Controls.Add(btnCancel); Controls.Add(btnSave); @@ -2973,6 +2973,8 @@ private void InitializeComponent() FormBorderStyle = FormBorderStyle.FixedSingle; KeyPreview = true; Margin = new Padding(4, 3, 4, 3); + MinimizeBox = false; + MaximizeBox = false; Name = "FrmItem"; StartPosition = FormStartPosition.CenterScreen; Text = "Item Editor"; diff --git a/Intersect.Editor/Forms/Editors/frmItem.cs b/Intersect.Editor/Forms/Editors/frmItem.cs index 2512f0fb90..59ee17d8b1 100644 --- a/Intersect.Editor/Forms/Editors/frmItem.cs +++ b/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) diff --git a/Intersect.Editor/Forms/Editors/frmNpc.Designer.cs b/Intersect.Editor/Forms/Editors/frmNpc.Designer.cs index ad2f56ea9e..a079c7a473 100644 --- a/Intersect.Editor/Forms/Editors/frmNpc.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmNpc.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms.Editors { @@ -2138,7 +2138,7 @@ private void InitializeComponent() AutoSize = true; BackColor = System.Drawing.Color.FromArgb(45, 45, 48); ClientSize = new Size(1393, 728); - ControlBox = false; + ControlBox = true; Controls.Add(toolStrip); Controls.Add(btnCancel); Controls.Add(btnSave); @@ -2148,6 +2148,7 @@ private void InitializeComponent() KeyPreview = true; Margin = new Padding(4, 3, 4, 3); MaximizeBox = false; + MinimizeBox = false; Name = "FrmNpc"; StartPosition = FormStartPosition.CenterScreen; Text = "NPC Editor"; diff --git a/Intersect.Editor/Forms/Editors/frmNpc.cs b/Intersect.Editor/Forms/Editors/frmNpc.cs index 7b136ab925..57dd9167fa 100644 --- a/Intersect.Editor/Forms/Editors/frmNpc.cs +++ b/Intersect.Editor/Forms/Editors/frmNpc.cs @@ -36,6 +36,8 @@ public FrmNpc() ApplyHooks(); InitializeComponent(); Icon = Program.Icon; + _btnSave = btnSave; + _btnCancel = btnCancel; lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click); } @@ -383,6 +385,8 @@ private void UpdateEditor() pnlContainer.Hide(); } + var hasItem = mEditorItem != null; + UpdateEditorButtons(hasItem); UpdateToolStripItems(); } @@ -453,7 +457,7 @@ private void UpdateDropValues() private void frmNpc_FormClosed(object sender, FormClosedEventArgs e) { - Globals.CurrentEditor = -1; + btnCancel_Click(null, null); } private void btnAdd_Click(object sender, EventArgs e) diff --git a/Intersect.Editor/Forms/Editors/frmProjectile.Designer.cs b/Intersect.Editor/Forms/Editors/frmProjectile.Designer.cs index 52552a7078..8a507b7684 100644 --- a/Intersect.Editor/Forms/Editors/frmProjectile.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmProjectile.Designer.cs @@ -992,7 +992,7 @@ private void InitializeComponent() AutoSize = true; BackColor = System.Drawing.Color.FromArgb(45, 45, 48); ClientSize = new Size(818, 729); - ControlBox = false; + ControlBox = true; Controls.Add(toolStrip); Controls.Add(btnCancel); Controls.Add(btnSave); @@ -1002,8 +1002,11 @@ private void InitializeComponent() KeyPreview = true; Margin = new Padding(4, 3, 4, 3); Name = "FrmProjectile"; + MaximizeBox = false; + MinimizeBox = false; StartPosition = FormStartPosition.CenterScreen; Text = "Projectile Editor"; + FormClosed += FrmProjectile_FormClosed; Load += frmProjectile_Load; KeyDown += form_KeyDown; grpProjectiles.ResumeLayout(false); diff --git a/Intersect.Editor/Forms/Editors/frmProjectile.cs b/Intersect.Editor/Forms/Editors/frmProjectile.cs index 66c2326497..e969e72393 100644 --- a/Intersect.Editor/Forms/Editors/frmProjectile.cs +++ b/Intersect.Editor/Forms/Editors/frmProjectile.cs @@ -31,7 +31,8 @@ public FrmProjectile() ApplyHooks(); InitializeComponent(); Icon = Program.Icon; - + _btnSave = btnSave; + _btnCancel = btnCancel; lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click); } private void AssignEditorItem(Guid id) @@ -53,6 +54,11 @@ protected override void GameObjectUpdatedDelegate(GameObjectType type) } } + private void FrmProjectile_FormClosed(object sender, FormClosedEventArgs e) + { + btnCancel_Click(null, null); + } + private void btnCancel_Click(object sender, EventArgs e) { foreach (var item in mChanged) @@ -217,6 +223,9 @@ private void UpdateEditor() pnlContainer.Hide(); } + var hasItem = mEditorItem != null; + + UpdateEditorButtons(hasItem); UpdateToolStripItems(); } diff --git a/Intersect.Editor/Forms/Editors/frmResource.Designer.cs b/Intersect.Editor/Forms/Editors/frmResource.Designer.cs index ed007abe56..abcaa73d8f 100644 --- a/Intersect.Editor/Forms/Editors/frmResource.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmResource.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms.Editors { @@ -1084,7 +1084,7 @@ private void InitializeComponent() AutoSize = true; BackColor = System.Drawing.Color.FromArgb(45, 45, 48); ClientSize = new Size(1119, 728); - ControlBox = false; + ControlBox = true; Controls.Add(toolStrip); Controls.Add(btnCancel); Controls.Add(btnSave); @@ -1093,6 +1093,8 @@ private void InitializeComponent() FormBorderStyle = FormBorderStyle.FixedSingle; KeyPreview = true; Margin = new Padding(4, 3, 4, 3); + MinimizeBox = false; + MaximizeBox = false; Name = "FrmResource"; StartPosition = FormStartPosition.CenterScreen; Text = "Resource Editor"; diff --git a/Intersect.Editor/Forms/Editors/frmResource.cs b/Intersect.Editor/Forms/Editors/frmResource.cs index 8938ef884a..58c4ff5dd6 100644 --- a/Intersect.Editor/Forms/Editors/frmResource.cs +++ b/Intersect.Editor/Forms/Editors/frmResource.cs @@ -49,6 +49,8 @@ public FrmResource() InitializeComponent(); Icon = Program.Icon; + _btnSave = btnSave; + _btnCancel = btnCancel; cmbToolType.Items.Clear(); cmbToolType.Items.Add(Strings.General.None); cmbToolType.Items.AddRange(Options.Instance.Equipment.ToolTypes.ToArray()); @@ -278,7 +280,10 @@ private void UpdateEditor() { pnlContainer.Hide(); } - + + var hasItem = mEditorItem != null; + + UpdateEditorButtons(hasItem); UpdateToolStripItems(); } @@ -477,7 +482,7 @@ private void txtName_TextChanged(object sender, EventArgs e) private void frmResource_FormClosed(object sender, FormClosedEventArgs e) { - Globals.CurrentEditor = -1; + btnCancel_Click(null, null); } private void tmrRender_Tick(object sender, EventArgs e) diff --git a/Intersect.Editor/Forms/Editors/frmShop.Designer.cs b/Intersect.Editor/Forms/Editors/frmShop.Designer.cs index c4b3e6bbd9..038efb3653 100644 --- a/Intersect.Editor/Forms/Editors/frmShop.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmShop.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms.Editors { @@ -810,7 +810,7 @@ private void InitializeComponent() this.AutoSize = true; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); this.ClientSize = new System.Drawing.Size(751, 583); - this.ControlBox = false; + this.ControlBox = true; this.Controls.Add(this.toolStrip); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); @@ -818,9 +818,12 @@ private void InitializeComponent() this.Controls.Add(this.pnlContainer); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.KeyPreview = true; + MinimizeBox = false; + MaximizeBox = false; this.Name = "FrmShop"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Shop Editor"; + FormClosed += FrmShop_FormClosed; this.Load += new System.EventHandler(this.frmShop_Load); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.form_KeyDown); this.grpShops.ResumeLayout(false); diff --git a/Intersect.Editor/Forms/Editors/frmShop.cs b/Intersect.Editor/Forms/Editors/frmShop.cs index 7805168911..d4803cc502 100644 --- a/Intersect.Editor/Forms/Editors/frmShop.cs +++ b/Intersect.Editor/Forms/Editors/frmShop.cs @@ -1,4 +1,4 @@ -using DarkUI.Forms; +using DarkUI.Forms; using Intersect.Editor.Content; using Intersect.Editor.Core; using Intersect.Editor.General; @@ -28,6 +28,8 @@ public FrmShop() ApplyHooks(); InitializeComponent(); Icon = Program.Icon; + _btnSave = btnSave; + _btnCancel = btnCancel; lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click); } @@ -50,6 +52,11 @@ protected override void GameObjectUpdatedDelegate(GameObjectType type) } } + private void FrmShop_FormClosed(object sender, FormClosedEventArgs e) + { + btnCancel_Click(null, null); + } + private void btnCancel_Click(object sender, EventArgs e) { foreach (var item in mChanged) @@ -196,6 +203,9 @@ private void UpdateEditor() pnlContainer.Hide(); } + var hasItem = mEditorItem != null; + + UpdateEditorButtons(hasItem); UpdateToolStripItems(); } diff --git a/Intersect.Editor/Forms/Editors/frmSpell.Designer.cs b/Intersect.Editor/Forms/Editors/frmSpell.Designer.cs index a6d41e1129..cae7914140 100644 --- a/Intersect.Editor/Forms/Editors/frmSpell.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmSpell.Designer.cs @@ -2381,7 +2381,7 @@ private void InitializeComponent() this.AutoSize = true; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); this.ClientSize = new System.Drawing.Size(1214, 611); - this.ControlBox = false; + this.ControlBox = true; this.Controls.Add(this.toolStrip); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); @@ -2390,6 +2390,7 @@ private void InitializeComponent() this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.KeyPreview = true; this.MaximizeBox = false; + MinimizeBox = false; this.Name = "FrmSpell"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Spell Editor "; diff --git a/Intersect.Editor/Forms/Editors/frmSpell.cs b/Intersect.Editor/Forms/Editors/frmSpell.cs index 70ff00c4ac..714070b114 100644 --- a/Intersect.Editor/Forms/Editors/frmSpell.cs +++ b/Intersect.Editor/Forms/Editors/frmSpell.cs @@ -35,6 +35,8 @@ public FrmSpell() ApplyHooks(); InitializeComponent(); Icon = Program.Icon; + _btnSave = btnSave; + _btnCancel = btnCancel; cmbScalingStat.Items.Clear(); for (var i = 0; i < Enum.GetValues().Length; i++) @@ -325,6 +327,8 @@ private void UpdateEditor() pnlContainer.Hide(); } + var hasItem = mEditorItem != null; + UpdateEditorButtons(hasItem); UpdateToolStripItems(); } @@ -567,7 +571,7 @@ private void cmbExtraEffect_SelectedIndexChanged(object sender, EventArgs e) private void frmSpell_FormClosed(object sender, FormClosedEventArgs e) { - Globals.CurrentEditor = -1; + btnCancel_Click(null, null); } private void scrlRange_Scroll(object sender, ScrollValueEventArgs e) diff --git a/Intersect.Editor/Forms/Editors/frmTime.Designer.cs b/Intersect.Editor/Forms/Editors/frmTime.Designer.cs index dee51245b6..14e53c371b 100644 --- a/Intersect.Editor/Forms/Editors/frmTime.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmTime.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms.Editors { @@ -269,7 +269,7 @@ private void InitializeComponent() this.AutoSize = true; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); this.ClientSize = new System.Drawing.Size(529, 347); - this.ControlBox = false; + this.ControlBox = true; this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); this.Controls.Add(this.grpSettings); @@ -277,9 +277,12 @@ private void InitializeComponent() this.Controls.Add(this.lblTimes); this.Controls.Add(this.lstTimes); this.DoubleBuffered = true; + MinimizeBox = false; + MaximizeBox = false; this.Name = "FrmTime"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Time Editor (Day/Night Settings)"; + FormClosed += FrmTime_FormClosed; this.grpRangeOptions.ResumeLayout(false); this.grpRangeOptions.PerformLayout(); this.grpSettings.ResumeLayout(false); diff --git a/Intersect.Editor/Forms/Editors/frmTime.cs b/Intersect.Editor/Forms/Editors/frmTime.cs index 657d513e8c..566dd01c86 100644 --- a/Intersect.Editor/Forms/Editors/frmTime.cs +++ b/Intersect.Editor/Forms/Editors/frmTime.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using DarkUI.Controls; using Intersect.Editor.General; using Intersect.Editor.Localization; @@ -169,6 +169,11 @@ private void btnSave_Click(object sender, EventArgs e) Dispose(); } + private void FrmTime_FormClosed(object sender, FormClosedEventArgs e) + { + btnCancel_Click(null, null); + } + private void btnCancel_Click(object sender, EventArgs e) { mYTime.LoadFromJson(mBackupTime.GetInstanceJson()); diff --git a/Intersect.Editor/Forms/Editors/frmVariable.Designer.cs b/Intersect.Editor/Forms/Editors/frmVariable.Designer.cs index 95998fdf58..286c49e485 100644 --- a/Intersect.Editor/Forms/Editors/frmVariable.Designer.cs +++ b/Intersect.Editor/Forms/Editors/frmVariable.Designer.cs @@ -536,16 +536,18 @@ private void InitializeComponent() this.AutoSize = true; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(48))))); this.ClientSize = new System.Drawing.Size(515, 554); - this.ControlBox = false; + this.ControlBox = true; this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); this.Controls.Add(this.grpTypes); this.Controls.Add(this.grpVariables); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; + MinimizeBox = false; + MaximizeBox = false; this.Name = "FrmSwitchVariable"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Variable Editor"; + FormClosed += FrmVariable_FormClosed; this.grpTypes.ResumeLayout(false); this.grpTypes.PerformLayout(); this.grpList.ResumeLayout(false); diff --git a/Intersect.Editor/Forms/Editors/frmVariable.cs b/Intersect.Editor/Forms/Editors/frmVariable.cs index 0d43ac7eed..442614705d 100644 --- a/Intersect.Editor/Forms/Editors/frmVariable.cs +++ b/Intersect.Editor/Forms/Editors/frmVariable.cs @@ -38,6 +38,8 @@ public FrmSwitchVariable() ApplyHooks(); InitializeComponent(); Icon = Program.Icon; + _btnSave = btnSave; + _btnCancel = btnCancel; InitLocalization(); nudVariableValue.Minimum = long.MinValue; @@ -200,6 +202,11 @@ private void toolStripItemDelete_Click(object sender, EventArgs e) } } + private void FrmVariable_FormClosed(object sender, FormClosedEventArgs e) + { + btnCancel_Click(null, null); + } + private void btnCancel_Click(object sender, EventArgs e) { foreach (var item in mChanged) @@ -309,6 +316,9 @@ private void UpdateEditor() } UpdateToolStripItems(); + var hasItem = mEditorItem != null; + + UpdateEditorButtons(hasItem); } private void UpdateSelection() diff --git a/Intersect.Editor/Forms/frmOptions.Designer.cs b/Intersect.Editor/Forms/frmOptions.Designer.cs index 90bab5c8de..f81a00dd43 100644 --- a/Intersect.Editor/Forms/frmOptions.Designer.cs +++ b/Intersect.Editor/Forms/frmOptions.Designer.cs @@ -1,4 +1,4 @@ -using DarkUI.Controls; +using DarkUI.Controls; namespace Intersect.Editor.Forms { @@ -264,7 +264,8 @@ private void InitializeComponent() this.Controls.Add(this.pnlGeneral); this.Controls.Add(this.btnGeneralOptions); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; + MaximizeBox = false; + MinimizeBox = false; this.Name = "FrmOptions"; this.Text = "Options"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmOptions_FormClosing);