From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/05-set/SetHydroGradingTreeDlg.Designer.cs | 67 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/05-set/SetHydroGradingTreeDlg.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/05-set/SetHydroGradingTreeDlg.Designer.cs
index 2456a60..721e334 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/05-set/SetHydroGradingTreeDlg.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/08-grading/05-set/SetHydroGradingTreeDlg.Designer.cs
@@ -32,30 +32,30 @@
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ btnApply = new DevExpress.XtraEditors.SimpleButton();
selectHydroGradingPropTreeCtrl1 = new SelectHydroGradingPropTreeCtrl();
btnCancel = new DevExpress.XtraEditors.SimpleButton();
btnSave = new DevExpress.XtraEditors.SimpleButton();
setHydroGradingModelCtrl1 = new SetHydroGradingModelCtrl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
splitterItem2 = new DevExpress.XtraLayout.SplitterItem();
- btnApply = new DevExpress.XtraEditors.SimpleButton();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)ribbon).BeginInit();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)splitterItem2).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
+ ((ISupportInitialize)layoutControlItem4).BeginInit();
SuspendLayout();
//
// ribbon
@@ -97,11 +97,23 @@
layoutControl1.TabIndex = 4;
layoutControl1.Text = "layoutControl1";
//
+ // btnApply
+ //
+ btnApply.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
+ btnApply.Appearance.Options.UseBackColor = true;
+ btnApply.Location = new Point(594, 616);
+ btnApply.Name = "btnApply";
+ btnApply.Size = new Size(96, 22);
+ btnApply.StyleController = layoutControl1;
+ btnApply.TabIndex = 3;
+ btnApply.Text = "搴旂敤";
+ btnApply.Click += btnApply_Click;
+ //
// selectHydroGradingPropTreeCtrl1
//
- selectHydroGradingPropTreeCtrl1.Location = new Point(12, 12);
+ selectHydroGradingPropTreeCtrl1.Location = new Point(12, 10);
selectHydroGradingPropTreeCtrl1.Name = "selectHydroGradingPropTreeCtrl1";
- selectHydroGradingPropTreeCtrl1.Size = new Size(226, 600);
+ selectHydroGradingPropTreeCtrl1.Size = new Size(226, 602);
selectHydroGradingPropTreeCtrl1.TabIndex = 0;
//
// btnCancel
@@ -120,7 +132,7 @@
//
btnSave.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
btnSave.Appearance.Options.UseBackColor = true;
- btnSave.Location = new Point(594, 616);
+ btnSave.Location = new Point(694, 616);
btnSave.Name = "btnSave";
btnSave.Size = new Size(96, 22);
btnSave.StyleController = layoutControl1;
@@ -139,7 +151,7 @@
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem5, emptySpaceItem1, layoutControlItem1, splitterItem2, layoutControlItem2, layoutControlItem4 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem5, emptySpaceItem1, layoutControlItem1, splitterItem2, layoutControlItem4, layoutControlItem2 });
Root.Name = "Root";
Root.Size = new Size(902, 650);
Root.TextVisible = false;
@@ -154,18 +166,6 @@
layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
- //
- // layoutControlItem4
- //
- layoutControlItem4.Control = btnSave;
- layoutControlItem4.Location = new Point(582, 604);
- layoutControlItem4.MaxSize = new Size(100, 26);
- layoutControlItem4.MinSize = new Size(100, 26);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(100, 26);
- layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem4.TextSize = new Size(0, 0);
- layoutControlItem4.TextVisible = false;
//
// layoutControlItem5
//
@@ -192,6 +192,7 @@
layoutControlItem1.Control = selectHydroGradingPropTreeCtrl1;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 2);
layoutControlItem1.Size = new Size(230, 604);
layoutControlItem1.Text = "灞炴��";
layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
@@ -205,22 +206,10 @@
splitterItem2.Name = "splitterItem2";
splitterItem2.Size = new Size(10, 604);
//
- // btnApply
- //
- btnApply.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
- btnApply.Appearance.Options.UseBackColor = true;
- btnApply.Location = new Point(694, 616);
- btnApply.Name = "btnApply";
- btnApply.Size = new Size(96, 22);
- btnApply.StyleController = layoutControl1;
- btnApply.TabIndex = 3;
- btnApply.Text = "搴旂敤";
- btnApply.Click += btnApply_Click;
- //
// layoutControlItem2
//
layoutControlItem2.Control = btnApply;
- layoutControlItem2.Location = new Point(682, 604);
+ layoutControlItem2.Location = new Point(582, 604);
layoutControlItem2.MaxSize = new Size(100, 26);
layoutControlItem2.MinSize = new Size(100, 26);
layoutControlItem2.Name = "layoutControlItem2";
@@ -228,6 +217,18 @@
layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
layoutControlItem2.TextSize = new Size(0, 0);
layoutControlItem2.TextVisible = false;
+ //
+ // layoutControlItem4
+ //
+ layoutControlItem4.Control = btnSave;
+ layoutControlItem4.Location = new Point(682, 604);
+ layoutControlItem4.MaxSize = new Size(100, 26);
+ layoutControlItem4.MinSize = new Size(100, 26);
+ layoutControlItem4.Name = "layoutControlItem4";
+ layoutControlItem4.Size = new Size(100, 26);
+ layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ layoutControlItem4.TextSize = new Size(0, 0);
+ layoutControlItem4.TextVisible = false;
//
// SetHydroGradingTreeDlg
//
@@ -246,12 +247,12 @@
layoutControl1.ResumeLayout(false);
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)splitterItem2).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
+ ((ISupportInitialize)layoutControlItem4).EndInit();
ResumeLayout(false);
PerformLayout();
}
--
Gitblit v1.9.3