Panda Review I

TimtyG · TimtyG · commit 79ad14003937 · 2025-03-26T13:17:27.000+01:00
diff --git a/Intersect.Editor/Forms/Editors/BaseEditorForm.cs b/Intersect.Editor/Forms/Editors/BaseEditorForm.cs
@@ -1,16 +1,19 @@
-using System.Windows.Forms;
 using DarkUI.Controls;
 
 namespace Intersect.Editor.Forms.Editors;
 
 public class BaseEditorForm : EditorForm
 {
-    protected DarkButton? btnSave;
-    protected DarkButton? btnCancel;
+    private DarkButton? btnSave;
+    private DarkButton? btnCancel;
 
-    protected void SetEditorButtons(DarkButton saveButton, DarkButton cancelButton)
+    protected void SetSaveButton(DarkButton saveButton)
     {
         btnSave = saveButton;
+    }
+
+    protected void SetCancelButton(DarkButton cancelButton)
+    {
         btnCancel = cancelButton;
     }
 
diff --git a/Intersect.Editor/Forms/Editors/Quest/frmQuest.cs b/Intersect.Editor/Forms/Editors/Quest/frmQuest.cs
@@ -31,7 +31,8 @@ public FrmQuest()
         Icon = Program.Icon;
 
         InitLocalization();
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
 
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
 
diff --git a/Intersect.Editor/Forms/Editors/frmCraftingTables.cs b/Intersect.Editor/Forms/Editors/frmCraftingTables.cs
@@ -28,7 +28,8 @@ public FrmCraftingTables()
         ApplyHooks();
         InitializeComponent();
         Icon = Program.Icon;
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
 
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
     }
diff --git 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;
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
         lstGameObjects.LostFocus += itemList_FocusChanged;
         lstGameObjects.GotFocus += itemList_FocusChanged;
         cmbResult.Items.Clear();
diff --git a/Intersect.Editor/Forms/Editors/frmItem.cs b/Intersect.Editor/Forms/Editors/frmItem.cs
@@ -47,7 +47,8 @@ public FrmItem()
         cmbProjectile.Items.Clear();
         cmbProjectile.Items.Add(Strings.General.None);
         cmbProjectile.Items.AddRange(ProjectileDescriptor.Names);
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
 
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
     }
diff --git a/Intersect.Editor/Forms/Editors/frmNpc.cs b/Intersect.Editor/Forms/Editors/frmNpc.cs
@@ -36,7 +36,8 @@ public FrmNpc()
         ApplyHooks();
         InitializeComponent();
         Icon = Program.Icon;
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
 
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
     }
diff --git 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;
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
     }
     private void AssignEditorItem(Guid id)
diff --git a/Intersect.Editor/Forms/Editors/frmResource.cs b/Intersect.Editor/Forms/Editors/frmResource.cs
@@ -49,7 +49,8 @@ public FrmResource()
         InitializeComponent();
         Icon = Program.Icon;
 
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
         cmbToolType.Items.Clear();
         cmbToolType.Items.Add(Strings.General.None);
         cmbToolType.Items.AddRange(Options.Instance.Equipment.ToolTypes.ToArray());
diff --git a/Intersect.Editor/Forms/Editors/frmShop.cs b/Intersect.Editor/Forms/Editors/frmShop.cs
@@ -28,7 +28,8 @@ public FrmShop()
         ApplyHooks();
         InitializeComponent();
         Icon = Program.Icon;
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
 
         lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);
     }
diff --git a/Intersect.Editor/Forms/Editors/frmSpell.cs b/Intersect.Editor/Forms/Editors/frmSpell.cs
@@ -35,7 +35,8 @@ public FrmSpell()
         ApplyHooks();
         InitializeComponent();
         Icon = Program.Icon;
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
 
         cmbScalingStat.Items.Clear();
         for (var i = 0; i < Enum.GetValues<Stat>().Length; i++)
diff --git a/Intersect.Editor/Forms/Editors/frmVariable.cs b/Intersect.Editor/Forms/Editors/frmVariable.cs
@@ -38,7 +38,8 @@ public FrmSwitchVariable()
         ApplyHooks();
         InitializeComponent();
         Icon = Program.Icon;
-        SetEditorButtons(btnSave, btnCancel);
+        SetSaveButton(btnSave);
+        SetCancelButton(btnCancel);
 
         InitLocalization();
         nudVariableValue.Minimum = long.MinValue;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ public FrmCraftingTables()`
`28`	`28`	`ApplyHooks();`
`29`	`29`	`InitializeComponent();`
`30`	`30`	`Icon = Program.Icon;`
`31`		`- SetEditorButtons(btnSave, btnCancel);`
	`31`	`+ SetSaveButton(btnSave);`
	`32`	`+ SetCancelButton(btnCancel);`
`32`	`33`
`33`	`34`	`lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ public FrmItem()`
`47`	`47`	`cmbProjectile.Items.Clear();`
`48`	`48`	`cmbProjectile.Items.Add(Strings.General.None);`
`49`	`49`	`cmbProjectile.Items.AddRange(ProjectileDescriptor.Names);`
`50`		`- SetEditorButtons(btnSave, btnCancel);`
	`50`	`+ SetSaveButton(btnSave);`
	`51`	`+ SetCancelButton(btnCancel);`
`51`	`52`
`52`	`53`	`lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ public FrmNpc()`
`36`	`36`	`ApplyHooks();`
`37`	`37`	`InitializeComponent();`
`38`	`38`	`Icon = Program.Icon;`
`39`		`- SetEditorButtons(btnSave, btnCancel);`
	`39`	`+ SetSaveButton(btnSave);`
	`40`	`+ SetCancelButton(btnCancel);`
`40`	`41`
`41`	`42`	`lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ public FrmShop()`
`28`	`28`	`ApplyHooks();`
`29`	`29`	`InitializeComponent();`
`30`	`30`	`Icon = Program.Icon;`
`31`		`- SetEditorButtons(btnSave, btnCancel);`
	`31`	`+ SetSaveButton(btnSave);`
	`32`	`+ SetCancelButton(btnCancel);`
`32`	`33`
`33`	`34`	`lstGameObjects.Init(UpdateToolStripItems, AssignEditorItem, toolStripItemNew_Click, toolStripItemCopy_Click, toolStripItemUndo_Click, toolStripItemPaste_Click, toolStripItemDelete_Click);`
`34`	`35`	`}`