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/09-hydrant/SetHydroHydrantDlg.Designer.cs | 103 ++++++++++++++-------------------------------------
1 files changed, 28 insertions(+), 75 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/09-hydrant/SetHydroHydrantDlg.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/09-hydrant/SetHydroHydrantDlg.Designer.cs
similarity index 76%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/09-hydrant/SetHydroHydrantDlg.Designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/09-hydrant/SetHydroHydrantDlg.Designer.cs
index d0a649d..abf824e 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/09-hydrant/SetHydroHydrantDlg.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/09-hydrant/SetHydroHydrantDlg.Designer.cs
@@ -34,17 +34,14 @@
txtDemand = new DevExpress.XtraEditors.TextEdit();
txtMinorLoss = new DevExpress.XtraEditors.TextEdit();
txtElev = new DevExpress.XtraEditors.TextEdit();
- 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();
- emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtCoefficient.Properties).BeginInit();
@@ -52,24 +49,21 @@
((ISupportInitialize)txtMinorLoss.Properties).BeginInit();
((ISupportInitialize)txtElev.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem2).BeginInit();
- ((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem9).BeginInit();
((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((ISupportInitialize)layoutControlItem2).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
layoutControl1.Controls.Add(txtCoefficient);
layoutControl1.Controls.Add(txtDemand);
layoutControl1.Controls.Add(txtMinorLoss);
layoutControl1.Controls.Add(txtElev);
- layoutControl1.Controls.Add(btnOk);
- layoutControl1.Controls.Add(btnCancel);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -126,72 +120,16 @@
txtElev.StyleController = layoutControl1;
txtElev.TabIndex = 0;
//
- // btnOk
- //
- btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
- btnOk.Appearance.Options.UseBackColor = true;
- btnOk.Location = new Point(244, 60);
- btnOk.Name = "btnOk";
- btnOk.Size = new Size(85, 22);
- btnOk.StyleController = layoutControl1;
- btnOk.TabIndex = 5;
- 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(333, 60);
- btnCancel.Name = "btnCancel";
- btnCancel.Size = new Size(85, 22);
- btnCancel.StyleController = layoutControl1;
- btnCancel.TabIndex = 6;
- btnCancel.Text = "鍙栨秷";
- //
// 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[] { layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem1, layoutControlItem4, layoutControlItem9, layoutControlItem5 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem4, layoutControlItem9, layoutControlItem5, layoutControlItem2 });
Root.Name = "Root";
Root.Size = new Size(430, 101);
Root.TextVisible = false;
- //
- // layoutControlItem2
- //
- layoutControlItem2.Control = btnCancel;
- layoutControlItem2.Location = new Point(321, 48);
- layoutControlItem2.MaxSize = new Size(89, 26);
- layoutControlItem2.MinSize = new Size(89, 26);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(89, 33);
- layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem2.TextSize = new Size(0, 0);
- layoutControlItem2.TextVisible = false;
- //
- // layoutControlItem3
- //
- layoutControlItem3.Control = btnOk;
- layoutControlItem3.Location = new Point(232, 48);
- layoutControlItem3.MaxSize = new Size(89, 26);
- layoutControlItem3.MinSize = new Size(89, 26);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(89, 33);
- layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem3.TextSize = new Size(0, 0);
- layoutControlItem3.TextVisible = false;
- //
- // emptySpaceItem1
- //
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(0, 48);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(232, 33);
- emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem1
//
@@ -233,6 +171,26 @@
//
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, 60);
+ generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
+ generalOkAndCancelCtrl1.Size = new Size(406, 29);
+ generalOkAndCancelCtrl1.TabIndex = 5;
+ //
+ // layoutControlItem2
+ //
+ layoutControlItem2.Control = generalOkAndCancelCtrl1;
+ layoutControlItem2.Location = new Point(0, 48);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(410, 33);
+ layoutControlItem2.TextSize = new Size(0, 0);
+ layoutControlItem2.TextVisible = false;
+ //
// SetHydroHydrantDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -250,14 +208,12 @@
((ISupportInitialize)txtMinorLoss.Properties).EndInit();
((ISupportInitialize)txtElev.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem2).EndInit();
- ((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem9).EndInit();
((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
+ ((ISupportInitialize)layoutControlItem2).EndInit();
ResumeLayout(false);
}
@@ -265,12 +221,7 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraEditors.TextEdit txtElev;
- 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 emptySpaceItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraEditors.TextEdit txtDemand;
@@ -282,5 +233,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.TextEdit txtCoefficient;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
}
}
\ No newline at end of file
--
Gitblit v1.9.3