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/04-junction/SetHydroJunctionDlg.Designer.cs |  121 ++++++++++++----------------------------
 1 files changed, 37 insertions(+), 84 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/04-junction/SetHydroJunctionDlg.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/04-junction/SetHydroJunctionDlg.Designer.cs
similarity index 65%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/04-junction/SetHydroJunctionDlg.Designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/04-junction/SetHydroJunctionDlg.Designer.cs
index a2d529b..6009040 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/04-junction/SetHydroJunctionDlg.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/04-junction/SetHydroJunctionDlg.Designer.cs
@@ -32,50 +32,44 @@
             layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             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();
             dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+            generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             ((ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
             ((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)dxErrorProvider1).BeginInit();
+            ((ISupportInitialize)layoutControlItem2).BeginInit();
             SuspendLayout();
             // 
             // layoutControl1
             // 
+            layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
             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";
             layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(670, 266, 650, 400);
             layoutControl1.Root = Root;
-            layoutControl1.Size = new Size(358, 81);
+            layoutControl1.Size = new Size(367, 81);
             layoutControl1.TabIndex = 1;
             layoutControl1.Text = "layoutControl1";
             // 
             // txtMinorLoss
             // 
-            txtMinorLoss.Location = new Point(244, 12);
+            txtMinorLoss.Location = new Point(248, 12);
             txtMinorLoss.Name = "txtMinorLoss";
             txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
             txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            txtMinorLoss.Size = new Size(102, 20);
+            txtMinorLoss.Size = new Size(107, 20);
             txtMinorLoss.StyleController = layoutControl1;
             txtMinorLoss.TabIndex = 2;
             // 
@@ -88,33 +82,9 @@
             txtElev.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
             txtElev.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             txtElev.Properties.NullValuePrompt = "m";
-            txtElev.Size = new Size(100, 20);
+            txtElev.Size = new Size(104, 20);
             txtElev.StyleController = layoutControl1;
             txtElev.TabIndex = 0;
-            // 
-            // btnOk
-            // 
-            btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-            btnOk.Appearance.Options.UseBackColor = true;
-            btnOk.Location = new Point(172, 36);
-            btnOk.Name = "btnOk";
-            btnOk.Size = new Size(85, 22);
-            btnOk.StyleController = layoutControl1;
-            btnOk.TabIndex = 3;
-            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(261, 36);
-            btnCancel.Name = "btnCancel";
-            btnCancel.Size = new Size(85, 22);
-            btnCancel.StyleController = layoutControl1;
-            btnCancel.TabIndex = 4;
-            btnCancel.Text = "鍙栨秷";
             // 
             // Root
             // 
@@ -122,58 +92,26 @@
             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 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem4, layoutControlItem2 });
             Root.Name = "Root";
-            Root.Size = new Size(358, 81);
+            Root.Size = new Size(367, 81);
             Root.TextVisible = false;
-            // 
-            // layoutControlItem2
-            // 
-            layoutControlItem2.Control = btnCancel;
-            layoutControlItem2.Location = new Point(249, 24);
-            layoutControlItem2.MaxSize = new Size(89, 26);
-            layoutControlItem2.MinSize = new Size(89, 26);
-            layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new Size(89, 37);
-            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem2.TextSize = new Size(0, 0);
-            layoutControlItem2.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            layoutControlItem3.Control = btnOk;
-            layoutControlItem3.Location = new Point(160, 24);
-            layoutControlItem3.MaxSize = new Size(89, 26);
-            layoutControlItem3.MinSize = new Size(89, 26);
-            layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Size = new Size(89, 37);
-            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem3.TextSize = new Size(0, 0);
-            layoutControlItem3.TextVisible = false;
-            // 
-            // emptySpaceItem1
-            // 
-            emptySpaceItem1.AllowHotTrack = false;
-            emptySpaceItem1.Location = new Point(0, 24);
-            emptySpaceItem1.Name = "emptySpaceItem1";
-            emptySpaceItem1.Size = new Size(160, 37);
-            emptySpaceItem1.TextSize = new Size(0, 0);
             // 
             // layoutControlItem1
             // 
             layoutControlItem1.Control = txtElev;
             layoutControlItem1.Location = new Point(0, 0);
             layoutControlItem1.Name = "layoutControlItem1";
-            layoutControlItem1.Size = new Size(168, 24);
+            layoutControlItem1.Size = new Size(172, 24);
             layoutControlItem1.Text = "鏍囬珮:";
             layoutControlItem1.TextSize = new Size(52, 14);
             // 
             // layoutControlItem4
             // 
             layoutControlItem4.Control = txtMinorLoss;
-            layoutControlItem4.Location = new Point(168, 0);
+            layoutControlItem4.Location = new Point(172, 0);
             layoutControlItem4.Name = "layoutControlItem4";
-            layoutControlItem4.Size = new Size(170, 24);
+            layoutControlItem4.Size = new Size(175, 24);
             layoutControlItem4.Text = "灞�闃荤郴鏁�:";
             layoutControlItem4.TextSize = new Size(52, 14);
             // 
@@ -181,11 +119,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, 36);
+            generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
+            generalOkAndCancelCtrl1.Size = new Size(343, 33);
+            generalOkAndCancelCtrl1.TabIndex = 4;
+            // 
+            // layoutControlItem2
+            // 
+            layoutControlItem2.Control = generalOkAndCancelCtrl1;
+            layoutControlItem2.Location = new Point(0, 24);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new Size(347, 37);
+            layoutControlItem2.TextSize = new Size(0, 0);
+            layoutControlItem2.TextVisible = false;
+            // 
             // SetHydroJunctionDlg
             // 
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(358, 81);
+            ClientSize = new Size(367, 81);
             Controls.Add(layoutControl1);
             MaximizeBox = false;
             Name = "SetHydroJunctionDlg";
@@ -196,12 +154,10 @@
             ((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)dxErrorProvider1).EndInit();
+            ((ISupportInitialize)layoutControlItem2).EndInit();
             ResumeLayout(false);
         }
 
@@ -209,12 +165,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 txtMinorLoss;
@@ -222,5 +173,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3