From b8b4a64639871398247fe43c84ddd0ba058a14dc Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 30 十一月 2024 14:46:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs | 274 ++++++++++++++++++++++++------------------------------
1 files changed, 123 insertions(+), 151 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs
index 9609930..3546c5b 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs
@@ -28,24 +28,21 @@
/// </summary>
private void InitializeComponent()
{
- components = new Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
txtMaterial = new DevExpress.XtraEditors.TextEdit();
txtMinorLoss = new DevExpress.XtraEditors.TextEdit();
txtRoughness = new DevExpress.XtraEditors.TextEdit();
txtLength = new DevExpress.XtraEditors.TextEdit();
txtDiameter = new DevExpress.XtraEditors.TextEdit();
- imgCmbLinkStatus = new DevExpress.XtraEditors.ImageComboBoxEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
- generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtMaterial.Properties).BeginInit();
@@ -53,16 +50,14 @@
((ISupportInitialize)txtRoughness.Properties).BeginInit();
((ISupportInitialize)txtLength.Properties).BeginInit();
((ISupportInitialize)txtDiameter.Properties).BeginInit();
- ((ISupportInitialize)imgCmbLinkStatus.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem10).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlItem9).BeginInit();
- ((ISupportInitialize)dxErrorProvider1).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
+ ((ISupportInitialize)emptySpaceItem1).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -73,7 +68,6 @@
layoutControl1.Controls.Add(txtRoughness);
layoutControl1.Controls.Add(txtLength);
layoutControl1.Controls.Add(txtDiameter);
- layoutControl1.Controls.Add(imgCmbLinkStatus);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -82,142 +76,6 @@
layoutControl1.Size = new Size(477, 122);
layoutControl1.TabIndex = 1;
layoutControl1.Text = "layoutControl1";
- //
- // txtMaterial
- //
- txtMaterial.Location = new Point(304, 12);
- txtMaterial.Name = "txtMaterial";
- txtMaterial.Size = new Size(161, 20);
- txtMaterial.StyleController = layoutControl1;
- txtMaterial.TabIndex = 2;
- //
- // txtMinorLoss
- //
- txtMinorLoss.Location = new Point(304, 60);
- txtMinorLoss.Name = "txtMinorLoss";
- txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- txtMinorLoss.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
- txtMinorLoss.Size = new Size(161, 20);
- txtMinorLoss.StyleController = layoutControl1;
- txtMinorLoss.TabIndex = 6;
- //
- // txtRoughness
- //
- txtRoughness.Location = new Point(76, 60);
- txtRoughness.Name = "txtRoughness";
- txtRoughness.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtRoughness.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- txtRoughness.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
- txtRoughness.Size = new Size(160, 20);
- txtRoughness.StyleController = layoutControl1;
- txtRoughness.TabIndex = 5;
- //
- // txtLength
- //
- txtLength.Location = new Point(304, 36);
- txtLength.Name = "txtLength";
- txtLength.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtLength.Properties.DisplayFormat.FormatString = "{0}m";
- txtLength.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
- txtLength.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- txtLength.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
- txtLength.Properties.NullValuePrompt = "m";
- txtLength.Size = new Size(161, 20);
- txtLength.StyleController = layoutControl1;
- txtLength.TabIndex = 4;
- //
- // txtDiameter
- //
- txtDiameter.Location = new Point(76, 36);
- txtDiameter.Name = "txtDiameter";
- txtDiameter.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtDiameter.Properties.DisplayFormat.FormatString = "{0}mm";
- txtDiameter.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
- txtDiameter.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- txtDiameter.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
- txtDiameter.Properties.NullValuePrompt = "mm";
- txtDiameter.Size = new Size(160, 20);
- txtDiameter.StyleController = layoutControl1;
- txtDiameter.TabIndex = 3;
- //
- // imgCmbLinkStatus
- //
- imgCmbLinkStatus.Location = new Point(76, 12);
- imgCmbLinkStatus.Name = "imgCmbLinkStatus";
- imgCmbLinkStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- imgCmbLinkStatus.Size = new Size(160, 20);
- imgCmbLinkStatus.StyleController = layoutControl1;
- imgCmbLinkStatus.TabIndex = 0;
- //
- // Root
- //
- Root.AppearanceItemCaption.Options.UseTextOptions = true;
- Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
- Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem10, layoutControlItem4, layoutControlItem5, layoutControlItem6, layoutControlItem7, layoutControlItem9, layoutControlItem1 });
- Root.Name = "Root";
- Root.Size = new Size(477, 122);
- Root.TextVisible = false;
- //
- // layoutControlItem10
- //
- layoutControlItem10.Control = imgCmbLinkStatus;
- layoutControlItem10.Location = new Point(0, 0);
- layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(228, 24);
- layoutControlItem10.Text = "绠￠亾鐘舵��:";
- layoutControlItem10.TextSize = new Size(52, 14);
- //
- // layoutControlItem4
- //
- layoutControlItem4.Control = txtDiameter;
- layoutControlItem4.Location = new Point(0, 24);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(228, 24);
- layoutControlItem4.Text = "鐩村緞:";
- layoutControlItem4.TextSize = new Size(52, 14);
- //
- // layoutControlItem5
- //
- layoutControlItem5.Control = txtLength;
- layoutControlItem5.Location = new Point(228, 24);
- layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(229, 24);
- layoutControlItem5.Text = "闀垮害:";
- layoutControlItem5.TextSize = new Size(52, 14);
- //
- // layoutControlItem6
- //
- layoutControlItem6.Control = txtRoughness;
- layoutControlItem6.Location = new Point(0, 48);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(228, 24);
- layoutControlItem6.Text = "绮楃硻绯绘暟:";
- layoutControlItem6.TextSize = new Size(52, 14);
- //
- // layoutControlItem7
- //
- layoutControlItem7.Control = txtMinorLoss;
- layoutControlItem7.Location = new Point(228, 48);
- layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(229, 24);
- layoutControlItem7.Text = "灞�闃荤郴鏁�:";
- layoutControlItem7.TextSize = new Size(52, 14);
- //
- // layoutControlItem9
- //
- layoutControlItem9.Control = txtMaterial;
- layoutControlItem9.Location = new Point(228, 0);
- layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(229, 24);
- layoutControlItem9.Text = "鏉愯川:";
- layoutControlItem9.TextSize = new Size(52, 14);
- //
- // dxErrorProvider1
- //
- dxErrorProvider1.ContainerControl = this;
//
// generalOkAndCancelCtrl1
//
@@ -230,6 +88,116 @@
generalOkAndCancelCtrl1.Size = new Size(453, 26);
generalOkAndCancelCtrl1.TabIndex = 7;
//
+ // txtMaterial
+ //
+ txtMaterial.Location = new Point(76, 12);
+ txtMaterial.Name = "txtMaterial";
+ txtMaterial.Size = new Size(160, 20);
+ txtMaterial.StyleController = layoutControl1;
+ txtMaterial.TabIndex = 2;
+ //
+ // txtMinorLoss
+ //
+ txtMinorLoss.Location = new Point(76, 60);
+ txtMinorLoss.Name = "txtMinorLoss";
+ txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtMinorLoss.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtMinorLoss.Size = new Size(160, 20);
+ txtMinorLoss.StyleController = layoutControl1;
+ txtMinorLoss.TabIndex = 6;
+ //
+ // txtRoughness
+ //
+ txtRoughness.Location = new Point(304, 36);
+ txtRoughness.Name = "txtRoughness";
+ txtRoughness.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtRoughness.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtRoughness.Size = new Size(161, 20);
+ txtRoughness.StyleController = layoutControl1;
+ txtRoughness.TabIndex = 5;
+ //
+ // txtLength
+ //
+ txtLength.Location = new Point(76, 36);
+ txtLength.Name = "txtLength";
+ txtLength.Properties.DisplayFormat.FormatString = "{0}m";
+ txtLength.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
+ txtLength.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtLength.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtLength.Properties.NullValuePrompt = "m";
+ txtLength.Size = new Size(160, 20);
+ txtLength.StyleController = layoutControl1;
+ txtLength.TabIndex = 4;
+ //
+ // txtDiameter
+ //
+ txtDiameter.Location = new Point(304, 12);
+ txtDiameter.Name = "txtDiameter";
+ txtDiameter.Properties.DisplayFormat.FormatString = "{0}mm";
+ txtDiameter.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
+ txtDiameter.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtDiameter.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+ txtDiameter.Properties.NullValuePrompt = "mm";
+ txtDiameter.Size = new Size(161, 20);
+ txtDiameter.StyleController = layoutControl1;
+ txtDiameter.TabIndex = 3;
+ //
+ // Root
+ //
+ Root.AppearanceItemCaption.Options.UseTextOptions = true;
+ Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ Root.GroupBordersVisible = false;
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5, layoutControlItem7, layoutControlItem9, layoutControlItem1, layoutControlItem4, layoutControlItem6, emptySpaceItem1 });
+ Root.Name = "Root";
+ Root.Size = new Size(477, 122);
+ Root.TextVisible = false;
+ //
+ // layoutControlItem4
+ //
+ layoutControlItem4.Control = txtDiameter;
+ layoutControlItem4.Location = new Point(228, 0);
+ layoutControlItem4.Name = "layoutControlItem4";
+ layoutControlItem4.Size = new Size(229, 24);
+ layoutControlItem4.Text = "鐩村緞:";
+ layoutControlItem4.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem5
+ //
+ layoutControlItem5.Control = txtLength;
+ layoutControlItem5.Location = new Point(0, 24);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(228, 24);
+ layoutControlItem5.Text = "闀垮害:";
+ layoutControlItem5.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = txtRoughness;
+ layoutControlItem6.Location = new Point(228, 24);
+ layoutControlItem6.Name = "layoutControlItem6";
+ layoutControlItem6.Size = new Size(229, 24);
+ layoutControlItem6.Text = "绮楃硻绯绘暟:";
+ layoutControlItem6.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem7
+ //
+ layoutControlItem7.Control = txtMinorLoss;
+ layoutControlItem7.Location = new Point(0, 48);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(228, 24);
+ layoutControlItem7.Text = "灞�闃荤郴鏁�:";
+ layoutControlItem7.TextSize = new Size(52, 14);
+ //
+ // layoutControlItem9
+ //
+ layoutControlItem9.Control = txtMaterial;
+ layoutControlItem9.Location = new Point(0, 0);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(228, 24);
+ layoutControlItem9.Text = "鏉愯川:";
+ layoutControlItem9.TextSize = new Size(52, 14);
+ //
// layoutControlItem1
//
layoutControlItem1.Control = generalOkAndCancelCtrl1;
@@ -238,6 +206,14 @@
layoutControlItem1.Size = new Size(457, 30);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
+ //
+ // emptySpaceItem1
+ //
+ emptySpaceItem1.AllowHotTrack = false;
+ emptySpaceItem1.Location = new Point(228, 48);
+ emptySpaceItem1.Name = "emptySpaceItem1";
+ emptySpaceItem1.Size = new Size(229, 24);
+ emptySpaceItem1.TextSize = new Size(0, 0);
//
// SetHydroPipeDlg
//
@@ -256,16 +232,14 @@
((ISupportInitialize)txtRoughness.Properties).EndInit();
((ISupportInitialize)txtLength.Properties).EndInit();
((ISupportInitialize)txtDiameter.Properties).EndInit();
- ((ISupportInitialize)imgCmbLinkStatus.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem10).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlItem9).EndInit();
- ((ISupportInitialize)dxErrorProvider1).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
+ ((ISupportInitialize)emptySpaceItem1).EndInit();
ResumeLayout(false);
}
@@ -273,12 +247,9 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraEditors.ImageComboBoxEdit imgCmbLinkStatus;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.TextEdit txtMinorLoss;
private DevExpress.XtraEditors.TextEdit txtRoughness;
private DevExpress.XtraEditors.TextEdit txtLength;
@@ -289,5 +260,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3