From c0be7c001375f73e2c3b49a1b1d447b6fc297bdd Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 21 三月 2025 13:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/info/SchoolPlaceInfoCtrl.Designer.cs | 87 ++++++++++++++++++-------------------------
1 files changed, 37 insertions(+), 50 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/info/SchoolPlaceInfoCtrl.Designer.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/info/SchoolPlaceInfoCtrl.Designer.cs
index 0ab7499..8ac0216 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/info/SchoolPlaceInfoCtrl.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/02-place/info/SchoolPlaceInfoCtrl.Designer.cs
@@ -28,24 +28,22 @@
/// </summary>
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
+ components = new Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- cbLevel = new DevExpress.XtraEditors.ComboBoxEdit();
- cbSchoolType = new DevExpress.XtraEditors.ComboBoxEdit();
+ cbLevel = new ComboBoxEdit();
+ cbSchoolType = new ComboBoxEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
- ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+ ((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)cbLevel.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)cbSchoolType.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
- ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((ISupportInitialize)cbLevel.Properties).BeginInit();
+ ((ISupportInitialize)cbSchoolType.Properties).BeginInit();
+ ((ISupportInitialize)Root).BeginInit();
+ ((ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)layoutControlItem11).BeginInit();
+ ((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -56,74 +54,66 @@
layoutControl1.Location = new Point(0, 0);
layoutControl1.Margin = new Padding(3, 4, 3, 4);
layoutControl1.Name = "layoutControl1";
+ layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(660, 0, 812, 500);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(839, 158);
+ layoutControl1.Size = new Size(600, 200);
layoutControl1.TabIndex = 118;
layoutControl1.Text = "layoutControl1";
//
// cbLevel
//
- cbLevel.Location = new Point(512, 12);
+ cbLevel.Location = new Point(379, 2);
cbLevel.Margin = new Padding(2, 3, 2, 3);
- cbLevel.MinimumSize = new Size(0, 36);
cbLevel.Name = "cbLevel";
- cbLevel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ cbLevel.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
cbLevel.Properties.Items.AddRange(new object[] { "骞煎効鍥�", "灏忓", "涓", "楂樺", "澶у" });
cbLevel.Properties.NullText = "璇烽�夋嫨";
- cbLevel.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbLevel.Size = new Size(315, 36);
+ cbLevel.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
+ cbLevel.Size = new Size(219, 24);
cbLevel.StyleController = layoutControl1;
cbLevel.TabIndex = 129;
//
// cbSchoolType
//
- cbSchoolType.Location = new Point(89, 12);
+ cbSchoolType.Location = new Point(79, 2);
cbSchoolType.Margin = new Padding(2, 3, 2, 3);
- cbSchoolType.MinimumSize = new Size(0, 36);
cbSchoolType.Name = "cbSchoolType";
- cbSchoolType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ cbSchoolType.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
cbSchoolType.Properties.Items.AddRange(new object[] { "鍔炲叕", "绉佸姙" });
cbSchoolType.Properties.NullText = "璇烽�夋嫨";
- cbSchoolType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbSchoolType.Size = new Size(251, 36);
+ cbSchoolType.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
+ cbSchoolType.Size = new Size(219, 24);
cbSchoolType.StyleController = layoutControl1;
cbSchoolType.TabIndex = 121;
//
// Root
//
Root.AppearanceItemCaption.Options.UseTextOptions = true;
- Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, emptySpaceItem1, layoutControlItem11 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem11 });
Root.Name = "Root";
- Root.Size = new Size(839, 158);
+ Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ Root.Size = new Size(600, 200);
Root.TextVisible = false;
//
// layoutControlItem3
//
layoutControlItem3.Control = cbLevel;
layoutControlItem3.CustomizationFormText = "灞傛:";
- layoutControlItem3.Location = new Point(423, 0);
+ layoutControlItem3.Location = new Point(300, 0);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(396, 138);
+ layoutControlItem3.Size = new Size(300, 200);
layoutControlItem3.Text = "瀛︽牎灞傛:";
layoutControlItem3.TextSize = new Size(65, 18);
- //
- // emptySpaceItem1
- //
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(332, 0);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(91, 138);
- emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem11
//
layoutControlItem11.Control = cbSchoolType;
layoutControlItem11.Location = new Point(0, 0);
layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(332, 138);
+ layoutControlItem11.Size = new Size(300, 200);
layoutControlItem11.Text = "瀛︽牎绫诲瀷:";
layoutControlItem11.TextSize = new Size(65, 18);
//
@@ -131,24 +121,22 @@
//
dxErrorProvider1.ContainerControl = this;
//
- // SchoolWizardForm
+ // SchoolPlaceInfoCtrl
//
AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
Margin = new Padding(2, 3, 2, 3);
- Name = "SchoolWizardForm";
- Size = new Size(839, 158);
- Load += SchoolWizardForm_Load;
- ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+ Name = "SchoolPlaceInfoCtrl";
+ Size = new Size(600, 200);
+ ((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)cbLevel.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)cbSchoolType.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)Root).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
- ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
+ ((ISupportInitialize)cbLevel.Properties).EndInit();
+ ((ISupportInitialize)cbSchoolType.Properties).EndInit();
+ ((ISupportInitialize)Root).EndInit();
+ ((ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)layoutControlItem11).EndInit();
+ ((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
@@ -159,7 +147,6 @@
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
}
}
--
Gitblit v1.9.3