From 4999c3c3884084c10c8a4bb2426e92cb63600166 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 09 十一月 2024 09:58:22 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/SetHydroNozzleListDlg.Designer.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/10-nozzle/SetHydroNozzleListDlg.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/SetHydroNozzleListDlg.Designer.cs
similarity index 65%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/10-nozzle/SetHydroNozzleListDlg.Designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/SetHydroNozzleListDlg.Designer.cs
index 5b2ddf0..c2b8081 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/10-nozzle/SetHydroNozzleListDlg.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/SetHydroNozzleListDlg.Designer.cs
@@ -28,15 +28,25 @@
/// </summary>
private void InitializeComponent()
{
-
+ hydroNozzleListCtrl1 = new HydroNozzleListCtrl();
SuspendLayout();
//
- // HydroNozzleBulkSetListDlg
+ // hydroNozzleListCtrl1
+ //
+ hydroNozzleListCtrl1.Dock = DockStyle.Fill;
+ hydroNozzleListCtrl1.Location = new Point(0, 0);
+ hydroNozzleListCtrl1.Name = "hydroNozzleListCtrl1";
+ hydroNozzleListCtrl1.Size = new Size(1397, 449);
+ hydroNozzleListCtrl1.TabIndex = 0;
+ //
+ // SetHydroNozzleListDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1397, 449);
- Name = "HydroNozzleBulkSetListDlg";
+ Controls.Add(hydroNozzleListCtrl1);
+ Name = "SetHydroNozzleListDlg";
+ StartPosition = FormStartPosition.CenterParent;
Text = "鍠峰槾";
ResumeLayout(false);
}
@@ -44,5 +54,6 @@
#endregion
+ private HydroNozzleListCtrl hydroNozzleListCtrl1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3