From fff73c6b39479e8022b1aaac51bf94cdad5c042b Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Fri, 22 Sep 2023 08:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=AF=E4=BB=B6=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Rs.SkyLine/Home.cs | 1 +
Rs.SkyLine/Home.designer.cs | 46 +++++++++++++++++++++------
Rs.SkyLine/Properties/AssemblyInfo.cs | 6 ++--
Rs.SkyLine/Rs.SkyLine.csproj | 2 +-
4 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/Rs.SkyLine/Home.cs b/Rs.SkyLine/Home.cs
index 5571763..42db7aa 100644
--- a/Rs.SkyLine/Home.cs
+++ b/Rs.SkyLine/Home.cs
@@ -198,6 +198,7 @@ namespace Rs.MotionPlat
}
timer1.Enabled = true;
+ lblVersion.Text ="Version:"+System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
}
private void SetFormStyle()
diff --git a/Rs.SkyLine/Home.designer.cs b/Rs.SkyLine/Home.designer.cs
index 02c47aa..91e67ee 100644
--- a/Rs.SkyLine/Home.designer.cs
+++ b/Rs.SkyLine/Home.designer.cs
@@ -40,15 +40,19 @@
this.btnSystem = new Rs.Controls.ButtonEx();
this.btnRecipe = new Rs.Controls.ButtonEx();
this.panel1 = new System.Windows.Forms.Panel();
+ this.panelEx2 = new Rs.Controls.PanelEx();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.label1 = new System.Windows.Forms.Label();
this.lblMachineState = new System.Windows.Forms.Label();
this.panelEx1 = new Rs.Controls.PanelEx();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.lblVersion = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
- this.panelEx2 = new Rs.Controls.PanelEx();
this.tableLayoutPanel2.SuspendLayout();
this.panel1.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
+ this.panelEx1.SuspendLayout();
+ this.panel2.SuspendLayout();
this.SuspendLayout();
//
// panel_main
@@ -284,6 +288,14 @@
this.panel1.Size = new System.Drawing.Size(1594, 33);
this.panel1.TabIndex = 7;
//
+ // panelEx2
+ //
+ this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panelEx2.Location = new System.Drawing.Point(158, 0);
+ this.panelEx2.Name = "panelEx2";
+ this.panelEx2.Size = new System.Drawing.Size(200, 33);
+ this.panelEx2.TabIndex = 2;
+ //
// tableLayoutPanel3
//
this.tableLayoutPanel3.ColumnCount = 2;
@@ -323,25 +335,37 @@
//
// panelEx1
//
+ this.panelEx1.Controls.Add(this.panel2);
this.panelEx1.Dock = System.Windows.Forms.DockStyle.Right;
this.panelEx1.Location = new System.Drawing.Point(597, 0);
this.panelEx1.Name = "panelEx1";
this.panelEx1.Size = new System.Drawing.Size(997, 33);
this.panelEx1.TabIndex = 0;
//
+ // panel2
+ //
+ this.panel2.Controls.Add(this.lblVersion);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Right;
+ this.panel2.Location = new System.Drawing.Point(829, 0);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(168, 33);
+ this.panel2.TabIndex = 0;
+ //
+ // lblVersion
+ //
+ this.lblVersion.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lblVersion.ForeColor = System.Drawing.Color.White;
+ this.lblVersion.Location = new System.Drawing.Point(0, 0);
+ this.lblVersion.Name = "lblVersion";
+ this.lblVersion.Size = new System.Drawing.Size(168, 33);
+ this.lblVersion.TabIndex = 0;
+ this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
// timer1
//
this.timer1.Interval = 300;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
- // panelEx2
- //
- this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left;
- this.panelEx2.Location = new System.Drawing.Point(158, 0);
- this.panelEx2.Name = "panelEx2";
- this.panelEx2.Size = new System.Drawing.Size(200, 33);
- this.panelEx2.TabIndex = 2;
- //
// Home
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -361,6 +385,8 @@
this.tableLayoutPanel2.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.tableLayoutPanel3.ResumeLayout(false);
+ this.panelEx1.ResumeLayout(false);
+ this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -384,5 +410,7 @@
private System.Windows.Forms.Label lblMachineState;
private System.Windows.Forms.Timer timer1;
private Controls.PanelEx panelEx2;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label lblVersion;
}
}
\ No newline at end of file
diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs
index 40c6aa8..af25a3e 100644
--- a/Rs.SkyLine/Properties/AssemblyInfo.cs
+++ b/Rs.SkyLine/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+ [assembly: AssemblyVersion("1.0.0")]
+//[assembly: AssemblyVersion("1.0.0.0")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Rs.SkyLine/Rs.SkyLine.csproj b/Rs.SkyLine/Rs.SkyLine.csproj
index 0d388b7..dda1d5a 100644
--- a/Rs.SkyLine/Rs.SkyLine.csproj
+++ b/Rs.SkyLine/Rs.SkyLine.csproj
@@ -11,7 +11,7 @@
v4.8
512
true
- true
+ false
AnyCPU