diff --git a/C-Windows-1/Form1.Designer.cs b/C-Windows-1/Form1.Designer.cs index edb5edb..d674cf1 100644 --- a/C-Windows-1/Form1.Designer.cs +++ b/C-Windows-1/Form1.Designer.cs @@ -115,6 +115,9 @@ this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.button2 = new System.Windows.Forms.Button(); this.zhanhao = new System.Windows.Forms.TextBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.labelyinjian = new System.Windows.Forms.Label(); + this.labelruanjian = new System.Windows.Forms.Label(); this.myGroupBox4 = new C_Windows_1.MyGroupBox(this.components); this.PUnit = new System.Windows.Forms.ComboBox(); this.label47 = new System.Windows.Forms.Label(); @@ -182,16 +185,13 @@ this.BtnCon1 = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.labelyinjian = new System.Windows.Forms.Label(); - this.labelruanjian = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.DataGridView1)).BeginInit(); this.menuStrip1.SuspendLayout(); this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.myGroupBox4.SuspendLayout(); this.myGroupBox3.SuspendLayout(); this.myGroupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // SerialPort1 @@ -898,6 +898,37 @@ this.zhanhao.Size = new System.Drawing.Size(113, 21); this.zhanhao.TabIndex = 148; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.labelyinjian); + this.groupBox2.Controls.Add(this.labelruanjian); + this.groupBox2.Location = new System.Drawing.Point(816, 108); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(174, 184); + this.groupBox2.TabIndex = 149; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "设备信息"; + // + // labelyinjian + // + this.labelyinjian.AutoSize = true; + this.labelyinjian.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labelyinjian.Location = new System.Drawing.Point(6, 140); + this.labelyinjian.Name = "labelyinjian"; + this.labelyinjian.Size = new System.Drawing.Size(95, 16); + this.labelyinjian.TabIndex = 24; + this.labelyinjian.Text = "硬件版本号:"; + // + // labelruanjian + // + this.labelruanjian.AutoSize = true; + this.labelruanjian.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.labelruanjian.Location = new System.Drawing.Point(6, 71); + this.labelruanjian.Name = "labelruanjian"; + this.labelruanjian.Size = new System.Drawing.Size(95, 16); + this.labelruanjian.TabIndex = 23; + this.labelruanjian.Text = "软件版本号:"; + // // myGroupBox4 // this.myGroupBox4.Controls.Add(this.PUnit); @@ -1552,37 +1583,6 @@ this.label6.TabIndex = 15; this.label6.Text = "9999"; // - // groupBox2 - // - this.groupBox2.Controls.Add(this.labelyinjian); - this.groupBox2.Controls.Add(this.labelruanjian); - this.groupBox2.Location = new System.Drawing.Point(816, 108); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(174, 184); - this.groupBox2.TabIndex = 149; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "设备信息"; - // - // labelyinjian - // - this.labelyinjian.AutoSize = true; - this.labelyinjian.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labelyinjian.Location = new System.Drawing.Point(6, 140); - this.labelyinjian.Name = "labelyinjian"; - this.labelyinjian.Size = new System.Drawing.Size(95, 16); - this.labelyinjian.TabIndex = 24; - this.labelyinjian.Text = "硬件版本号:"; - // - // labelruanjian - // - this.labelruanjian.AutoSize = true; - this.labelruanjian.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labelruanjian.Location = new System.Drawing.Point(6, 71); - this.labelruanjian.Name = "labelruanjian"; - this.labelruanjian.Size = new System.Drawing.Size(95, 16); - this.labelruanjian.TabIndex = 23; - this.labelruanjian.Text = "软件版本号:"; - // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1637,7 +1637,7 @@ this.Controls.Add(this.ReceiveText); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "Form1"; - this.Text = "LL-Control"; + this.Text = "20240816"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); this.Load += new System.EventHandler(this.Form1_Load); ((System.ComponentModel.ISupportInitialize)(this.DataGridView1)).EndInit(); @@ -1645,14 +1645,14 @@ this.menuStrip1.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.myGroupBox4.ResumeLayout(false); this.myGroupBox4.PerformLayout(); this.myGroupBox3.ResumeLayout(false); this.myGroupBox3.PerformLayout(); this.myGroupBox1.ResumeLayout(false); this.myGroupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout();