|
|
@@ -28,7 +28,7 @@
|
|
|
/// </summary>
|
|
|
private void InitializeComponent()
|
|
|
{
|
|
|
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Special_ResetKeyRelease));
|
|
|
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Special_ResetKeyFreeze));
|
|
|
this.Pallet_label = new System.Windows.Forms.Label();
|
|
|
this.serBtn = new System.Windows.Forms.RadioButton();
|
|
|
this.st_rstepcode_label = new System.Windows.Forms.Label();
|
|
|
@@ -55,7 +55,7 @@
|
|
|
this.cu_code = new System.Windows.Forms.ComboBox();
|
|
|
this.label1 = new System.Windows.Forms.Label();
|
|
|
this.Remark_label = new System.Windows.Forms.Label();
|
|
|
- this.Remark = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
|
|
|
+ this.Remark = new System.Windows.Forms.RichTextBox();
|
|
|
this.SuspendLayout();
|
|
|
//
|
|
|
// Pallet_label
|
|
|
@@ -400,15 +400,13 @@
|
|
|
//
|
|
|
// Remark
|
|
|
//
|
|
|
- this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.Remark.Location = new System.Drawing.Point(1038, 290);
|
|
|
- this.Remark.Margin = new System.Windows.Forms.Padding(4);
|
|
|
+ this.Remark.Location = new System.Drawing.Point(1037, 299);
|
|
|
this.Remark.Name = "Remark";
|
|
|
- this.Remark.Size = new System.Drawing.Size(448, 241);
|
|
|
- this.Remark.TabIndex = 252;
|
|
|
+ this.Remark.Size = new System.Drawing.Size(450, 282);
|
|
|
+ this.Remark.TabIndex = 253;
|
|
|
this.Remark.Text = "";
|
|
|
//
|
|
|
- // Special_ResetKeyRelease
|
|
|
+ // Special_ResetKeyFreeze
|
|
|
//
|
|
|
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
|
|
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
|
|
@@ -439,12 +437,12 @@
|
|
|
this.Controls.Add(this.Split);
|
|
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
|
|
this.Margin = new System.Windows.Forms.Padding(4);
|
|
|
- this.Name = "Special_ResetKeyRelease";
|
|
|
+ this.Name = "Special_ResetKeyFreeze";
|
|
|
this.Tag = "Special!Reset";
|
|
|
this.Text = "重置站点";
|
|
|
this.Load += new System.EventHandler(this.Special_BoxSplit_Load);
|
|
|
this.SizeChanged += new System.EventHandler(this.Special_Reset_SizeChanged);
|
|
|
- this.ResumeLayout(true);
|
|
|
+ this.ResumeLayout(false);
|
|
|
this.PerformLayout();
|
|
|
|
|
|
}
|
|
|
@@ -477,6 +475,6 @@
|
|
|
private System.Windows.Forms.ComboBox cu_code;
|
|
|
private System.Windows.Forms.Label label1;
|
|
|
private System.Windows.Forms.Label Remark_label;
|
|
|
- private CustomControl.RichText.RichTextAutoBottom Remark;
|
|
|
+ private System.Windows.Forms.RichTextBox Remark;
|
|
|
}
|
|
|
}
|