diff --git a/Rs.Controls/Properties/AssemblyInfo.cs b/Rs.Controls/Properties/AssemblyInfo.cs
index 89bf0d6..b843db1 100644
--- a/Rs.Controls/Properties/AssemblyInfo.cs
+++ b/Rs.Controls/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.20.24.3")]
+[assembly: AssemblyVersion("2.20.24.4")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Rs.Controls/RsTray.Designer.cs b/Rs.Controls/RsTray.Designer.cs
index a5b8fbc..0bb8a3b 100644
--- a/Rs.Controls/RsTray.Designer.cs
+++ b/Rs.Controls/RsTray.Designer.cs
@@ -29,6 +29,7 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RsTray));
this.panel2 = new System.Windows.Forms.Panel();
this.panel1 = new System.Windows.Forms.Panel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -47,11 +48,8 @@
//
this.panel2.BackColor = System.Drawing.SystemColors.Control;
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel2.Location = new System.Drawing.Point(0, 38);
+ resources.ApplyResources(this.panel2, "panel2");
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(288, 304);
- this.panel2.TabIndex = 3;
this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint);
this.panel2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.panel2_MouseClick);
this.panel2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panel2_MouseDown);
@@ -63,51 +61,30 @@
this.panel1.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel1.Controls.Add(this.tableLayoutPanel1);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Location = new System.Drawing.Point(0, 0);
+ resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(288, 38);
- this.panel1.TabIndex = 2;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
- this.tableLayoutPanel1.ColumnCount = 2;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.lblStatus, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
- this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 1;
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(286, 36);
- this.tableLayoutPanel1.TabIndex = 0;
//
// lblStatus
//
this.lblStatus.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
- this.lblStatus.Dock = System.Windows.Forms.DockStyle.Fill;
- this.lblStatus.Font = new System.Drawing.Font("宋体", 13F);
+ resources.ApplyResources(this.lblStatus, "lblStatus");
this.lblStatus.ForeColor = System.Drawing.Color.White;
- this.lblStatus.Location = new System.Drawing.Point(146, 0);
this.lblStatus.Name = "lblStatus";
- this.lblStatus.Size = new System.Drawing.Size(137, 36);
- this.lblStatus.TabIndex = 2;
- this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label1
//
this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
- this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label1.Font = new System.Drawing.Font("宋体", 13F);
+ resources.ApplyResources(this.label1, "label1");
this.label1.ForeColor = System.Drawing.Color.White;
- this.label1.Location = new System.Drawing.Point(3, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(137, 36);
- this.label1.TabIndex = 1;
- this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// contextMenuStrip1
//
@@ -116,37 +93,33 @@
this.设置有料ToolStripMenuItem,
this.禁用ToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(125, 70);
+ resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1");
//
// 设置无料ToolStripMenuItem
//
this.设置无料ToolStripMenuItem.Name = "设置无料ToolStripMenuItem";
- this.设置无料ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
- this.设置无料ToolStripMenuItem.Text = "设置无料";
+ resources.ApplyResources(this.设置无料ToolStripMenuItem, "设置无料ToolStripMenuItem");
this.设置无料ToolStripMenuItem.Click += new System.EventHandler(this.设置无料ToolStripMenuItem_Click);
//
// 设置有料ToolStripMenuItem
//
this.设置有料ToolStripMenuItem.Name = "设置有料ToolStripMenuItem";
- this.设置有料ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
- this.设置有料ToolStripMenuItem.Text = "设置有料";
+ resources.ApplyResources(this.设置有料ToolStripMenuItem, "设置有料ToolStripMenuItem");
this.设置有料ToolStripMenuItem.Click += new System.EventHandler(this.设置有料ToolStripMenuItem_Click);
//
// 禁用ToolStripMenuItem
//
this.禁用ToolStripMenuItem.Name = "禁用ToolStripMenuItem";
- this.禁用ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
- this.禁用ToolStripMenuItem.Text = "禁用";
+ resources.ApplyResources(this.禁用ToolStripMenuItem, "禁用ToolStripMenuItem");
this.禁用ToolStripMenuItem.Click += new System.EventHandler(this.禁用ToolStripMenuItem_Click);
//
// RsTray
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.Name = "RsTray";
- this.Size = new System.Drawing.Size(288, 342);
this.panel1.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
this.contextMenuStrip1.ResumeLayout(false);
diff --git a/Rs.Controls/RsTray.cs b/Rs.Controls/RsTray.cs
index f79957c..5435b7a 100644
--- a/Rs.Controls/RsTray.cs
+++ b/Rs.Controls/RsTray.cs
@@ -1,5 +1,6 @@
using HalconDotNet;
using Rs.Framework;
+using Rs.MotionPlat.Commom;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -9,6 +10,7 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml.Serialization;
diff --git a/Rs.Controls/RsTray.resx b/Rs.Controls/RsTray.resx
index ad53752..78ff28c 100644
--- a/Rs.Controls/RsTray.resx
+++ b/Rs.Controls/RsTray.resx
@@ -117,7 +117,211 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Fill
+
+
+
+ 0, 38
+
+
+ 288, 304
+
+
+
+ 3
+
+
+ panel2
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 1
+
+
+ 2
+
+
+ Fill
+
+
+ 宋体, 13pt
+
+
+ 146, 0
+
+
+ 137, 36
+
+
+ 2
+
+
+ MiddleRight
+
+
+ lblStatus
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tableLayoutPanel1
+
+
+ 0
+
+
+ Fill
+
+
+ 宋体, 13pt
+
+
+ 3, 0
+
+
+ 137, 36
+
+
+ 1
+
+
+ MiddleLeft
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tableLayoutPanel1
+
+
+ 1
+
+
+ Fill
+
+
+ 0, 0
+
+
+ 1
+
+
+ 286, 36
+
+
+ 0
+
+
+ tableLayoutPanel1
+
+
+ System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel1
+
+
+ 0
+
+
+ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="lblStatus" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50" /></TableLayoutSettings>
+
+
+ Top
+
+
+ 0, 0
+
+
+ 288, 38
+
+
+ 2
+
+
+ panel1
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 2
+
17, 17
+
+ 180, 22
+
+
+ Set empty
+
+
+ 180, 22
+
+
+ Set filled
+
+
+ 180, 22
+
+
+ Disable
+
+
+ 181, 92
+
+
+ contextMenuStrip1
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ 6, 12
+
+
+ 288, 342
+
+
+ 设置无料ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 设置有料ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 禁用ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ RsTray
+
+
+ System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
\ No newline at end of file