From c01cce7ac1dc691c6b667b298ce0637b924102ea Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期二, 14 七月 2020 16:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

---
 src/Bro.M071.Process/UI/M071_MainForm.Designer.cs |   66 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
index abd460f..f72a914 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.Designer.cs
@@ -33,6 +33,8 @@
             this.tsmiShowToolBar = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiShowStatusBar = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiShowEditor = new System.Windows.Forms.ToolStripMenuItem();
+            this.btnReset = new System.Windows.Forms.Button();
+            this.btnStartMeasure = new System.Windows.Forms.Button();
             this.lblCT = new System.Windows.Forms.Label();
             this.txtBarcode = new System.Windows.Forms.TextBox();
             this.lblProductionState = new System.Windows.Forms.Label();
@@ -46,8 +48,6 @@
             this.lvMeasures = new System.Windows.Forms.ListView();
             this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.propGridKeyIndicator = new System.Windows.Forms.PropertyGrid();
-            this.btnStartMeasure = new System.Windows.Forms.Button();
-            this.btnReset = new System.Windows.Forms.Button();
             this.contextMenuStrip1.SuspendLayout();
             this.plImage.SuspendLayout();
             this.tscEditLocation.ContentPanel.SuspendLayout();
@@ -91,6 +91,37 @@
             this.tsmiShowEditor.Size = new System.Drawing.Size(148, 22);
             this.tsmiShowEditor.Text = "缂栬緫鏄剧ず鐐逛綅";
             this.tsmiShowEditor.CheckedChanged += new System.EventHandler(this.tsmiShowEditor_CheckedChanged);
+            // 
+            // btnReset
+            // 
+            this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnReset.BackColor = System.Drawing.Color.Orange;
+            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.Name = "btnReset";
+            this.btnReset.Size = new System.Drawing.Size(141, 35);
+            this.btnReset.TabIndex = 5;
+            this.btnReset.Text = "澶嶄綅锛堥暱鎸�5s澶у浣嶏級";
+            this.btnReset.UseVisualStyleBackColor = false;
+            this.btnReset.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnReset_MouseDown);
+            this.btnReset.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnReset_MouseUp);
+            // 
+            // btnStartMeasure
+            // 
+            this.btnStartMeasure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnStartMeasure.BackColor = System.Drawing.Color.Lime;
+            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.Name = "btnStartMeasure";
+            this.btnStartMeasure.Size = new System.Drawing.Size(110, 35);
+            this.btnStartMeasure.TabIndex = 5;
+            this.btnStartMeasure.Text = "寮�濮嬫祴閲�";
+            this.btnStartMeasure.UseVisualStyleBackColor = false;
+            this.btnStartMeasure.Click += new System.EventHandler(this.btnStartMeasure_Click);
             // 
             // lblCT
             // 
@@ -259,37 +290,6 @@
             this.propGridKeyIndicator.Size = new System.Drawing.Size(203, 97);
             this.propGridKeyIndicator.TabIndex = 0;
             this.propGridKeyIndicator.ToolbarVisible = false;
-            // 
-            // btnStartMeasure
-            // 
-            this.btnStartMeasure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnStartMeasure.BackColor = System.Drawing.Color.Lime;
-            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.Name = "btnStartMeasure";
-            this.btnStartMeasure.Size = new System.Drawing.Size(110, 35);
-            this.btnStartMeasure.TabIndex = 5;
-            this.btnStartMeasure.Text = "寮�濮嬫祴閲�";
-            this.btnStartMeasure.UseVisualStyleBackColor = false;
-            this.btnStartMeasure.Click += new System.EventHandler(this.btnStartMeasure_Click);
-            // 
-            // btnReset
-            // 
-            this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnReset.BackColor = System.Drawing.Color.Orange;
-            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.Name = "btnReset";
-            this.btnReset.Size = new System.Drawing.Size(141, 35);
-            this.btnReset.TabIndex = 5;
-            this.btnReset.Text = "澶嶄綅锛堥暱鎸�5s澶у浣嶏級";
-            this.btnReset.UseVisualStyleBackColor = false;
-            this.btnReset.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnReset_MouseDown);
-            this.btnReset.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnReset_MouseUp);
             // 
             // M071_MainForm
             // 

--
Gitblit v1.8.0