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/16-pump/SetHydroPumpDlg.Designer.cs |  109 +++++++++++++++---------------------------------------
 1 files changed, 31 insertions(+), 78 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/16-pump/SetHydroPumpDlg.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/16-pump/SetHydroPumpDlg.Designer.cs
similarity index 80%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/16-pump/SetHydroPumpDlg.Designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/16-pump/SetHydroPumpDlg.Designer.cs
index 79c7753..7bab656 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/16-pump/SetHydroPumpDlg.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/16-pump/SetHydroPumpDlg.Designer.cs
@@ -36,12 +36,7 @@
             txtRatedQ = new DevExpress.XtraEditors.TextEdit();
             txtCurrentHz = 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();
-            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -49,6 +44,8 @@
             layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem7 = 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)txtRatedN.Properties).BeginInit();
@@ -58,9 +55,6 @@
             ((ISupportInitialize)txtCurrentHz.Properties).BeginInit();
             ((ISupportInitialize)imgCmbLinkStatus.Properties).BeginInit();
             ((ISupportInitialize)Root).BeginInit();
-            ((ISupportInitialize)layoutControlItem2).BeginInit();
-            ((ISupportInitialize)layoutControlItem3).BeginInit();
-            ((ISupportInitialize)emptySpaceItem1).BeginInit();
             ((ISupportInitialize)layoutControlItem10).BeginInit();
             ((ISupportInitialize)layoutControlItem1).BeginInit();
             ((ISupportInitialize)layoutControlItem4).BeginInit();
@@ -68,24 +62,24 @@
             ((ISupportInitialize)layoutControlItem6).BeginInit();
             ((ISupportInitialize)layoutControlItem7).BeginInit();
             ((ISupportInitialize)dxErrorProvider1).BeginInit();
+            ((ISupportInitialize)layoutControlItem2).BeginInit();
             SuspendLayout();
             // 
             // layoutControl1
             // 
+            layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
             layoutControl1.Controls.Add(txtRatedN);
             layoutControl1.Controls.Add(txtRatedP);
             layoutControl1.Controls.Add(txtRatedH);
             layoutControl1.Controls.Add(txtRatedQ);
             layoutControl1.Controls.Add(txtCurrentHz);
             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(465, 128);
+            layoutControl1.Size = new Size(465, 125);
             layoutControl1.TabIndex = 1;
             layoutControl1.Text = "layoutControl1";
             // 
@@ -168,72 +162,16 @@
             imgCmbLinkStatus.StyleController = layoutControl1;
             imgCmbLinkStatus.TabIndex = 0;
             // 
-            // btnOk
-            // 
-            btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-            btnOk.Appearance.Options.UseBackColor = true;
-            btnOk.Location = new Point(279, 84);
-            btnOk.Name = "btnOk";
-            btnOk.Size = new Size(85, 22);
-            btnOk.StyleController = layoutControl1;
-            btnOk.TabIndex = 2;
-            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(368, 84);
-            btnCancel.Name = "btnCancel";
-            btnCancel.Size = new Size(85, 22);
-            btnCancel.StyleController = layoutControl1;
-            btnCancel.TabIndex = 3;
-            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, layoutControlItem10, layoutControlItem1, layoutControlItem4, layoutControlItem5, layoutControlItem6, layoutControlItem7 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem10, layoutControlItem1, layoutControlItem4, layoutControlItem5, layoutControlItem6, layoutControlItem7, layoutControlItem2 });
             Root.Name = "Root";
-            Root.Size = new Size(465, 128);
+            Root.Size = new Size(465, 125);
             Root.TextVisible = false;
-            // 
-            // layoutControlItem2
-            // 
-            layoutControlItem2.Control = btnCancel;
-            layoutControlItem2.Location = new Point(356, 72);
-            layoutControlItem2.MaxSize = new Size(89, 26);
-            layoutControlItem2.MinSize = new Size(89, 26);
-            layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new Size(89, 36);
-            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem2.TextSize = new Size(0, 0);
-            layoutControlItem2.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            layoutControlItem3.Control = btnOk;
-            layoutControlItem3.Location = new Point(267, 72);
-            layoutControlItem3.MaxSize = new Size(89, 26);
-            layoutControlItem3.MinSize = new Size(89, 26);
-            layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Size = new Size(89, 36);
-            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem3.TextSize = new Size(0, 0);
-            layoutControlItem3.TextVisible = false;
-            // 
-            // emptySpaceItem1
-            // 
-            emptySpaceItem1.AllowHotTrack = false;
-            emptySpaceItem1.Location = new Point(0, 72);
-            emptySpaceItem1.Name = "emptySpaceItem1";
-            emptySpaceItem1.Size = new Size(267, 36);
-            emptySpaceItem1.TextSize = new Size(0, 0);
             // 
             // layoutControlItem10
             // 
@@ -293,11 +231,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(441, 29);
+            generalOkAndCancelCtrl1.TabIndex = 9;
+            // 
+            // layoutControlItem2
+            // 
+            layoutControlItem2.Control = generalOkAndCancelCtrl1;
+            layoutControlItem2.Location = new Point(0, 72);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new Size(445, 33);
+            layoutControlItem2.TextSize = new Size(0, 0);
+            layoutControlItem2.TextVisible = false;
+            // 
             // SetHydroPumpDlg
             // 
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(465, 128);
+            ClientSize = new Size(465, 125);
             Controls.Add(layoutControl1);
             MaximizeBox = false;
             Name = "SetHydroPumpDlg";
@@ -312,9 +270,6 @@
             ((ISupportInitialize)txtCurrentHz.Properties).EndInit();
             ((ISupportInitialize)imgCmbLinkStatus.Properties).EndInit();
             ((ISupportInitialize)Root).EndInit();
-            ((ISupportInitialize)layoutControlItem2).EndInit();
-            ((ISupportInitialize)layoutControlItem3).EndInit();
-            ((ISupportInitialize)emptySpaceItem1).EndInit();
             ((ISupportInitialize)layoutControlItem10).EndInit();
             ((ISupportInitialize)layoutControlItem1).EndInit();
             ((ISupportInitialize)layoutControlItem4).EndInit();
@@ -322,18 +277,14 @@
             ((ISupportInitialize)layoutControlItem6).EndInit();
             ((ISupportInitialize)layoutControlItem7).EndInit();
             ((ISupportInitialize)dxErrorProvider1).EndInit();
+            ((ISupportInitialize)layoutControlItem2).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 emptySpaceItem1;
         private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
@@ -348,5 +299,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3