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/08-nozzle/02-main/EditAssetsSprinklerMainDlg.Designer.cs | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/EditNozzleMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/EditAssetsSprinklerMainDlg.Designer.cs
similarity index 94%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/EditNozzleMainDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/EditAssetsSprinklerMainDlg.Designer.cs
index a578e6d..84f77b6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/EditNozzleMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/EditAssetsSprinklerMainDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- partial class EditAssetsNozzleMainDlg
+ partial class EditAssetsSprinklerMainDlg
{
/// <summary>
/// Required designer variable.
@@ -36,8 +36,8 @@
DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
TextEditCaliber = new DevExpress.XtraEditors.ImageComboBoxEdit();
TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
- TextEditCoefficient = new DevExpress.XtraEditors.TextEdit();
- TextEditKeyWorld = new DevExpress.XtraEditors.TextEdit();
+ TextEditMinorLoss = new DevExpress.XtraEditors.TextEdit();
+ TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
@@ -71,8 +71,8 @@
((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
((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)TextEditMinorLoss.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
@@ -111,8 +111,8 @@
layoutControl1.Controls.Add(TextEditMaterial);
layoutControl1.Controls.Add(TextEditFlowcoefficient);
layoutControl1.Controls.Add(TextEditAngle);
- layoutControl1.Controls.Add(TextEditCoefficient);
- layoutControl1.Controls.Add(TextEditKeyWorld);
+ layoutControl1.Controls.Add(TextEditMinorLoss);
+ layoutControl1.Controls.Add(TextEditKeyWord);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -180,21 +180,21 @@
TextEditMaterial.StyleController = layoutControl1;
TextEditMaterial.TabIndex = 4;
//
- // TextEditCoefficient
+ // TextEditMinorLoss
//
- TextEditCoefficient.Location = new Point(72, 56);
- TextEditCoefficient.Name = "TextEditCoefficient";
- TextEditCoefficient.Size = new Size(266, 20);
- TextEditCoefficient.StyleController = layoutControl1;
- TextEditCoefficient.TabIndex = 5;
+ TextEditMinorLoss.Location = new Point(72, 56);
+ TextEditMinorLoss.Name = "TextEditCoefficient";
+ TextEditMinorLoss.Size = new Size(266, 20);
+ TextEditMinorLoss.StyleController = layoutControl1;
+ TextEditMinorLoss.TabIndex = 5;
//
// 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
//
@@ -284,7 +284,7 @@
//
// layoutControlItem7
//
- layoutControlItem7.Control = TextEditKeyWorld;
+ layoutControlItem7.Control = TextEditKeyWord;
layoutControlItem7.Location = new Point(334, 0);
layoutControlItem7.Name = "layoutControlItem7";
layoutControlItem7.Size = new Size(335, 24);
@@ -293,7 +293,7 @@
//
// layoutControlItem6
//
- layoutControlItem6.Control = TextEditCoefficient;
+ layoutControlItem6.Control = TextEditMinorLoss;
layoutControlItem6.Location = new Point(0, 48);
layoutControlItem6.Name = "layoutControlItem6";
layoutControlItem6.Size = new Size(334, 24);
@@ -435,8 +435,8 @@
((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
((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)TextEditMinorLoss.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
@@ -498,11 +498,11 @@
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 layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraEditors.TextEdit TextEditCoefficient;
+ private DevExpress.XtraEditors.TextEdit TextEditMinorLoss;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit TextEditFlowcoefficient;
private DevExpress.XtraEditors.TextEdit TextEditAngle;
--
Gitblit v1.9.3