diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs
index 9b84279fc..0b5605884 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.Designer.cs
@@ -31,203 +31,204 @@ namespace TBF.BenchControl.DataEntry.Munich
///
private void InitializeComponent()
{
- this.okButton = new System.Windows.Forms.Button();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.auxSN1TextBox = new System.Windows.Forms.TextBox();
- this.auxSN1Label = new System.Windows.Forms.Label();
- this.mainSN1TextBox = new System.Windows.Forms.TextBox();
- this.mainSN1Label = new System.Windows.Forms.Label();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.auxSN2TextBox = new System.Windows.Forms.TextBox();
- this.auxSN2Label = new System.Windows.Forms.Label();
- this.mainSN2TextBox = new System.Windows.Forms.TextBox();
- this.mainSN2Label = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.auxSN3TextBox = new System.Windows.Forms.TextBox();
- this.auxSN3Label = new System.Windows.Forms.Label();
- this.mainSN3TextBox = new System.Windows.Forms.TextBox();
- this.mainSN3Label = new System.Windows.Forms.Label();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
- this.SuspendLayout();
- //
- // okButton
- //
- this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.okButton.ForeColor = System.Drawing.Color.Black;
- this.okButton.Location = new System.Drawing.Point(557, 43);
- this.okButton.Name = "okButton";
- this.okButton.Size = new System.Drawing.Size(98, 63);
- this.okButton.TabIndex = 0;
- this.okButton.Text = "OK";
- this.okButton.UseVisualStyleBackColor = true;
- this.okButton.Click += new System.EventHandler(this.okButton_Click);
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.auxSN1TextBox);
- this.groupBox1.Controls.Add(this.auxSN1Label);
- this.groupBox1.Controls.Add(this.mainSN1TextBox);
- this.groupBox1.Controls.Add(this.mainSN1Label);
- this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox1.ForeColor = System.Drawing.Color.Black;
- this.groupBox1.Location = new System.Drawing.Point(28, 18);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(494, 137);
- this.groupBox1.TabIndex = 1;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Water Meter 1";
- //
- // auxSN1TextBox
- //
- this.auxSN1TextBox.Location = new System.Drawing.Point(300, 83);
- this.auxSN1TextBox.Name = "auxSN1TextBox";
- this.auxSN1TextBox.Size = new System.Drawing.Size(163, 31);
- this.auxSN1TextBox.TabIndex = 3;
- //
- // auxSN1Label
- //
- this.auxSN1Label.AutoSize = true;
- this.auxSN1Label.Location = new System.Drawing.Point(21, 86);
- this.auxSN1Label.Name = "auxSN1Label";
- this.auxSN1Label.Size = new System.Drawing.Size(193, 23);
- this.auxSN1Label.TabIndex = 2;
- this.auxSN1Label.Text = "Aux. WM Serial Nr.";
- //
- // mainSN1TextBox
- //
- this.mainSN1TextBox.Location = new System.Drawing.Point(300, 37);
- this.mainSN1TextBox.Name = "mainSN1TextBox";
- this.mainSN1TextBox.Size = new System.Drawing.Size(163, 31);
- this.mainSN1TextBox.TabIndex = 1;
- //
- // mainSN1Label
- //
- this.mainSN1Label.AutoSize = true;
- this.mainSN1Label.Location = new System.Drawing.Point(21, 40);
- this.mainSN1Label.Name = "mainSN1Label";
- this.mainSN1Label.Size = new System.Drawing.Size(195, 23);
- this.mainSN1Label.TabIndex = 0;
- this.mainSN1Label.Text = "Main WM Serial Nr.";
- //
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.auxSN2TextBox);
- this.groupBox2.Controls.Add(this.auxSN2Label);
- this.groupBox2.Controls.Add(this.mainSN2TextBox);
- this.groupBox2.Controls.Add(this.mainSN2Label);
- this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox2.ForeColor = System.Drawing.Color.Black;
- this.groupBox2.Location = new System.Drawing.Point(28, 175);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(494, 137);
- this.groupBox2.TabIndex = 2;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Water Meter 2";
- //
- // auxSN2TextBox
- //
- this.auxSN2TextBox.Location = new System.Drawing.Point(300, 83);
- this.auxSN2TextBox.Name = "auxSN2TextBox";
- this.auxSN2TextBox.Size = new System.Drawing.Size(163, 31);
- this.auxSN2TextBox.TabIndex = 3;
- //
- // auxSN2Label
- //
- this.auxSN2Label.AutoSize = true;
- this.auxSN2Label.Location = new System.Drawing.Point(21, 86);
- this.auxSN2Label.Name = "auxSN2Label";
- this.auxSN2Label.Size = new System.Drawing.Size(193, 23);
- this.auxSN2Label.TabIndex = 2;
- this.auxSN2Label.Text = "Aux. WM Serial Nr.";
- //
- // mainSN2TextBox
- //
- this.mainSN2TextBox.Location = new System.Drawing.Point(300, 37);
- this.mainSN2TextBox.Name = "mainSN2TextBox";
- this.mainSN2TextBox.Size = new System.Drawing.Size(163, 31);
- this.mainSN2TextBox.TabIndex = 1;
- //
- // mainSN2Label
- //
- this.mainSN2Label.AutoSize = true;
- this.mainSN2Label.Location = new System.Drawing.Point(21, 40);
- this.mainSN2Label.Name = "mainSN2Label";
- this.mainSN2Label.Size = new System.Drawing.Size(195, 23);
- this.mainSN2Label.TabIndex = 0;
- this.mainSN2Label.Text = "Main WM Serial Nr.";
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.auxSN3TextBox);
- this.groupBox3.Controls.Add(this.auxSN3Label);
- this.groupBox3.Controls.Add(this.mainSN3TextBox);
- this.groupBox3.Controls.Add(this.mainSN3Label);
- this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
- this.groupBox3.ForeColor = System.Drawing.Color.Black;
- this.groupBox3.Location = new System.Drawing.Point(28, 330);
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(494, 137);
- this.groupBox3.TabIndex = 3;
- this.groupBox3.TabStop = false;
- this.groupBox3.Text = "Water Meter 3";
- //
- // auxSN3TextBox
- //
- this.auxSN3TextBox.Location = new System.Drawing.Point(300, 83);
- this.auxSN3TextBox.Name = "auxSN3TextBox";
- this.auxSN3TextBox.Size = new System.Drawing.Size(163, 31);
- this.auxSN3TextBox.TabIndex = 3;
- //
- // auxSN3Label
- //
- this.auxSN3Label.AutoSize = true;
- this.auxSN3Label.Location = new System.Drawing.Point(21, 86);
- this.auxSN3Label.Name = "auxSN3Label";
- this.auxSN3Label.Size = new System.Drawing.Size(193, 23);
- this.auxSN3Label.TabIndex = 2;
- this.auxSN3Label.Text = "Aux. WM Serial Nr.";
- //
- // mainSN3TextBox
- //
- this.mainSN3TextBox.Location = new System.Drawing.Point(300, 37);
- this.mainSN3TextBox.Name = "mainSN3TextBox";
- this.mainSN3TextBox.Size = new System.Drawing.Size(163, 31);
- this.mainSN3TextBox.TabIndex = 1;
- //
- // mainSN3Label
- //
- this.mainSN3Label.AutoSize = true;
- this.mainSN3Label.Location = new System.Drawing.Point(21, 40);
- this.mainSN3Label.Name = "mainSN3Label";
- this.mainSN3Label.Size = new System.Drawing.Size(195, 23);
- this.mainSN3Label.TabIndex = 0;
- this.mainSN3Label.Text = "Main WM Serial Nr.";
- //
- // CycleBeginningForm
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.AutoSize = true;
- this.BackColor = System.Drawing.Color.DarkGoldenrod;
- this.ClientSize = new System.Drawing.Size(687, 492);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.okButton);
- this.ForeColor = System.Drawing.Color.Black;
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.Name = "CycleBeginningForm";
- this.Text = "Daten";
- this.TopMost = true;
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- this.ResumeLayout(false);
+ this.okButton = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.auxSN1TextBox = new System.Windows.Forms.TextBox();
+ this.auxSN1Label = new System.Windows.Forms.Label();
+ this.mainSN1TextBox = new System.Windows.Forms.TextBox();
+ this.mainSN1Label = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.auxSN2TextBox = new System.Windows.Forms.TextBox();
+ this.auxSN2Label = new System.Windows.Forms.Label();
+ this.mainSN2TextBox = new System.Windows.Forms.TextBox();
+ this.mainSN2Label = new System.Windows.Forms.Label();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.auxSN3TextBox = new System.Windows.Forms.TextBox();
+ this.auxSN3Label = new System.Windows.Forms.Label();
+ this.mainSN3TextBox = new System.Windows.Forms.TextBox();
+ this.mainSN3Label = new System.Windows.Forms.Label();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // okButton
+ //
+ this.okButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.okButton.ForeColor = System.Drawing.Color.Black;
+ this.okButton.Location = new System.Drawing.Point(557, 43);
+ this.okButton.Name = "okButton";
+ this.okButton.Size = new System.Drawing.Size(98, 63);
+ this.okButton.TabIndex = 0;
+ this.okButton.Text = "OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.auxSN1TextBox);
+ this.groupBox1.Controls.Add(this.auxSN1Label);
+ this.groupBox1.Controls.Add(this.mainSN1TextBox);
+ this.groupBox1.Controls.Add(this.mainSN1Label);
+ this.groupBox1.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox1.ForeColor = System.Drawing.Color.Black;
+ this.groupBox1.Location = new System.Drawing.Point(28, 18);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(494, 137);
+ this.groupBox1.TabIndex = 1;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Water Meter 1";
+ //
+ // auxSN1TextBox
+ //
+ this.auxSN1TextBox.Location = new System.Drawing.Point(300, 83);
+ this.auxSN1TextBox.Name = "auxSN1TextBox";
+ this.auxSN1TextBox.Size = new System.Drawing.Size(163, 31);
+ this.auxSN1TextBox.TabIndex = 3;
+ //
+ // auxSN1Label
+ //
+ this.auxSN1Label.AutoSize = true;
+ this.auxSN1Label.Location = new System.Drawing.Point(21, 86);
+ this.auxSN1Label.Name = "auxSN1Label";
+ this.auxSN1Label.Size = new System.Drawing.Size(193, 23);
+ this.auxSN1Label.TabIndex = 2;
+ this.auxSN1Label.Text = "Aux. WM Serial Nr.";
+ //
+ // mainSN1TextBox
+ //
+ this.mainSN1TextBox.Location = new System.Drawing.Point(300, 37);
+ this.mainSN1TextBox.Name = "mainSN1TextBox";
+ this.mainSN1TextBox.Size = new System.Drawing.Size(163, 31);
+ this.mainSN1TextBox.TabIndex = 1;
+ //
+ // mainSN1Label
+ //
+ this.mainSN1Label.AutoSize = true;
+ this.mainSN1Label.Location = new System.Drawing.Point(21, 40);
+ this.mainSN1Label.Name = "mainSN1Label";
+ this.mainSN1Label.Size = new System.Drawing.Size(195, 23);
+ this.mainSN1Label.TabIndex = 0;
+ this.mainSN1Label.Text = "Main WM Serial Nr.";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.auxSN2TextBox);
+ this.groupBox2.Controls.Add(this.auxSN2Label);
+ this.groupBox2.Controls.Add(this.mainSN2TextBox);
+ this.groupBox2.Controls.Add(this.mainSN2Label);
+ this.groupBox2.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox2.ForeColor = System.Drawing.Color.Black;
+ this.groupBox2.Location = new System.Drawing.Point(28, 175);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(494, 137);
+ this.groupBox2.TabIndex = 2;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Water Meter 2";
+ //
+ // auxSN2TextBox
+ //
+ this.auxSN2TextBox.Location = new System.Drawing.Point(300, 83);
+ this.auxSN2TextBox.Name = "auxSN2TextBox";
+ this.auxSN2TextBox.Size = new System.Drawing.Size(163, 31);
+ this.auxSN2TextBox.TabIndex = 3;
+ //
+ // auxSN2Label
+ //
+ this.auxSN2Label.AutoSize = true;
+ this.auxSN2Label.Location = new System.Drawing.Point(21, 86);
+ this.auxSN2Label.Name = "auxSN2Label";
+ this.auxSN2Label.Size = new System.Drawing.Size(193, 23);
+ this.auxSN2Label.TabIndex = 2;
+ this.auxSN2Label.Text = "Aux. WM Serial Nr.";
+ //
+ // mainSN2TextBox
+ //
+ this.mainSN2TextBox.Location = new System.Drawing.Point(300, 37);
+ this.mainSN2TextBox.Name = "mainSN2TextBox";
+ this.mainSN2TextBox.Size = new System.Drawing.Size(163, 31);
+ this.mainSN2TextBox.TabIndex = 1;
+ //
+ // mainSN2Label
+ //
+ this.mainSN2Label.AutoSize = true;
+ this.mainSN2Label.Location = new System.Drawing.Point(21, 40);
+ this.mainSN2Label.Name = "mainSN2Label";
+ this.mainSN2Label.Size = new System.Drawing.Size(195, 23);
+ this.mainSN2Label.TabIndex = 0;
+ this.mainSN2Label.Text = "Main WM Serial Nr.";
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.auxSN3TextBox);
+ this.groupBox3.Controls.Add(this.auxSN3Label);
+ this.groupBox3.Controls.Add(this.mainSN3TextBox);
+ this.groupBox3.Controls.Add(this.mainSN3Label);
+ this.groupBox3.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+ this.groupBox3.ForeColor = System.Drawing.Color.Black;
+ this.groupBox3.Location = new System.Drawing.Point(28, 330);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.Size = new System.Drawing.Size(494, 137);
+ this.groupBox3.TabIndex = 3;
+ this.groupBox3.TabStop = false;
+ this.groupBox3.Text = "Water Meter 3";
+ //
+ // auxSN3TextBox
+ //
+ this.auxSN3TextBox.Location = new System.Drawing.Point(300, 83);
+ this.auxSN3TextBox.Name = "auxSN3TextBox";
+ this.auxSN3TextBox.Size = new System.Drawing.Size(163, 31);
+ this.auxSN3TextBox.TabIndex = 3;
+ //
+ // auxSN3Label
+ //
+ this.auxSN3Label.AutoSize = true;
+ this.auxSN3Label.Location = new System.Drawing.Point(21, 86);
+ this.auxSN3Label.Name = "auxSN3Label";
+ this.auxSN3Label.Size = new System.Drawing.Size(193, 23);
+ this.auxSN3Label.TabIndex = 2;
+ this.auxSN3Label.Text = "Aux. WM Serial Nr.";
+ //
+ // mainSN3TextBox
+ //
+ this.mainSN3TextBox.Location = new System.Drawing.Point(300, 37);
+ this.mainSN3TextBox.Name = "mainSN3TextBox";
+ this.mainSN3TextBox.Size = new System.Drawing.Size(163, 31);
+ this.mainSN3TextBox.TabIndex = 1;
+ //
+ // mainSN3Label
+ //
+ this.mainSN3Label.AutoSize = true;
+ this.mainSN3Label.Location = new System.Drawing.Point(21, 40);
+ this.mainSN3Label.Name = "mainSN3Label";
+ this.mainSN3Label.Size = new System.Drawing.Size(195, 23);
+ this.mainSN3Label.TabIndex = 0;
+ this.mainSN3Label.Text = "Main WM Serial Nr.";
+ //
+ // CycleBeginningForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.AutoSize = true;
+ this.BackColor = System.Drawing.Color.DarkGoldenrod;
+ this.ClientSize = new System.Drawing.Size(687, 492);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.okButton);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "CycleBeginningForm";
+ this.Text = "Daten";
+ this.TopMost = true;
+ this.Load += new System.EventHandler(this.CycleBeginningForm_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
+ this.ResumeLayout(false);
}
diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
index 62cb3035b..fed9d6e51 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
@@ -30,6 +30,11 @@ namespace TBF.BenchControl.DataEntry.Munich
AuxSNText = new string[Config.Data.CompoundWMsCount];
completed = false;
+ StartForceCloseHandler();
+ }
+
+ private void CycleBeginningForm_Load(object sender, EventArgs e)
+ {
if (Config.Data.CompoundWMsCount < 2)
{
Height = 200;
@@ -39,9 +44,7 @@ namespace TBF.BenchControl.DataEntry.Munich
Height = 355;
}
- Localize();
-
- StartForceCloseHandler();
+ Localize();
}
void Localize()
diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.resx
index 8e3db3297..04ebfb992 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.resx
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.resx
@@ -132,6 +132,18 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -147,6 +159,18 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -162,4 +186,16 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
\ No newline at end of file