From 30ef19d1d81bf481cf47f8f2246fbe632039a394 Mon Sep 17 00:00:00 2001 From: DigitalBox98 Date: Wed, 18 Oct 2023 22:32:27 +0200 Subject: [PATCH] Fix SelectBox for RewardQuest + tab renaming --- DOLToolbox/Controls/DOLQuestControl.Designer.cs | 8 ++++---- ...esigner.cs => RewardQuestControl.Designer.cs} | 1 + ...{LOSQuestControl.cs => RewardQuestControl.cs} | 8 +++++++- ...QuestControl.resx => RewardQuestControl.resx} | 0 DOLToolbox/Services/ComboboxService.cs | 16 ++++++++++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) rename DOLToolbox/Controls/{LOSQuestControl.Designer.cs => RewardQuestControl.Designer.cs} (99%) rename DOLToolbox/Controls/{LOSQuestControl.cs => RewardQuestControl.cs} (99%) rename DOLToolbox/Controls/{LOSQuestControl.resx => RewardQuestControl.resx} (100%) diff --git a/DOLToolbox/Controls/DOLQuestControl.Designer.cs b/DOLToolbox/Controls/DOLQuestControl.Designer.cs index bce634c..625870d 100644 --- a/DOLToolbox/Controls/DOLQuestControl.Designer.cs +++ b/DOLToolbox/Controls/DOLQuestControl.Designer.cs @@ -44,7 +44,7 @@ private void InitializeComponent() this.tabControl1.Size = new System.Drawing.Size(973, 624); this.tabControl1.TabIndex = 0; // - // tabData + // tabDataQuest // this.tabData.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.tabData.Location = new System.Drawing.Point(4, 22); @@ -52,9 +52,9 @@ private void InitializeComponent() this.tabData.Padding = new System.Windows.Forms.Padding(3); this.tabData.Size = new System.Drawing.Size(965, 598); this.tabData.TabIndex = 0; - this.tabData.Text = "DOL"; + this.tabData.Text = "DataQuest"; // - // tabLos + // tabRewardQuest // this.tabLos.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.tabLos.Location = new System.Drawing.Point(4, 22); @@ -62,7 +62,7 @@ private void InitializeComponent() this.tabLos.Padding = new System.Windows.Forms.Padding(3); this.tabLos.Size = new System.Drawing.Size(965, 598); this.tabLos.TabIndex = 1; - this.tabLos.Text = "Los Ojos/1.124"; + this.tabLos.Text = "RewardQuest"; // // DOLQuestControl // diff --git a/DOLToolbox/Controls/LOSQuestControl.Designer.cs b/DOLToolbox/Controls/RewardQuestControl.Designer.cs similarity index 99% rename from DOLToolbox/Controls/LOSQuestControl.Designer.cs rename to DOLToolbox/Controls/RewardQuestControl.Designer.cs index f239398..f4d6cf8 100644 --- a/DOLToolbox/Controls/LOSQuestControl.Designer.cs +++ b/DOLToolbox/Controls/RewardQuestControl.Designer.cs @@ -1256,6 +1256,7 @@ private void InitializeComponent() this.Controls.Add(this._FinishText); this.Controls.Add(this.finishTextLabel); this.Name = "RewardQuestControl"; + this.Load += new System.EventHandler(this.RewardQuestControl_Load_1); this.Size = new System.Drawing.Size(885, 529); this.groupBox7.ResumeLayout(false); this.groupBox7.PerformLayout(); diff --git a/DOLToolbox/Controls/LOSQuestControl.cs b/DOLToolbox/Controls/RewardQuestControl.cs similarity index 99% rename from DOLToolbox/Controls/LOSQuestControl.cs rename to DOLToolbox/Controls/RewardQuestControl.cs index b288b8f..b69e5c9 100644 --- a/DOLToolbox/Controls/LOSQuestControl.cs +++ b/DOLToolbox/Controls/RewardQuestControl.cs @@ -1625,6 +1625,11 @@ private void GoalObjectSearch_Click(object sender, EventArgs e) objectsearch.ShowDialog(this); } + private void RewardQuestControl_Load_1(object sender, EventArgs e) + { + SetupDropdowns(); + } + private void label33_MouseHover(object sender, EventArgs e) { toolTip1.InitialDelay = 500; @@ -1733,8 +1738,9 @@ private void RewardQuestControl_Load(object sender, EventArgs e) private void SetupDropdowns() { - ComboboxService.BindQuestStep(_GoalType); + ComboboxService.BindQuestGoal(_GoalType); } + } //StringBuilder allcl = new StringBuilder(allowedClasses); diff --git a/DOLToolbox/Controls/LOSQuestControl.resx b/DOLToolbox/Controls/RewardQuestControl.resx similarity index 100% rename from DOLToolbox/Controls/LOSQuestControl.resx rename to DOLToolbox/Controls/RewardQuestControl.resx diff --git a/DOLToolbox/Services/ComboboxService.cs b/DOLToolbox/Services/ComboboxService.cs index 89d1b7e..1c9395f 100644 --- a/DOLToolbox/Services/ComboboxService.cs +++ b/DOLToolbox/Services/ComboboxService.cs @@ -1317,5 +1317,21 @@ public static void BindQuestStep(ComboBox input) BindData(input, items); } + + public static void BindQuestGoal(ComboBox input) + { + var items = new List + { + new SelectItemModel(2, "Search"), + new SelectItemModel(3, "Kill"), + new SelectItemModel(4, "Interact"), + new SelectItemModel(5, "InteractFinish"), + new SelectItemModel(6, "InteractWhisper"), + new SelectItemModel(7, "InteractDeliver") + }; + + BindData(input, items); + } + } } \ No newline at end of file