From 562fe6d0615eecf92a7e5c5edf9d316f8295b199 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 10 七月 2020 17:16:55 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
index 5dd77d9..17368a9 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace Bro.UI.Device.Winform.MotionCard
+锘縩amespace Bro.UI.Device.Winform
{
partial class CtrlMotionCardRunBase
{
@@ -31,6 +31,9 @@
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.listBoxMsg = new System.Windows.Forms.ListBox();
+ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+ this.buttonMotionCardOperation = new System.Windows.Forms.Button();
+ this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
this.tableLayoutPanel1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.SuspendLayout();
@@ -39,23 +42,27 @@
//
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 2);
+ this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 3);
+ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1);
+ this.tableLayoutPanel1.Controls.Add(this.buttonMotionCardOperation, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 0, 2);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 3;
+ this.tableLayoutPanel1.RowCount = 4;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 110F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(615, 511);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(615, 587);
this.tableLayoutPanel1.TabIndex = 5;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.listBoxMsg);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.groupBox2.Location = new System.Drawing.Point(3, 403);
+ this.groupBox2.Location = new System.Drawing.Point(3, 479);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(609, 105);
this.groupBox2.TabIndex = 10;
@@ -73,13 +80,39 @@
this.listBoxMsg.Size = new System.Drawing.Size(603, 85);
this.listBoxMsg.TabIndex = 1;
//
+ // flowLayoutPanel1
+ //
+ this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 33);
+ this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(609, 217);
+ this.flowLayoutPanel1.TabIndex = 11;
+ //
+ // buttonMotionCardOperation
+ //
+ this.buttonMotionCardOperation.Location = new System.Drawing.Point(3, 3);
+ this.buttonMotionCardOperation.Name = "buttonMotionCardOperation";
+ this.buttonMotionCardOperation.Size = new System.Drawing.Size(97, 24);
+ this.buttonMotionCardOperation.TabIndex = 12;
+ this.buttonMotionCardOperation.Text = "鏉垮崱鎿嶄綔";
+ this.buttonMotionCardOperation.UseVisualStyleBackColor = true;
+ this.buttonMotionCardOperation.Click += new System.EventHandler(this.buttonMotionCardOperation_Click);
+ //
+ // flowLayoutPanel2
+ //
+ this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.flowLayoutPanel2.Location = new System.Drawing.Point(3, 256);
+ this.flowLayoutPanel2.Name = "flowLayoutPanel2";
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(609, 217);
+ this.flowLayoutPanel2.TabIndex = 13;
+ //
// CtrlMotionCardRunBase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "CtrlMotionCardRunBase";
- this.Size = new System.Drawing.Size(615, 511);
+ this.Size = new System.Drawing.Size(615, 587);
this.tableLayoutPanel1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.ResumeLayout(false);
@@ -90,5 +123,8 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.ListBox listBoxMsg;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+ private System.Windows.Forms.Button buttonMotionCardOperation;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
}
}
--
Gitblit v1.8.0