From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs
index f217d36..7229f57 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.Designer.cs
@@ -37,7 +37,7 @@
TextEditCaliber = new DevExpress.XtraEditors.ImageComboBoxEdit();
TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
TextEditCoefficient = new DevExpress.XtraEditors.TextEdit();
- TextEditKeyWorld = new DevExpress.XtraEditors.TextEdit();
+ TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -66,7 +66,7 @@
((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)TextEditKeyWorld.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
@@ -98,7 +98,7 @@
layoutControl1.Controls.Add(TextEditCaliber);
layoutControl1.Controls.Add(TextEditMaterial);
layoutControl1.Controls.Add(TextEditCoefficient);
- layoutControl1.Controls.Add(TextEditKeyWorld);
+ layoutControl1.Controls.Add(TextEditKeyWord);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -166,7 +166,7 @@
TextEditMaterial.StyleController = layoutControl1;
TextEditMaterial.TabIndex = 4;
//
- // TextEditCoefficient
+ // TextEditMinorLoss
//
TextEditCoefficient.Location = new Point(72, 56);
TextEditCoefficient.Name = "TextEditCoefficient";
@@ -176,11 +176,11 @@
//
// TextEditKeyWord
//
- TextEditKeyWorld.Location = new Point(406, 8);
- TextEditKeyWorld.Name = "TextEditKeyWorld";
- TextEditKeyWorld.Size = new Size(267, 20);
- TextEditKeyWorld.StyleController = layoutControl1;
- TextEditKeyWorld.TabIndex = 2;
+ TextEditKeyWord.Location = new Point(406, 8);
+ TextEditKeyWord.Name = "TextEditKeyWorld";
+ TextEditKeyWord.Size = new Size(267, 20);
+ TextEditKeyWord.StyleController = layoutControl1;
+ TextEditKeyWord.TabIndex = 2;
//
// Root
//
@@ -272,7 +272,7 @@
//
// layoutControlItem2
//
- layoutControlItem2.Control = TextEditKeyWorld;
+ layoutControlItem2.Control = TextEditKeyWord;
layoutControlItem2.Location = new Point(334, 0);
layoutControlItem2.Name = "layoutControlItem2";
layoutControlItem2.Size = new Size(335, 24);
@@ -374,7 +374,7 @@
((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)TextEditKeyWorld.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
@@ -430,7 +430,7 @@
private DevExpress.XtraEditors.ImageComboBoxEdit TextEditMaterial;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup5;
private DevExpress.Utils.ToolTipController toolTipController1;
- private DevExpress.XtraEditors.TextEdit TextEditKeyWorld;
+ private DevExpress.XtraEditors.TextEdit TextEditKeyWord;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.TextEdit TextEditCoefficient;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
--
Gitblit v1.9.3