From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整
---
src/Bro.UI.Config/MenuForms/FrmConfig.Designer.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/Bro.UI.Config/MenuForms/FrmConfig.Designer.cs b/src/Bro.UI.Config/MenuForms/FrmConfig.Designer.cs
index 33915bc..433249a 100644
--- a/src/Bro.UI.Config/MenuForms/FrmConfig.Designer.cs
+++ b/src/Bro.UI.Config/MenuForms/FrmConfig.Designer.cs
@@ -34,6 +34,7 @@
this.btnSave = new System.Windows.Forms.Button();
this.imgList = new System.Windows.Forms.ImageList(this.components);
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.buttonCreateConfig = new System.Windows.Forms.Button();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
@@ -42,6 +43,7 @@
this.propGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.tableLayoutPanel1.SetColumnSpan(this.propGrid, 3);
this.propGrid.Location = new System.Drawing.Point(2, 44);
this.propGrid.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.propGrid.Name = "propGrid";
@@ -73,10 +75,13 @@
//
// tableLayoutPanel1
//
- this.tableLayoutPanel1.ColumnCount = 1;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.ColumnCount = 3;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel1.Controls.Add(this.propGrid, 0, 1);
- this.tableLayoutPanel1.Controls.Add(this.btnSave, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.btnSave, 2, 0);
+ this.tableLayoutPanel1.Controls.Add(this.buttonCreateConfig, 0, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
@@ -85,6 +90,17 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(800, 487);
this.tableLayoutPanel1.TabIndex = 2;
+ //
+ // buttonCreateConfig
+ //
+ this.buttonCreateConfig.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.buttonCreateConfig.Location = new System.Drawing.Point(3, 3);
+ this.buttonCreateConfig.Name = "buttonCreateConfig";
+ this.buttonCreateConfig.Size = new System.Drawing.Size(175, 35);
+ this.buttonCreateConfig.TabIndex = 2;
+ this.buttonCreateConfig.Text = "浠庡綋鍓嶉厤缃淳鐢熸柊浜у搧";
+ this.buttonCreateConfig.UseVisualStyleBackColor = true;
+ this.buttonCreateConfig.Click += new System.EventHandler(this.buttonCreateConfig_Click);
//
// FrmConfig
//
@@ -105,5 +121,6 @@
private System.Windows.Forms.Button btnSave;
private System.Windows.Forms.ImageList imgList;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ private System.Windows.Forms.Button buttonCreateConfig;
}
}
\ No newline at end of file
--
Gitblit v1.8.0