From 88740b2a6371b0add9950ea2f6f61b494cf0894d Mon Sep 17 00:00:00 2001 From: MarinaGryphon Date: Mon, 9 Jul 2018 01:16:02 -0500 Subject: [PATCH 1/2] Fixes duplicate ElementType entries. Or, at least, an attempt. --- Labyrinth3/IDE/Forms/MergeElementsDlg.cs | 43 ++---------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/Labyrinth3/IDE/Forms/MergeElementsDlg.cs b/Labyrinth3/IDE/Forms/MergeElementsDlg.cs index 5028581..fef52b2 100644 --- a/Labyrinth3/IDE/Forms/MergeElementsDlg.cs +++ b/Labyrinth3/IDE/Forms/MergeElementsDlg.cs @@ -125,7 +125,7 @@ private void InitializeComponent() this.TypeBox.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; this.TypeBox.DrawMode = DrawMode.OwnerDrawVariable; this.TypeBox.DropDownStyle = ComboBoxStyle.DropDownList; - this.TypeBox.Items.AddRange(new object[52] + this.TypeBox.Items.AddRange(new object[13] { (object) ElementType.Generic, (object) ElementType.Character, @@ -140,45 +140,6 @@ private void InitializeComponent() (object) ElementType.Concept, (object) ElementType.Object, (object) ElementType.Event, - (object) ElementType.Generic, - (object) ElementType.Character, - (object) ElementType.Organisation, - (object) ElementType.Website, - (object) ElementType.EmailAccount, - (object) ElementType.PhoneNumber, - (object) ElementType.File, - (object) ElementType.Puzzle, - (object) ElementType.Location, - (object) ElementType.Vehicle, - (object) ElementType.Concept, - (object) ElementType.Object, - (object) ElementType.Event, - (object) ElementType.Generic, - (object) ElementType.Character, - (object) ElementType.Organisation, - (object) ElementType.Website, - (object) ElementType.EmailAccount, - (object) ElementType.PhoneNumber, - (object) ElementType.File, - (object) ElementType.Puzzle, - (object) ElementType.Location, - (object) ElementType.Vehicle, - (object) ElementType.Concept, - (object) ElementType.Object, - (object) ElementType.Event, - (object) ElementType.Generic, - (object) ElementType.Character, - (object) ElementType.Organisation, - (object) ElementType.Website, - (object) ElementType.EmailAccount, - (object) ElementType.PhoneNumber, - (object) ElementType.File, - (object) ElementType.Puzzle, - (object) ElementType.Location, - (object) ElementType.Vehicle, - (object) ElementType.Concept, - (object) ElementType.Object, - (object) ElementType.Event }); this.TypeBox.Location = new Point(64, 304); this.TypeBox.Name = "TypeBox"; @@ -269,4 +230,4 @@ private void light_ok() this.OKBtn.Enabled = this.text && this.selected > 1; } } -} \ No newline at end of file +} From 2765c16b3d934d84da7f157f82385d6cde4f51aa Mon Sep 17 00:00:00 2001 From: Zekka Nelson Date: Mon, 9 Jul 2018 19:35:44 -0700 Subject: [PATCH 2/2] Cosmetic: might as well just drop the count Has no runtime effect -- it just makes it easier to make changes to this list later. --- Labyrinth3/IDE/Forms/MergeElementsDlg.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Labyrinth3/IDE/Forms/MergeElementsDlg.cs b/Labyrinth3/IDE/Forms/MergeElementsDlg.cs index fef52b2..c641659 100644 --- a/Labyrinth3/IDE/Forms/MergeElementsDlg.cs +++ b/Labyrinth3/IDE/Forms/MergeElementsDlg.cs @@ -125,7 +125,7 @@ private void InitializeComponent() this.TypeBox.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; this.TypeBox.DrawMode = DrawMode.OwnerDrawVariable; this.TypeBox.DropDownStyle = ComboBoxStyle.DropDownList; - this.TypeBox.Items.AddRange(new object[13] + this.TypeBox.Items.AddRange(new object[ ] { (object) ElementType.Generic, (object) ElementType.Character,