From 54f0329172de152cf95644f6d427971542e9f42c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 13 七月 2020 18:36:55 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/CtrlCameraRunBase.Designer.cs | 82 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 12 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/CtrlCameraRunBase.Designer.cs b/src/Bro.UI.Device.Winform/CtrlCameraRunBase.Designer.cs
index 9dfdfdb..c83ffd7 100644
--- a/src/Bro.UI.Device.Winform/CtrlCameraRunBase.Designer.cs
+++ b/src/Bro.UI.Device.Winform/CtrlCameraRunBase.Designer.cs
@@ -27,8 +27,14 @@
this.tsmiShowOpBar = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiShowElements = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiShowStatusBar = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiBtnExecuteOpConfig = new System.Windows.Forms.ToolStripButton();
+ this.tscOpConfig = new System.Windows.Forms.ToolStripContainer();
+ this.tsmiShowOpConfig = new System.Windows.Forms.ToolStripMenuItem();
+ this.propGridOpConfig = new System.Windows.Forms.PropertyGrid();
this.toolStripOperation.SuspendLayout();
this.ctmsVisibleControl.SuspendLayout();
+ this.tscOpConfig.ContentPanel.SuspendLayout();
+ this.tscOpConfig.SuspendLayout();
this.SuspendLayout();
//
// toolStripOperation
@@ -41,10 +47,11 @@
this.toolStripOperation.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tssBtnCameraOp,
this.tsTxtExposure,
- this.tsBtnModifyExposure});
- this.toolStripOperation.Location = new System.Drawing.Point(38, 0);
+ this.tsBtnModifyExposure,
+ this.tsmiBtnExecuteOpConfig});
+ this.toolStripOperation.Location = new System.Drawing.Point(38, 2);
this.toolStripOperation.Name = "toolStripOperation";
- this.toolStripOperation.Size = new System.Drawing.Size(440, 25);
+ this.toolStripOperation.Size = new System.Drawing.Size(440, 28);
this.toolStripOperation.TabIndex = 0;
this.toolStripOperation.Text = "toolStrip1";
//
@@ -56,7 +63,7 @@
this.tssBtnCameraOp.Image = ((System.Drawing.Image)(resources.GetObject("tssBtnCameraOp.Image")));
this.tssBtnCameraOp.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tssBtnCameraOp.Name = "tssBtnCameraOp";
- this.tssBtnCameraOp.Size = new System.Drawing.Size(64, 22);
+ this.tssBtnCameraOp.Size = new System.Drawing.Size(64, 25);
this.tssBtnCameraOp.Text = "鎷� 鐓�";
this.tssBtnCameraOp.ToolTipText = "鐩告満妯″紡";
this.tssBtnCameraOp.DropDownClosed += new System.EventHandler(this.tssBtnCameraOp_DropDownClosed);
@@ -76,7 +83,7 @@
//
this.tsTxtExposure.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
this.tsTxtExposure.Name = "tsTxtExposure";
- this.tsTxtExposure.Size = new System.Drawing.Size(100, 25);
+ this.tsTxtExposure.Size = new System.Drawing.Size(100, 28);
//
// tsBtnModifyExposure
//
@@ -84,7 +91,7 @@
this.tsBtnModifyExposure.Image = ((System.Drawing.Image)(resources.GetObject("tsBtnModifyExposure.Image")));
this.tsBtnModifyExposure.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsBtnModifyExposure.Name = "tsBtnModifyExposure";
- this.tsBtnModifyExposure.Size = new System.Drawing.Size(60, 22);
+ this.tsBtnModifyExposure.Size = new System.Drawing.Size(60, 25);
this.tsBtnModifyExposure.Text = "淇敼鏇濆厜";
this.tsBtnModifyExposure.Click += new System.EventHandler(this.tsBtnModifyExposure_Click);
//
@@ -94,15 +101,16 @@
this.tsmiShowToolBar,
this.tsmiShowOpBar,
this.tsmiShowElements,
- this.tsmiShowStatusBar});
+ this.tsmiShowStatusBar,
+ this.tsmiShowOpConfig});
this.ctmsVisibleControl.Name = "ctmsVisibleControl";
- this.ctmsVisibleControl.Size = new System.Drawing.Size(181, 114);
+ this.ctmsVisibleControl.Size = new System.Drawing.Size(149, 114);
//
// tsmiShowToolBar
//
this.tsmiShowToolBar.CheckOnClick = true;
this.tsmiShowToolBar.Name = "tsmiShowToolBar";
- this.tsmiShowToolBar.Size = new System.Drawing.Size(180, 22);
+ this.tsmiShowToolBar.Size = new System.Drawing.Size(148, 22);
this.tsmiShowToolBar.Text = "鏄剧ず宸ュ叿鏍�";
this.tsmiShowToolBar.CheckedChanged += new System.EventHandler(this.tsmiShowToolBar_CheckedChanged);
//
@@ -110,7 +118,7 @@
//
this.tsmiShowOpBar.CheckOnClick = true;
this.tsmiShowOpBar.Name = "tsmiShowOpBar";
- this.tsmiShowOpBar.Size = new System.Drawing.Size(180, 22);
+ this.tsmiShowOpBar.Size = new System.Drawing.Size(148, 22);
this.tsmiShowOpBar.Text = "鏄剧ず鎿嶄綔鏍�";
this.tsmiShowOpBar.CheckedChanged += new System.EventHandler(this.tsmiShowOpBar_CheckedChanged);
//
@@ -118,7 +126,7 @@
//
this.tsmiShowElements.CheckOnClick = true;
this.tsmiShowElements.Name = "tsmiShowElements";
- this.tsmiShowElements.Size = new System.Drawing.Size(180, 22);
+ this.tsmiShowElements.Size = new System.Drawing.Size(148, 22);
this.tsmiShowElements.Text = "鏄剧ず鍩哄厓鍒楄〃";
this.tsmiShowElements.CheckedChanged += new System.EventHandler(this.tsmiShowElements_CheckedChanged);
//
@@ -126,15 +134,58 @@
//
this.tsmiShowStatusBar.CheckOnClick = true;
this.tsmiShowStatusBar.Name = "tsmiShowStatusBar";
- this.tsmiShowStatusBar.Size = new System.Drawing.Size(180, 22);
+ this.tsmiShowStatusBar.Size = new System.Drawing.Size(148, 22);
this.tsmiShowStatusBar.Text = "鏄剧ず鐘舵�佹爮";
this.tsmiShowStatusBar.CheckedChanged += new System.EventHandler(this.tsmiShowStatusBar_CheckedChanged);
+ //
+ // tsmiBtnExecuteOpConfig
+ //
+ this.tsmiBtnExecuteOpConfig.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.tsmiBtnExecuteOpConfig.Image = ((System.Drawing.Image)(resources.GetObject("tsmiBtnExecuteOpConfig.Image")));
+ this.tsmiBtnExecuteOpConfig.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tsmiBtnExecuteOpConfig.Name = "tsmiBtnExecuteOpConfig";
+ this.tsmiBtnExecuteOpConfig.Size = new System.Drawing.Size(84, 25);
+ this.tsmiBtnExecuteOpConfig.Text = "鎵ц鎿嶄綔閰嶇疆";
+ this.tsmiBtnExecuteOpConfig.Click += new System.EventHandler(this.tsmiBtnExecuteOpConfig_Click);
+ //
+ // tscOpConfig
+ //
+ //
+ // tscOpConfig.ContentPanel
+ //
+ this.tscOpConfig.ContentPanel.Controls.Add(this.propGridOpConfig);
+ this.tscOpConfig.ContentPanel.Size = new System.Drawing.Size(478, 175);
+ this.tscOpConfig.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.tscOpConfig.Location = new System.Drawing.Point(0, 265);
+ this.tscOpConfig.Name = "tscOpConfig";
+ this.tscOpConfig.Size = new System.Drawing.Size(478, 175);
+ this.tscOpConfig.TabIndex = 1;
+ this.tscOpConfig.Text = "toolStripContainer1";
+ this.tscOpConfig.Visible = false;
+ //
+ // tsmiShowOpConfig
+ //
+ this.tsmiShowOpConfig.CheckOnClick = true;
+ this.tsmiShowOpConfig.Name = "tsmiShowOpConfig";
+ this.tsmiShowOpConfig.Size = new System.Drawing.Size(148, 22);
+ this.tsmiShowOpConfig.Text = "鏄剧ず鎿嶄綔閰嶇疆";
+ this.tsmiShowOpConfig.CheckedChanged += new System.EventHandler(this.tsmiShowOpConfig_CheckedChanged);
+ //
+ // propGridOpConfig
+ //
+ this.propGridOpConfig.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.propGridOpConfig.Location = new System.Drawing.Point(0, 0);
+ this.propGridOpConfig.Name = "propGridOpConfig";
+ this.propGridOpConfig.Size = new System.Drawing.Size(478, 175);
+ this.propGridOpConfig.TabIndex = 0;
+ this.propGridOpConfig.ToolbarVisible = false;
//
// CtrlCameraRunBase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ContextMenuStrip = this.ctmsVisibleControl;
+ this.Controls.Add(this.tscOpConfig);
this.Controls.Add(this.toolStripOperation);
this.Name = "CtrlCameraRunBase";
this.Size = new System.Drawing.Size(478, 440);
@@ -142,6 +193,9 @@
this.toolStripOperation.ResumeLayout(false);
this.toolStripOperation.PerformLayout();
this.ctmsVisibleControl.ResumeLayout(false);
+ this.tscOpConfig.ContentPanel.ResumeLayout(false);
+ this.tscOpConfig.ResumeLayout(false);
+ this.tscOpConfig.PerformLayout();
this.ResumeLayout(false);
}
@@ -158,5 +212,9 @@
private System.Windows.Forms.ToolStripMenuItem tsmiShowOpBar;
private System.Windows.Forms.ToolStripMenuItem tsmiShowElements;
private System.Windows.Forms.ToolStripMenuItem tsmiShowStatusBar;
+ private System.Windows.Forms.ToolStripButton tsmiBtnExecuteOpConfig;
+ private System.Windows.Forms.ToolStripMenuItem tsmiShowOpConfig;
+ private System.Windows.Forms.ToolStripContainer tscOpConfig;
+ private System.Windows.Forms.PropertyGrid propGridOpConfig;
}
}
--
Gitblit v1.8.0