diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.Designer.cs index 68b546c67..722344258 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.Designer.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.Designer.cs @@ -34,32 +34,33 @@ namespace TBF.BenchControl.DataEntry.Standard System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBeginningForm)); this.okButton = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); this.checkBox7 = new System.Windows.Forms.CheckBox(); this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.comboBox4 = new System.Windows.Forms.ComboBox(); this.checkBox4 = new System.Windows.Forms.CheckBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.comboBox5 = new System.Windows.Forms.ComboBox(); this.checkBox5 = new System.Windows.Forms.CheckBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.comboBox6 = new System.Windows.Forms.ComboBox(); this.checkBox6 = new System.Windows.Forms.CheckBox(); - this.textBox6 = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.orderGroupBox = new System.Windows.Forms.GroupBox(); this.orderComboBox = new System.Windows.Forms.ComboBox(); + this.clearButton = new System.Windows.Forms.Button(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -79,26 +80,28 @@ namespace TBF.BenchControl.DataEntry.Standard // // groupBox1 // + this.groupBox1.Controls.Add(this.comboBox1); this.groupBox1.Controls.Add(this.checkBox1); - this.groupBox1.Controls.Add(this.textBox1); this.groupBox1.Controls.Add(this.label1); resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.ForeColor = System.Drawing.Color.Black; this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + resources.ApplyResources(this.comboBox1, "comboBox1"); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + this.comboBox1.TextChanged += new System.EventHandler(this.comboBox1_TextChanged); + // // checkBox1 // resources.ApplyResources(this.checkBox1, "checkBox1"); this.checkBox1.Name = "checkBox1"; this.checkBox1.UseVisualStyleBackColor = true; // - // textBox1 - // - resources.ApplyResources(this.textBox1, "textBox1"); - this.textBox1.Name = "textBox1"; - this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged); - // // label1 // resources.ApplyResources(this.label1, "label1"); @@ -106,26 +109,28 @@ namespace TBF.BenchControl.DataEntry.Standard // // groupBox2 // + this.groupBox2.Controls.Add(this.comboBox2); this.groupBox2.Controls.Add(this.checkBox2); - this.groupBox2.Controls.Add(this.textBox2); this.groupBox2.Controls.Add(this.label2); resources.ApplyResources(this.groupBox2, "groupBox2"); this.groupBox2.ForeColor = System.Drawing.Color.Black; this.groupBox2.Name = "groupBox2"; this.groupBox2.TabStop = false; // + // comboBox2 + // + this.comboBox2.FormattingEnabled = true; + resources.ApplyResources(this.comboBox2, "comboBox2"); + this.comboBox2.Name = "comboBox2"; + this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox2_SelectedIndexChanged); + this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged); + // // checkBox2 // resources.ApplyResources(this.checkBox2, "checkBox2"); this.checkBox2.Name = "checkBox2"; this.checkBox2.UseVisualStyleBackColor = true; // - // textBox2 - // - resources.ApplyResources(this.textBox2, "textBox2"); - this.textBox2.Name = "textBox2"; - this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged); - // // label2 // resources.ApplyResources(this.label2, "label2"); @@ -133,15 +138,23 @@ namespace TBF.BenchControl.DataEntry.Standard // // groupBox3 // + this.groupBox3.Controls.Add(this.comboBox3); this.groupBox3.Controls.Add(this.checkBox7); this.groupBox3.Controls.Add(this.checkBox3); - this.groupBox3.Controls.Add(this.textBox3); this.groupBox3.Controls.Add(this.label3); resources.ApplyResources(this.groupBox3, "groupBox3"); this.groupBox3.ForeColor = System.Drawing.Color.Black; this.groupBox3.Name = "groupBox3"; this.groupBox3.TabStop = false; // + // comboBox3 + // + this.comboBox3.FormattingEnabled = true; + resources.ApplyResources(this.comboBox3, "comboBox3"); + this.comboBox3.Name = "comboBox3"; + this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); + this.comboBox3.TextChanged += new System.EventHandler(this.comboBox3_TextChanged); + // // checkBox7 // resources.ApplyResources(this.checkBox7, "checkBox7"); @@ -154,12 +167,6 @@ namespace TBF.BenchControl.DataEntry.Standard this.checkBox3.Name = "checkBox3"; this.checkBox3.UseVisualStyleBackColor = true; // - // textBox3 - // - resources.ApplyResources(this.textBox3, "textBox3"); - this.textBox3.Name = "textBox3"; - this.textBox3.TextChanged += new System.EventHandler(this.textBox3_TextChanged); - // // label3 // resources.ApplyResources(this.label3, "label3"); @@ -167,26 +174,28 @@ namespace TBF.BenchControl.DataEntry.Standard // // groupBox4 // + this.groupBox4.Controls.Add(this.comboBox4); this.groupBox4.Controls.Add(this.checkBox4); - this.groupBox4.Controls.Add(this.textBox4); this.groupBox4.Controls.Add(this.label4); resources.ApplyResources(this.groupBox4, "groupBox4"); this.groupBox4.ForeColor = System.Drawing.Color.Black; this.groupBox4.Name = "groupBox4"; this.groupBox4.TabStop = false; // + // comboBox4 + // + this.comboBox4.FormattingEnabled = true; + resources.ApplyResources(this.comboBox4, "comboBox4"); + this.comboBox4.Name = "comboBox4"; + this.comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox4_SelectedIndexChanged); + this.comboBox4.TextChanged += new System.EventHandler(this.comboBox4_TextChanged); + // // checkBox4 // resources.ApplyResources(this.checkBox4, "checkBox4"); this.checkBox4.Name = "checkBox4"; this.checkBox4.UseVisualStyleBackColor = true; // - // textBox4 - // - resources.ApplyResources(this.textBox4, "textBox4"); - this.textBox4.Name = "textBox4"; - this.textBox4.TextChanged += new System.EventHandler(this.textBox4_TextChanged); - // // label4 // resources.ApplyResources(this.label4, "label4"); @@ -194,26 +203,28 @@ namespace TBF.BenchControl.DataEntry.Standard // // groupBox5 // + this.groupBox5.Controls.Add(this.comboBox5); this.groupBox5.Controls.Add(this.checkBox5); - this.groupBox5.Controls.Add(this.textBox5); this.groupBox5.Controls.Add(this.label5); resources.ApplyResources(this.groupBox5, "groupBox5"); this.groupBox5.ForeColor = System.Drawing.Color.Black; this.groupBox5.Name = "groupBox5"; this.groupBox5.TabStop = false; // + // comboBox5 + // + this.comboBox5.FormattingEnabled = true; + resources.ApplyResources(this.comboBox5, "comboBox5"); + this.comboBox5.Name = "comboBox5"; + this.comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged); + this.comboBox5.TextChanged += new System.EventHandler(this.comboBox5_TextChanged); + // // checkBox5 // resources.ApplyResources(this.checkBox5, "checkBox5"); this.checkBox5.Name = "checkBox5"; this.checkBox5.UseVisualStyleBackColor = true; // - // textBox5 - // - resources.ApplyResources(this.textBox5, "textBox5"); - this.textBox5.Name = "textBox5"; - this.textBox5.TextChanged += new System.EventHandler(this.textBox5_TextChanged); - // // label5 // resources.ApplyResources(this.label5, "label5"); @@ -221,26 +232,28 @@ namespace TBF.BenchControl.DataEntry.Standard // // groupBox6 // + this.groupBox6.Controls.Add(this.comboBox6); this.groupBox6.Controls.Add(this.checkBox6); - this.groupBox6.Controls.Add(this.textBox6); this.groupBox6.Controls.Add(this.label6); resources.ApplyResources(this.groupBox6, "groupBox6"); this.groupBox6.ForeColor = System.Drawing.Color.Black; this.groupBox6.Name = "groupBox6"; this.groupBox6.TabStop = false; // + // comboBox6 + // + this.comboBox6.FormattingEnabled = true; + resources.ApplyResources(this.comboBox6, "comboBox6"); + this.comboBox6.Name = "comboBox6"; + this.comboBox6.SelectedIndexChanged += new System.EventHandler(this.comboBox6_SelectedIndexChanged); + this.comboBox6.TextChanged += new System.EventHandler(this.comboBox6_TextChanged); + // // checkBox6 // resources.ApplyResources(this.checkBox6, "checkBox6"); this.checkBox6.Name = "checkBox6"; this.checkBox6.UseVisualStyleBackColor = true; // - // textBox6 - // - resources.ApplyResources(this.textBox6, "textBox6"); - this.textBox6.Name = "textBox6"; - this.textBox6.TextChanged += new System.EventHandler(this.textBox6_TextChanged); - // // label6 // resources.ApplyResources(this.label6, "label6"); @@ -260,11 +273,20 @@ namespace TBF.BenchControl.DataEntry.Standard resources.ApplyResources(this.orderComboBox, "orderComboBox"); this.orderComboBox.Name = "orderComboBox"; // + // clearButton + // + resources.ApplyResources(this.clearButton, "clearButton"); + this.clearButton.ForeColor = System.Drawing.Color.Black; + this.clearButton.Name = "clearButton"; + this.clearButton.UseVisualStyleBackColor = true; + this.clearButton.Click += new System.EventHandler(this.clearButton_Click); + // // CycleBeginningForm // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.DarkGoldenrod; + this.Controls.Add(this.clearButton); this.Controls.Add(this.orderGroupBox); this.Controls.Add(this.groupBox6); this.Controls.Add(this.groupBox5); @@ -299,22 +321,16 @@ namespace TBF.BenchControl.DataEntry.Standard private System.Windows.Forms.Button okButton; private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label2; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Label label3; - private System.Windows.Forms.GroupBox groupBox4; - private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.Label label4; - private System.Windows.Forms.GroupBox groupBox5; - private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.Label label5; - private System.Windows.Forms.GroupBox groupBox6; - private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.Label label6; private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.CheckBox checkBox2; @@ -325,5 +341,12 @@ namespace TBF.BenchControl.DataEntry.Standard private System.Windows.Forms.CheckBox checkBox6; private System.Windows.Forms.GroupBox orderGroupBox; private System.Windows.Forms.ComboBox orderComboBox; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.ComboBox comboBox2; + private System.Windows.Forms.ComboBox comboBox3; + private System.Windows.Forms.ComboBox comboBox4; + private System.Windows.Forms.ComboBox comboBox5; + private System.Windows.Forms.ComboBox comboBox6; + private System.Windows.Forms.Button clearButton; } } \ No newline at end of file diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs index 598e5e208..097c6ca39 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.cs @@ -52,6 +52,16 @@ namespace TBF.BenchControl.DataEntry.Standard PrepareOrderCombo(orderComboBox); + if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount) + { + if (WaterMetersCount >= 1) comboBox1.Items.Add(Program.LocalSettings.LastSNTexts[0]); + if (WaterMetersCount >= 2) comboBox2.Items.Add(Program.LocalSettings.LastSNTexts[1]); + if (WaterMetersCount >= 3) comboBox3.Items.Add(Program.LocalSettings.LastSNTexts[2]); + if (WaterMetersCount >= 4) comboBox4.Items.Add(Program.LocalSettings.LastSNTexts[3]); + if (WaterMetersCount >= 5) comboBox5.Items.Add(Program.LocalSettings.LastSNTexts[4]); + if (WaterMetersCount >= 6) comboBox6.Items.Add(Program.LocalSettings.LastSNTexts[5]); + } + if (WaterMetersCount < 1) groupBox1.Visible = false; if (WaterMetersCount < 2) groupBox2.Visible = false; if (WaterMetersCount < 3) groupBox3.Visible = false; @@ -106,46 +116,155 @@ namespace TBF.BenchControl.DataEntry.Standard #endif ); - if (WaterMetersCount >= 1) { SNText[0] = textBox1.Text; Disabled[0] = !checkBox1.Checked; } - if (WaterMetersCount >= 2) { SNText[1] = textBox2.Text; Disabled[1] = !checkBox2.Checked; } - if (WaterMetersCount >= 3) { SNText[2] = textBox3.Text; Disabled[2] = !checkBox3.Checked; } - if (WaterMetersCount >= 4) { SNText[3] = textBox4.Text; Disabled[3] = !checkBox4.Checked; } - if (WaterMetersCount >= 5) { SNText[4] = textBox5.Text; Disabled[4] = !checkBox5.Checked; } - if (WaterMetersCount >= 6) { SNText[5] = textBox6.Text; Disabled[5] = !checkBox6.Checked; } + Program.LocalSettings.LastSNTexts = SNText; + + if (WaterMetersCount >= 1) { SNText[0] = comboBox1.Text; Disabled[0] = !checkBox1.Checked; } + if (WaterMetersCount >= 2) { SNText[1] = comboBox2.Text; Disabled[1] = !checkBox2.Checked; } + if (WaterMetersCount >= 3) { SNText[2] = comboBox3.Text; Disabled[2] = !checkBox3.Checked; } + if (WaterMetersCount >= 4) { SNText[3] = comboBox4.Text; Disabled[3] = !checkBox4.Checked; } + if (WaterMetersCount >= 5) { SNText[4] = comboBox5.Text; Disabled[4] = !checkBox5.Checked; } + if (WaterMetersCount >= 6) { SNText[5] = comboBox6.Text; Disabled[5] = !checkBox6.Checked; } completed = true; Close(); } - private void textBox1_TextChanged(object sender, EventArgs e) + + private void UpdateAllCombos() + { + if (WaterMetersCount >= 1) + { + comboBox1.Text = Program.LocalSettings.LastSNTexts[0]; + checkBox1.Checked = !string.IsNullOrEmpty(comboBox1.Text); + } + if (WaterMetersCount >= 2) + { + comboBox2.Text = Program.LocalSettings.LastSNTexts[1]; + checkBox2.Checked = !string.IsNullOrEmpty(comboBox2.Text); + } + if (WaterMetersCount >= 3) + { + comboBox3.Text = Program.LocalSettings.LastSNTexts[2]; + checkBox3.Checked = !string.IsNullOrEmpty(comboBox3.Text); + } + if (WaterMetersCount >= 4) + { + comboBox4.Text = Program.LocalSettings.LastSNTexts[3]; + checkBox4.Checked = !string.IsNullOrEmpty(comboBox4.Text); + } + if (WaterMetersCount >= 5) + { + comboBox5.Text = Program.LocalSettings.LastSNTexts[4]; + checkBox5.Checked = !string.IsNullOrEmpty(comboBox5.Text); + } + if (WaterMetersCount >= 6) + { + comboBox6.Text = Program.LocalSettings.LastSNTexts[5]; + checkBox6.Checked = !string.IsNullOrEmpty(comboBox6.Text); + } + } + + private void comboBox1_TextChanged(object sender, EventArgs e) { checkBox1.Checked = true; } + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount) + { + if (comboBox1.Text.Equals(Program.LocalSettings.LastSNTexts[0])) + { + UpdateAllCombos(); + } + } + } - private void textBox2_TextChanged(object sender, EventArgs e) + + private void comboBox2_TextChanged(object sender, EventArgs e) { checkBox2.Checked = true; } + private void comboBox2_SelectedIndexChanged(object sender, EventArgs e) + { + if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount) + { + if (comboBox2.Text.Equals(Program.LocalSettings.LastSNTexts[1])) + { + UpdateAllCombos(); + } + } + } - private void textBox3_TextChanged(object sender, EventArgs e) + private void comboBox3_TextChanged(object sender, EventArgs e) { checkBox3.Checked = true; } + private void comboBox3_SelectedIndexChanged(object sender, EventArgs e) + { + if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount) + { + if (comboBox3.Text.Equals(Program.LocalSettings.LastSNTexts[2])) + { + UpdateAllCombos(); + } + } + } - private void textBox4_TextChanged(object sender, EventArgs e) + private void comboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; } - - private void textBox5_TextChanged(object sender, EventArgs e) + private void comboBox4_SelectedIndexChanged(object sender, EventArgs e) + { + if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount) + { + if (comboBox4.Text.Equals(Program.LocalSettings.LastSNTexts[3])) + { + UpdateAllCombos(); + } + } + } + + private void comboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; } + private void comboBox5_SelectedIndexChanged(object sender, EventArgs e) + { + if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount) + { + if (comboBox5.Text.Equals(Program.LocalSettings.LastSNTexts[4])) + { + UpdateAllCombos(); + } + } + } - private void textBox6_TextChanged(object sender, EventArgs e) + private void comboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; } + private void comboBox6_SelectedIndexChanged(object sender, EventArgs e) + { + if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount) + { + if (comboBox6.Text.Equals(Program.LocalSettings.LastSNTexts[5])) + { + UpdateAllCombos(); + } + } + } + + private void clearButton_Click(object sender, EventArgs e) + { + if (WaterMetersCount >= 1) { comboBox1.Text = string.Empty; checkBox1.Checked = false; } + if (WaterMetersCount >= 2) { comboBox2.Text = string.Empty; checkBox2.Checked = false; } + if (WaterMetersCount >= 3) { comboBox3.Text = string.Empty; checkBox3.Checked = false; } + if (WaterMetersCount >= 4) { comboBox4.Text = string.Empty; checkBox4.Checked = false; } + if (WaterMetersCount >= 5) { comboBox5.Text = string.Empty; checkBox5.Checked = false; } + if (WaterMetersCount >= 6) { comboBox6.Text = string.Empty; checkBox6.Checked = false; } + } + #region Forced close handling @@ -165,5 +284,5 @@ namespace TBF.BenchControl.DataEntry.Standard } #endregion - } + } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.resx index fc3e779ca..9c8cab89a 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.resx +++ b/TestBenchFramework/BenchControl/DataEntry/Standard/CycleBeginningForm.resx @@ -144,7 +144,43 @@ $this - 7 + 8 + + + 187, 29 + + + 163, 31 + + + 3 + + + comboBox1 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + True + + + Verdana, 27.75pt + + + 391, 40 + + + 15, 14 + + + 2 checkBox1 @@ -156,19 +192,22 @@ groupBox1 + 1 + + + True + + + 18, 32 + + + 156, 23 + + 0 - - textBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 1 + + Serial Number: label1 @@ -207,82 +246,47 @@ $this - 6 + 7 - - True - - - Verdana, 27.75pt - - - 391, 40 - - - 15, 14 - - - 2 - - - checkBox1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 0 - - + 187, 29 - + 163, 31 - - 1 + + 8 - - textBox1 + + comboBox2 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + groupBox2 - - 1 - - - True - - - 18, 32 - - - 156, 23 - - + 0 - - Serial Number: + + True - - label1 + + Verdana, 27.75pt - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl - - groupBox1 + + 391, 40 - - 2 + + 15, 14 + + + 7 checkBox2 @@ -294,19 +298,22 @@ groupBox2 + 1 + + + True + + + 18, 32 + + + 156, 23 + + 0 - - textBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 + + Serial Number: label2 @@ -345,85 +352,45 @@ $this - 5 + 6 - - True + + 187, 31 - - Verdana, 27.75pt - - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - 187, 29 - - + 163, 31 - - 1 + + 8 - - textBox2 + + comboBox3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox2 + + groupBox3 - - 1 - - - True - - - 18, 32 - - - 156, 23 - - + 0 - - Serial Number: + + True - - label2 + + Verdana, 27.75pt - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - groupBox2 + + 391, -161 - + + 15, 14 + + 2 @@ -436,7 +403,25 @@ groupBox3 - 0 + 1 + + + True + + + Verdana, 27.75pt + + + NoControl + + + 391, 40 + + + 15, 14 + + + 7 checkBox3 @@ -448,20 +433,26 @@ groupBox3 - 1 - - - textBox3 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - 2 + + True + + + NoControl + + + 18, 32 + + + 156, 23 + + + 0 + + + Serial Number: + label3 @@ -499,118 +490,46 @@ $this - 4 + 5 - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, -161 - - - 15, 14 - - - 2 - - - checkBox7 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 0 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox3 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 1 - - + 187, 29 - + 163, 31 - - 1 + + 8 - - textBox3 + + comboBox4 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox3 + + groupBox4 - - 2 - - - True - - - NoControl - - - 18, 32 - - - 156, 23 - - + 0 - - Serial Number: + + True - - label3 + + Verdana, 27.75pt - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - groupBox3 + + 391, 40 - - 3 + + 15, 14 + + + 7 checkBox4 @@ -622,19 +541,22 @@ groupBox4 + 1 + + + True + + + 18, 32 + + + 156, 23 + + 0 - - textBox4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 1 + + Serial Number: label4 @@ -673,85 +595,46 @@ $this - 3 + 4 - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 0 - - + 187, 29 - + 163, 31 - - 1 + + 8 - - textBox4 + + comboBox5 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox4 + + groupBox5 - - 1 - - - True - - - 18, 32 - - - 156, 23 - - + 0 - - Serial Number: + + True - - label4 + + Verdana, 27.75pt - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - groupBox4 + + 391, 40 - - 2 + + 15, 14 + + + 7 checkBox5 @@ -763,19 +646,22 @@ groupBox5 + 1 + + + True + + + 18, 32 + + + 156, 23 + + 0 - - textBox5 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 1 + + Serial Number: label5 @@ -814,85 +700,46 @@ $this - 2 + 3 - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox5 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox5 - - - 0 - - + 187, 29 - + 163, 31 - - 1 + + 8 - - textBox5 + + comboBox6 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox5 + + groupBox6 - - 1 - - - True - - - 18, 32 - - - 156, 23 - - + 0 - - Serial Number: + + True - - label5 + + Verdana, 27.75pt - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - groupBox5 + + 391, 40 - - 2 + + 15, 14 + + + 7 checkBox6 @@ -904,19 +751,22 @@ groupBox6 + 1 + + + True + + + 18, 32 + + + 156, 23 + + 0 - - textBox6 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 1 + + Serial Number: label6 @@ -955,86 +805,17 @@ $this - 1 - - - True - - - Verdana, 27.75pt - - - NoControl - - - 391, 40 - - - 15, 14 - - - 7 - - - checkBox6 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 0 - - - 187, 29 - - - 163, 31 - - - 1 - - - textBox6 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - - 1 - - - True - - - 18, 32 - - - 156, 23 - - - 0 - - - Serial Number: - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox6 - - 2 + + 90, 31 + + + 260, 31 + + + 0 + orderComboBox @@ -1072,27 +853,36 @@ $this - 0 + 1 - - 90, 31 + + Verdana, 14.25pt - - 260, 31 + + NoControl - - 0 + + 506, 107 - - orderComboBox + + 98, 63 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 - - orderGroupBox + + Clear - + + clearButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 diff --git a/TestBenchFramework/LocalSettings.cs b/TestBenchFramework/LocalSettings.cs index bcabcb373..b7e387e0b 100644 --- a/TestBenchFramework/LocalSettings.cs +++ b/TestBenchFramework/LocalSettings.cs @@ -142,6 +142,11 @@ namespace TBF public int PrintOrderLeft; public int PrintOrderTop; + /// Serial numbers + public string[] LastSNTexts; + [XmlIgnore] + public int LastSNTextsCount { get { return (LastSNTexts != null) ? LastSNTexts.Length : 0; } } + /// Purchase order history public string[] PurchaseOrderHistory; [XmlIgnore] diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index ea9860510..4d518a1f1 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.3.18.1")] -[assembly: AssemblyFileVersion("1.3.18.1")] +[assembly: AssemblyVersion("1.3.19.1")] +[assembly: AssemblyFileVersion("1.3.19.1")]