From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs | 199 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 137 insertions(+), 62 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs
index 35143f2..6a2fc74 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/04-dlg/AddProjectDlg.Designer.cs
@@ -28,9 +28,11 @@
/// </summary>
private void InitializeComponent()
{
+ components = new Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ mapSetSimpleMarkerContainer1 = new MapSetSimpleMarkerContainer();
TextProjectName = new DevExpress.XtraEditors.TextEdit();
- TextAdress = new DevExpress.XtraEditors.TextEdit();
+ TextAddress = new DevExpress.XtraEditors.TextEdit();
TextCustomerName = new DevExpress.XtraEditors.TextEdit();
TextTagName = new DevExpress.XtraEditors.TextEdit();
BtnCancel = new DevExpress.XtraEditors.SimpleButton();
@@ -38,35 +40,46 @@
TextDescription = new DevExpress.XtraEditors.MemoEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
+ layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)TextProjectName.Properties).BeginInit();
- ((ISupportInitialize)TextAdress.Properties).BeginInit();
+ ((ISupportInitialize)TextAddress.Properties).BeginInit();
((ISupportInitialize)TextCustomerName.Properties).BeginInit();
((ISupportInitialize)TextTagName.Properties).BeginInit();
((ISupportInitialize)TextDescription.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
+ ((ISupportInitialize)layoutControlItem2).BeginInit();
+ ((ISupportInitialize)tabbedControlGroup1).BeginInit();
+ ((ISupportInitialize)layoutControlGroup2).BeginInit();
+ ((ISupportInitialize)layoutControlItem8).BeginInit();
+ ((ISupportInitialize)layoutControlGroup1).BeginInit();
+ ((ISupportInitialize)layoutControlItem5).BeginInit();
+ ((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(mapSetSimpleMarkerContainer1);
layoutControl1.Controls.Add(TextProjectName);
- layoutControl1.Controls.Add(TextAdress);
+ layoutControl1.Controls.Add(TextAddress);
layoutControl1.Controls.Add(TextCustomerName);
layoutControl1.Controls.Add(TextTagName);
layoutControl1.Controls.Add(BtnCancel);
@@ -77,39 +90,50 @@
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(982, 129, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(641, 417);
+ layoutControl1.Size = new Size(687, 456);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
+ //
+ // mapSetSimpleMarkerContainer1
+ //
+ mapSetSimpleMarkerContainer1.BorderColor = Color.LightGray;
+ mapSetSimpleMarkerContainer1.BorderWidth = 1;
+ mapSetSimpleMarkerContainer1.Location = new Point(24, 144);
+ mapSetSimpleMarkerContainer1.Margin = new Padding(3, 2, 3, 2);
+ mapSetSimpleMarkerContainer1.Name = "mapSetSimpleMarkerContainer1";
+ mapSetSimpleMarkerContainer1.ShowBorder = false;
+ mapSetSimpleMarkerContainer1.Size = new Size(639, 262);
+ mapSetSimpleMarkerContainer1.TabIndex = 8;
//
// TextProjectName
//
TextProjectName.Location = new Point(76, 12);
TextProjectName.Name = "TextProjectName";
- TextProjectName.Size = new Size(553, 20);
+ TextProjectName.Size = new Size(599, 20);
TextProjectName.StyleController = layoutControl1;
TextProjectName.TabIndex = 0;
//
- // TextAdress
+ // TextAddress
//
- TextAdress.Location = new Point(76, 36);
- TextAdress.Name = "TextAdress";
- TextAdress.Size = new Size(553, 20);
- TextAdress.StyleController = layoutControl1;
- TextAdress.TabIndex = 2;
+ TextAddress.Location = new Point(76, 84);
+ TextAddress.Name = "TextAddress";
+ TextAddress.Size = new Size(599, 20);
+ TextAddress.StyleController = layoutControl1;
+ TextAddress.TabIndex = 2;
//
// TextCustomerName
//
- TextCustomerName.Location = new Point(76, 60);
+ TextCustomerName.Location = new Point(76, 36);
TextCustomerName.Name = "TextCustomerName";
- TextCustomerName.Size = new Size(553, 20);
+ TextCustomerName.Size = new Size(599, 20);
TextCustomerName.StyleController = layoutControl1;
TextCustomerName.TabIndex = 3;
//
// TextTagName
//
- TextTagName.Location = new Point(76, 84);
+ TextTagName.Location = new Point(76, 60);
TextTagName.Name = "TextTagName";
- TextTagName.Size = new Size(553, 20);
+ TextTagName.Size = new Size(599, 20);
TextTagName.StyleController = layoutControl1;
TextTagName.TabIndex = 4;
//
@@ -117,9 +141,10 @@
//
BtnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
BtnCancel.Appearance.Options.UseBackColor = true;
- BtnCancel.Location = new Point(544, 383);
+ BtnCancel.DialogResult = DialogResult.Cancel;
+ BtnCancel.Location = new Point(583, 422);
BtnCancel.Name = "BtnCancel";
- BtnCancel.Size = new Size(85, 22);
+ BtnCancel.Size = new Size(92, 22);
BtnCancel.StyleController = layoutControl1;
BtnCancel.TabIndex = 7;
BtnCancel.Text = "鍙栨秷";
@@ -128,9 +153,9 @@
//
BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
BtnOk.Appearance.Options.UseBackColor = true;
- BtnOk.Location = new Point(455, 383);
+ BtnOk.Location = new Point(488, 422);
BtnOk.Name = "BtnOk";
- BtnOk.Size = new Size(85, 22);
+ BtnOk.Size = new Size(91, 22);
BtnOk.StyleController = layoutControl1;
BtnOk.TabIndex = 6;
BtnOk.Text = "纭畾";
@@ -138,9 +163,9 @@
//
// TextDescription
//
- TextDescription.Location = new Point(76, 108);
+ TextDescription.Location = new Point(24, 144);
TextDescription.Name = "TextDescription";
- TextDescription.Size = new Size(553, 271);
+ TextDescription.Size = new Size(639, 262);
TextDescription.StyleController = layoutControl1;
TextDescription.TabIndex = 5;
//
@@ -150,9 +175,9 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem6, layoutControlItem5, emptySpaceItem1, layoutControlItem7 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem4, layoutControlItem6, emptySpaceItem1, layoutControlItem7, layoutControlItem2, tabbedControlGroup1 });
Root.Name = "Root";
- Root.Size = new Size(641, 417);
+ Root.Size = new Size(687, 456);
Root.TextVisible = false;
//
// layoutControlItem1
@@ -160,77 +185,116 @@
layoutControlItem1.Control = TextProjectName;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(621, 24);
+ layoutControlItem1.Size = new Size(667, 24);
layoutControlItem1.Text = "椤圭洰鍚嶇О:";
layoutControlItem1.TextSize = new Size(52, 14);
- //
- // layoutControlItem2
- //
- layoutControlItem2.Control = TextAdress;
- layoutControlItem2.Location = new Point(0, 24);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(621, 24);
- layoutControlItem2.Text = "璇︾粏鍦板潃:";
- layoutControlItem2.TextSize = new Size(52, 14);
//
// layoutControlItem3
//
layoutControlItem3.Control = TextCustomerName;
- layoutControlItem3.Location = new Point(0, 48);
+ layoutControlItem3.Location = new Point(0, 24);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(621, 24);
+ layoutControlItem3.Size = new Size(667, 24);
layoutControlItem3.Text = "瀹㈡埛鍚嶇О:";
layoutControlItem3.TextSize = new Size(52, 14);
//
// layoutControlItem4
//
layoutControlItem4.Control = TextTagName;
- layoutControlItem4.Location = new Point(0, 72);
+ layoutControlItem4.Location = new Point(0, 48);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(621, 24);
+ layoutControlItem4.Size = new Size(667, 24);
layoutControlItem4.Text = "鏍囩:";
layoutControlItem4.TextSize = new Size(52, 14);
//
// layoutControlItem6
//
layoutControlItem6.Control = BtnCancel;
- layoutControlItem6.Location = new Point(532, 371);
+ layoutControlItem6.Location = new Point(571, 410);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(89, 26);
+ layoutControlItem6.Size = new Size(96, 26);
layoutControlItem6.TextSize = new Size(0, 0);
layoutControlItem6.TextVisible = false;
- //
- // layoutControlItem5
- //
- layoutControlItem5.Control = TextDescription;
- layoutControlItem5.Location = new Point(0, 96);
- layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(621, 275);
- layoutControlItem5.Text = "璇存槑:";
- layoutControlItem5.TextSize = new Size(52, 14);
//
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(0, 371);
+ emptySpaceItem1.Location = new Point(0, 410);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(443, 26);
+ emptySpaceItem1.Size = new Size(476, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem7
//
layoutControlItem7.Control = BtnOk;
- layoutControlItem7.Location = new Point(443, 371);
+ layoutControlItem7.Location = new Point(476, 410);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(89, 26);
+ layoutControlItem7.Size = new Size(95, 26);
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ layoutControlItem2.Control = TextAddress;
+ layoutControlItem2.Location = new Point(0, 72);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(667, 24);
+ layoutControlItem2.Text = "璇︾粏鍦板潃:";
+ layoutControlItem2.TextSize = new Size(52, 14);
+ //
+ // tabbedControlGroup1
+ //
+ tabbedControlGroup1.Location = new Point(0, 96);
+ tabbedControlGroup1.Name = "tabbedControlGroup1";
+ tabbedControlGroup1.SelectedTabPage = layoutControlGroup2;
+ tabbedControlGroup1.Size = new Size(667, 314);
+ tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup2, layoutControlGroup1 });
+ tabbedControlGroup1.Text = "璇存槑";
+ //
+ // layoutControlGroup2
+ //
+ layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem8 });
+ layoutControlGroup2.Location = new Point(0, 0);
+ layoutControlGroup2.Name = "layoutControlGroup2";
+ layoutControlGroup2.Size = new Size(643, 266);
+ layoutControlGroup2.Text = "鍦板浘閫夋嫨";
+ //
+ // layoutControlItem8
+ //
+ layoutControlItem8.Control = mapSetSimpleMarkerContainer1;
+ layoutControlItem8.Location = new Point(0, 0);
+ layoutControlItem8.Name = "layoutControlItem8";
+ layoutControlItem8.Size = new Size(643, 266);
+ layoutControlItem8.TextSize = new Size(0, 0);
+ layoutControlItem8.TextVisible = false;
+ //
+ // layoutControlGroup1
+ //
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
+ layoutControlGroup1.Location = new Point(0, 0);
+ layoutControlGroup1.Name = "layoutControlGroup1";
+ layoutControlGroup1.Size = new Size(643, 266);
+ layoutControlGroup1.Text = "璇存槑";
+ //
+ // layoutControlItem5
+ //
+ layoutControlItem5.Control = TextDescription;
+ layoutControlItem5.Location = new Point(0, 0);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(643, 266);
+ layoutControlItem5.Text = "璇存槑:";
+ layoutControlItem5.TextSize = new Size(0, 0);
+ layoutControlItem5.TextVisible = false;
+ //
+ // dxErrorProvider1
+ //
+ dxErrorProvider1.ContainerControl = this;
//
// AddProjectDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(641, 417);
+ ClientSize = new Size(687, 456);
Controls.Add(layoutControl1);
Name = "AddProjectDlg";
StartPosition = FormStartPosition.CenterScreen;
@@ -238,19 +302,24 @@
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)TextProjectName.Properties).EndInit();
- ((ISupportInitialize)TextAdress.Properties).EndInit();
+ ((ISupportInitialize)TextAddress.Properties).EndInit();
((ISupportInitialize)TextCustomerName.Properties).EndInit();
((ISupportInitialize)TextTagName.Properties).EndInit();
((ISupportInitialize)TextDescription.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
+ ((ISupportInitialize)layoutControlItem2).EndInit();
+ ((ISupportInitialize)tabbedControlGroup1).EndInit();
+ ((ISupportInitialize)layoutControlGroup2).EndInit();
+ ((ISupportInitialize)layoutControlItem8).EndInit();
+ ((ISupportInitialize)layoutControlGroup1).EndInit();
+ ((ISupportInitialize)layoutControlItem5).EndInit();
+ ((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
@@ -258,7 +327,7 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraEditors.TextEdit TextProjectName;
- private DevExpress.XtraEditors.TextEdit TextAdress;
+ private DevExpress.XtraEditors.TextEdit TextAddress;
private DevExpress.XtraEditors.TextEdit TextCustomerName;
private DevExpress.XtraEditors.TextEdit TextTagName;
private DevExpress.XtraLayout.LayoutControlGroup Root;
@@ -270,8 +339,14 @@
private DevExpress.XtraEditors.SimpleButton BtnOk;
private DevExpress.XtraEditors.MemoEdit TextDescription;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private MapSetSimpleMarkerContainer mapSetSimpleMarkerContainer1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3