From c9585ab171fb973d16792d7a290994bf8279da63 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 09 十一月 2024 09:56:41 +0800
Subject: [PATCH] 属性视图调整
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs | 145 ++++++++++++++++--------------------------------
1 files changed, 49 insertions(+), 96 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/SetHydroPipeDlg.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs
similarity index 72%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/SetHydroPipeDlg.Designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs
index fd8be1f..9609930 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/SetHydroPipeDlg.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/SetHydroPipeDlg.Designer.cs
@@ -36,12 +36,7 @@
txtLength = new DevExpress.XtraEditors.TextEdit();
txtDiameter = new DevExpress.XtraEditors.TextEdit();
imgCmbLinkStatus = new DevExpress.XtraEditors.ImageComboBoxEdit();
- btnOk = new DevExpress.XtraEditors.SimpleButton();
- btnCancel = new DevExpress.XtraEditors.SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- empty = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -49,6 +44,8 @@
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();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtMaterial.Properties).BeginInit();
@@ -58,9 +55,6 @@
((ISupportInitialize)txtDiameter.Properties).BeginInit();
((ISupportInitialize)imgCmbLinkStatus.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem2).BeginInit();
- ((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)empty).BeginInit();
((ISupportInitialize)layoutControlItem10).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem5).BeginInit();
@@ -68,43 +62,43 @@
((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlItem9).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
layoutControl1.Controls.Add(txtMaterial);
layoutControl1.Controls.Add(txtMinorLoss);
layoutControl1.Controls.Add(txtRoughness);
layoutControl1.Controls.Add(txtLength);
layoutControl1.Controls.Add(txtDiameter);
layoutControl1.Controls.Add(imgCmbLinkStatus);
- layoutControl1.Controls.Add(btnOk);
- layoutControl1.Controls.Add(btnCancel);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(670, 266, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(511, 127);
+ layoutControl1.Size = new Size(477, 122);
layoutControl1.TabIndex = 1;
layoutControl1.Text = "layoutControl1";
//
// txtMaterial
//
- txtMaterial.Location = new Point(321, 12);
+ txtMaterial.Location = new Point(304, 12);
txtMaterial.Name = "txtMaterial";
- txtMaterial.Size = new Size(178, 20);
+ txtMaterial.Size = new Size(161, 20);
txtMaterial.StyleController = layoutControl1;
txtMaterial.TabIndex = 2;
//
// txtMinorLoss
//
- txtMinorLoss.Location = new Point(321, 60);
+ 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(178, 20);
+ txtMinorLoss.Size = new Size(161, 20);
txtMinorLoss.StyleController = layoutControl1;
txtMinorLoss.TabIndex = 6;
//
@@ -115,13 +109,13 @@
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(177, 20);
+ txtRoughness.Size = new Size(160, 20);
txtRoughness.StyleController = layoutControl1;
txtRoughness.TabIndex = 5;
//
// txtLength
//
- txtLength.Location = new Point(321, 36);
+ txtLength.Location = new Point(304, 36);
txtLength.Name = "txtLength";
txtLength.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
txtLength.Properties.DisplayFormat.FormatString = "{0}m";
@@ -129,7 +123,7 @@
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(178, 20);
+ txtLength.Size = new Size(161, 20);
txtLength.StyleController = layoutControl1;
txtLength.TabIndex = 4;
//
@@ -143,7 +137,7 @@
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(177, 20);
+ txtDiameter.Size = new Size(160, 20);
txtDiameter.StyleController = layoutControl1;
txtDiameter.TabIndex = 3;
//
@@ -152,33 +146,9 @@
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(177, 20);
+ imgCmbLinkStatus.Size = new Size(160, 20);
imgCmbLinkStatus.StyleController = layoutControl1;
imgCmbLinkStatus.TabIndex = 0;
- //
- // btnOk
- //
- btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
- btnOk.Appearance.Options.UseBackColor = true;
- btnOk.Location = new Point(325, 84);
- btnOk.Name = "btnOk";
- btnOk.Size = new Size(85, 22);
- btnOk.StyleController = layoutControl1;
- btnOk.TabIndex = 7;
- btnOk.Text = "纭畾";
- btnOk.Click += btnOk_Click;
- //
- // btnCancel
- //
- btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- btnCancel.Appearance.Options.UseBackColor = true;
- btnCancel.DialogResult = DialogResult.Cancel;
- btnCancel.Location = new Point(414, 84);
- btnCancel.Name = "btnCancel";
- btnCancel.Size = new Size(85, 22);
- btnCancel.StyleController = layoutControl1;
- btnCancel.TabIndex = 8;
- btnCancel.Text = "鍙栨秷";
//
// Root
//
@@ -186,49 +156,17 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3, empty, layoutControlItem10, layoutControlItem4, layoutControlItem5, layoutControlItem6, layoutControlItem7, layoutControlItem9 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem10, layoutControlItem4, layoutControlItem5, layoutControlItem6, layoutControlItem7, layoutControlItem9, layoutControlItem1 });
Root.Name = "Root";
- Root.Size = new Size(511, 127);
+ Root.Size = new Size(477, 122);
Root.TextVisible = false;
- //
- // layoutControlItem2
- //
- layoutControlItem2.Control = btnCancel;
- layoutControlItem2.Location = new Point(402, 72);
- layoutControlItem2.MaxSize = new Size(89, 26);
- layoutControlItem2.MinSize = new Size(89, 26);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(89, 35);
- layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem2.TextSize = new Size(0, 0);
- layoutControlItem2.TextVisible = false;
- //
- // layoutControlItem3
- //
- layoutControlItem3.Control = btnOk;
- layoutControlItem3.Location = new Point(313, 72);
- layoutControlItem3.MaxSize = new Size(89, 26);
- layoutControlItem3.MinSize = new Size(89, 26);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(89, 35);
- layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem3.TextSize = new Size(0, 0);
- layoutControlItem3.TextVisible = false;
- //
- // empty
- //
- empty.AllowHotTrack = false;
- empty.Location = new Point(0, 72);
- empty.Name = "empty";
- empty.Size = new Size(313, 35);
- empty.TextSize = new Size(0, 0);
//
// layoutControlItem10
//
layoutControlItem10.Control = imgCmbLinkStatus;
layoutControlItem10.Location = new Point(0, 0);
layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(245, 24);
+ layoutControlItem10.Size = new Size(228, 24);
layoutControlItem10.Text = "绠￠亾鐘舵��:";
layoutControlItem10.TextSize = new Size(52, 14);
//
@@ -237,16 +175,16 @@
layoutControlItem4.Control = txtDiameter;
layoutControlItem4.Location = new Point(0, 24);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(245, 24);
+ layoutControlItem4.Size = new Size(228, 24);
layoutControlItem4.Text = "鐩村緞:";
layoutControlItem4.TextSize = new Size(52, 14);
//
// layoutControlItem5
//
layoutControlItem5.Control = txtLength;
- layoutControlItem5.Location = new Point(245, 24);
+ layoutControlItem5.Location = new Point(228, 24);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(246, 24);
+ layoutControlItem5.Size = new Size(229, 24);
layoutControlItem5.Text = "闀垮害:";
layoutControlItem5.TextSize = new Size(52, 14);
//
@@ -255,25 +193,25 @@
layoutControlItem6.Control = txtRoughness;
layoutControlItem6.Location = new Point(0, 48);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(245, 24);
+ layoutControlItem6.Size = new Size(228, 24);
layoutControlItem6.Text = "绮楃硻绯绘暟:";
layoutControlItem6.TextSize = new Size(52, 14);
//
// layoutControlItem7
//
layoutControlItem7.Control = txtMinorLoss;
- layoutControlItem7.Location = new Point(245, 48);
+ layoutControlItem7.Location = new Point(228, 48);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(246, 24);
+ layoutControlItem7.Size = new Size(229, 24);
layoutControlItem7.Text = "灞�闃荤郴鏁�:";
layoutControlItem7.TextSize = new Size(52, 14);
//
// layoutControlItem9
//
layoutControlItem9.Control = txtMaterial;
- layoutControlItem9.Location = new Point(245, 0);
+ layoutControlItem9.Location = new Point(228, 0);
layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(246, 24);
+ layoutControlItem9.Size = new Size(229, 24);
layoutControlItem9.Text = "鏉愯川:";
layoutControlItem9.TextSize = new Size(52, 14);
//
@@ -281,11 +219,31 @@
//
dxErrorProvider1.ContainerControl = this;
//
+ // generalOkAndCancelCtrl1
+ //
+ generalOkAndCancelCtrl1.ButtonCancelMaxSize = new Size(100, 26);
+ generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
+ generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
+ generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
+ generalOkAndCancelCtrl1.Location = new Point(12, 84);
+ generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
+ generalOkAndCancelCtrl1.Size = new Size(453, 26);
+ generalOkAndCancelCtrl1.TabIndex = 7;
+ //
+ // layoutControlItem1
+ //
+ layoutControlItem1.Control = generalOkAndCancelCtrl1;
+ layoutControlItem1.Location = new Point(0, 72);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Size = new Size(457, 30);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
+ //
// SetHydroPipeDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(511, 127);
+ ClientSize = new Size(477, 122);
Controls.Add(layoutControl1);
MaximizeBox = false;
Name = "SetHydroPipeDlg";
@@ -300,9 +258,6 @@
((ISupportInitialize)txtDiameter.Properties).EndInit();
((ISupportInitialize)imgCmbLinkStatus.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem2).EndInit();
- ((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)empty).EndInit();
((ISupportInitialize)layoutControlItem10).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem5).EndInit();
@@ -310,18 +265,14 @@
((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlItem9).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
ResumeLayout(false);
}
#endregion
private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraEditors.SimpleButton btnOk;
- private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.EmptySpaceItem empty;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
@@ -336,5 +287,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.TextEdit txtMaterial;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3