From 8cbf4a6b9f334246d88c8101ae3db9a21f1bab3f Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 28 四月 2021 11:40:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/UI/M071_MainForm.Designer.cs | 93 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 75 insertions(+), 18 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
index a702101..ddfc076 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
@@ -50,6 +50,10 @@
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.propGridKeyIndicator = new System.Windows.Forms.PropertyGrid();
this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.lblOperator = new System.Windows.Forms.Label();
+ this.stStripHint = new System.Windows.Forms.StatusStrip();
+ this.tsslError = new System.Windows.Forms.ToolStripStatusLabel();
+ this.button1 = new System.Windows.Forms.Button();
this.contextMenuStrip1.SuspendLayout();
this.plImage.SuspendLayout();
this.tscEditLocation.ContentPanel.SuspendLayout();
@@ -59,6 +63,7 @@
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
+ this.stStripHint.SuspendLayout();
this.SuspendLayout();
//
// contextMenuStrip1
@@ -109,7 +114,7 @@
this.btnReset.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnReset.Font = new System.Drawing.Font("瀹嬩綋", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
this.btnReset.ForeColor = System.Drawing.Color.DarkGreen;
- this.btnReset.Location = new System.Drawing.Point(531, 8);
+ this.btnReset.Location = new System.Drawing.Point(800, 8);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(141, 35);
this.btnReset.TabIndex = 5;
@@ -125,7 +130,7 @@
this.btnStartMeasure.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnStartMeasure.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
this.btnStartMeasure.ForeColor = System.Drawing.Color.DarkGreen;
- this.btnStartMeasure.Location = new System.Drawing.Point(678, 8);
+ this.btnStartMeasure.Location = new System.Drawing.Point(947, 8);
this.btnStartMeasure.Name = "btnStartMeasure";
this.btnStartMeasure.Size = new System.Drawing.Size(110, 35);
this.btnStartMeasure.TabIndex = 5;
@@ -137,7 +142,7 @@
//
this.lblCT.AutoSize = true;
this.lblCT.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134)));
- this.lblCT.Location = new System.Drawing.Point(464, 19);
+ this.lblCT.Location = new System.Drawing.Point(550, 21);
this.lblCT.Name = "lblCT";
this.lblCT.Size = new System.Drawing.Size(35, 14);
this.lblCT.TabIndex = 4;
@@ -146,7 +151,7 @@
// txtBarcode
//
this.txtBarcode.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134)));
- this.txtBarcode.Location = new System.Drawing.Point(138, 13);
+ this.txtBarcode.Location = new System.Drawing.Point(222, 13);
this.txtBarcode.Name = "txtBarcode";
this.txtBarcode.Size = new System.Drawing.Size(261, 24);
this.txtBarcode.TabIndex = 3;
@@ -159,7 +164,7 @@
this.lblProductionState.BackColor = System.Drawing.Color.Lime;
this.lblProductionState.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
this.lblProductionState.ForeColor = System.Drawing.Color.DarkGreen;
- this.lblProductionState.Location = new System.Drawing.Point(405, 13);
+ this.lblProductionState.Location = new System.Drawing.Point(489, 13);
this.lblProductionState.Name = "lblProductionState";
this.lblProductionState.Size = new System.Drawing.Size(39, 24);
this.lblProductionState.TabIndex = 2;
@@ -171,7 +176,7 @@
this.lblMachineState.BackColor = System.Drawing.Color.Lime;
this.lblMachineState.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.World, ((byte)(134)));
this.lblMachineState.ForeColor = System.Drawing.Color.DarkGreen;
- this.lblMachineState.Location = new System.Drawing.Point(22, 12);
+ this.lblMachineState.Location = new System.Drawing.Point(137, 13);
this.lblMachineState.Name = "lblMachineState";
this.lblMachineState.Size = new System.Drawing.Size(79, 24);
this.lblMachineState.TabIndex = 2;
@@ -186,7 +191,7 @@
this.plImage.Controls.Add(this.tscEditLocation);
this.plImage.Location = new System.Drawing.Point(1, 47);
this.plImage.Name = "plImage";
- this.plImage.Size = new System.Drawing.Size(796, 304);
+ this.plImage.Size = new System.Drawing.Size(1065, 279);
this.plImage.TabIndex = 1;
//
// tscEditLocation
@@ -195,11 +200,11 @@
// tscEditLocation.ContentPanel
//
this.tscEditLocation.ContentPanel.Controls.Add(this.tableLayoutPanel1);
- this.tscEditLocation.ContentPanel.Size = new System.Drawing.Size(209, 279);
+ this.tscEditLocation.ContentPanel.Size = new System.Drawing.Size(209, 254);
this.tscEditLocation.Dock = System.Windows.Forms.DockStyle.Right;
- this.tscEditLocation.Location = new System.Drawing.Point(587, 0);
+ this.tscEditLocation.Location = new System.Drawing.Point(856, 0);
this.tscEditLocation.Name = "tscEditLocation";
- this.tscEditLocation.Size = new System.Drawing.Size(209, 304);
+ this.tscEditLocation.Size = new System.Drawing.Size(209, 279);
this.tscEditLocation.TabIndex = 0;
this.tscEditLocation.Text = "toolStripContainer1";
this.tscEditLocation.Visible = false;
@@ -218,7 +223,7 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 279);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 254);
this.tableLayoutPanel1.TabIndex = 0;
//
// btnConfirmEdit
@@ -227,7 +232,7 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.btnConfirmEdit.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnConfirmEdit.Location = new System.Drawing.Point(3, 246);
+ this.btnConfirmEdit.Location = new System.Drawing.Point(3, 221);
this.btnConfirmEdit.Name = "btnConfirmEdit";
this.btnConfirmEdit.Size = new System.Drawing.Size(98, 30);
this.btnConfirmEdit.TabIndex = 0;
@@ -241,7 +246,7 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.btnCancelEdit.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnCancelEdit.Location = new System.Drawing.Point(107, 246);
+ this.btnCancelEdit.Location = new System.Drawing.Point(107, 221);
this.btnCancelEdit.Name = "btnCancelEdit";
this.btnCancelEdit.Size = new System.Drawing.Size(99, 30);
this.btnCancelEdit.TabIndex = 0;
@@ -264,8 +269,8 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.propGridKeyIndicator);
- this.splitContainer1.Size = new System.Drawing.Size(203, 237);
- this.splitContainer1.SplitterDistance = 136;
+ this.splitContainer1.Size = new System.Drawing.Size(203, 212);
+ this.splitContainer1.SplitterDistance = 121;
this.splitContainer1.TabIndex = 1;
//
// lvMeasures
@@ -280,7 +285,7 @@
this.lvMeasures.Location = new System.Drawing.Point(0, 0);
this.lvMeasures.MultiSelect = false;
this.lvMeasures.Name = "lvMeasures";
- this.lvMeasures.Size = new System.Drawing.Size(203, 136);
+ this.lvMeasures.Size = new System.Drawing.Size(203, 121);
this.lvMeasures.TabIndex = 0;
this.lvMeasures.UseCompatibleStateImageBehavior = false;
this.lvMeasures.View = System.Windows.Forms.View.List;
@@ -297,7 +302,7 @@
this.propGridKeyIndicator.Dock = System.Windows.Forms.DockStyle.Fill;
this.propGridKeyIndicator.Location = new System.Drawing.Point(0, 0);
this.propGridKeyIndicator.Name = "propGridKeyIndicator";
- this.propGridKeyIndicator.Size = new System.Drawing.Size(203, 97);
+ this.propGridKeyIndicator.Size = new System.Drawing.Size(203, 87);
this.propGridKeyIndicator.TabIndex = 0;
this.propGridKeyIndicator.ToolbarVisible = false;
//
@@ -306,11 +311,57 @@
this.timer1.Interval = 3000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
+ // lblOperator
+ //
+ this.lblOperator.AutoSize = true;
+ this.lblOperator.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblOperator.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World, ((byte)(134)));
+ this.lblOperator.Location = new System.Drawing.Point(22, 17);
+ this.lblOperator.Name = "lblOperator";
+ this.lblOperator.Size = new System.Drawing.Size(78, 17);
+ this.lblOperator.TabIndex = 6;
+ this.lblOperator.Text = "OPERATOR";
+ this.lblOperator.DoubleClick += new System.EventHandler(this.lblOperator_DoubleClick);
+ //
+ // stStripHint
+ //
+ this.stStripHint.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsslError});
+ this.stStripHint.Location = new System.Drawing.Point(0, 329);
+ this.stStripHint.Name = "stStripHint";
+ this.stStripHint.Size = new System.Drawing.Size(1069, 22);
+ this.stStripHint.TabIndex = 7;
+ this.stStripHint.Text = "statusStrip1";
+ this.stStripHint.Visible = false;
+ //
+ // tsslError
+ //
+ this.tsslError.BackColor = System.Drawing.Color.Red;
+ this.tsslError.ForeColor = System.Drawing.SystemColors.Control;
+ this.tsslError.Margin = new System.Windows.Forms.Padding(10, 3, 0, 2);
+ this.tsslError.Name = "tsslError";
+ this.tsslError.Size = new System.Drawing.Size(131, 17);
+ this.tsslError.Text = "toolStripStatusLabel1";
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(591, 13);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(75, 23);
+ this.button1.TabIndex = 8;
+ this.button1.Text = "button1";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Visible = false;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
// M071_MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 351);
+ this.ClientSize = new System.Drawing.Size(1069, 351);
+ this.Controls.Add(this.button1);
+ this.Controls.Add(this.stStripHint);
+ this.Controls.Add(this.lblOperator);
this.Controls.Add(this.btnReset);
this.Controls.Add(this.btnStartMeasure);
this.Controls.Add(this.lblCT);
@@ -332,6 +383,8 @@
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
+ this.stStripHint.ResumeLayout(false);
+ this.stStripHint.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -360,5 +413,9 @@
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ToolStripMenuItem tsmiRefreshLabels;
private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Label lblOperator;
+ private System.Windows.Forms.StatusStrip stStripHint;
+ private System.Windows.Forms.ToolStripStatusLabel tsslError;
+ private System.Windows.Forms.Button button1;
}
}
\ No newline at end of file
--
Gitblit v1.8.0